diff --git a/.prettierignore b/.prettierignore
index fe5f5f88cd3..84141d7a1cb 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -14,6 +14,7 @@ __mocks__
 *.inc
 *.json
 *.md
+*.test.ts
 *.yml
 babel.config.js
 build
diff --git a/.yarn/patches/detox-npm-20.18.1-b532b310b4.patch b/.yarn/patches/detox-npm-20.18.1-b532b310b4.patch
new file mode 100644
index 00000000000..540b89a9292
--- /dev/null
+++ b/.yarn/patches/detox-npm-20.18.1-b532b310b4.patch
@@ -0,0 +1,14 @@
+diff --git a/android/rninfo.gradle b/android/rninfo.gradle
+index c09d2af1d219a4134dc0301e9270aef568730d2b..f1b887cf5dcf56c2f66fff3e6f1b674d48704dac 100644
+--- a/android/rninfo.gradle
++++ b/android/rninfo.gradle
+@@ -3,7 +3,8 @@ import groovy.json.JsonSlurper
+ def getRNVersion = { workingDir ->
+     println("RNInfo: workingDir=$workingDir")
+     def jsonSlurper = new JsonSlurper()
+-    def packageFile = "$workingDir/../node_modules/react-native/package.json"
++    // Fixes patch to node_modules in monorepo project
++    def packageFile = "$workingDir/../../../node_modules/react-native/package.json"
+     println("RNInfo: reading $packageFile")
+     Map<String, Object> packageJSON  = jsonSlurper.parse(new File(packageFile))
+     String rnVersion = packageJSON.get('version')
diff --git a/.yarn/patches/detox-npm-20.23.0-6d61110e63.patch b/.yarn/patches/detox-npm-20.23.0-6d61110e63.patch
deleted file mode 100644
index 509f663b9d1..00000000000
Binary files a/.yarn/patches/detox-npm-20.23.0-6d61110e63.patch and /dev/null differ
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index f70773659eb..00000000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @uniswap/web-admins
diff --git a/README.md b/README.md
index 2b2d52e66e2..eb7520967c3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An open source repository for all Uniswap front end interfaces maintained by Uni
 ## Interfaces
 
 - Web: [app.uniswap.org](https://app.uniswap.org)
-- Wallet: [wallet.uniswap.org](https://wallet.uniswap.org)
+- Wallet (mobile + extension): [wallet.uniswap.org](https://wallet.uniswap.org)
 
 ## Socials / Contact
 
@@ -31,6 +31,7 @@ For instructions per application or package, see the README published for each a
 
 - [Web](apps/web/README.md)
 - [Mobile](apps/mobile/README.md)
+- [Extension](apps/extension/README.md)
 
 ## Releases
 
@@ -43,7 +44,7 @@ Translations for our applications are done through [crowdin](https://crowdin.com
 | App     | Coverage |
 | ------- | -------- |
 | web     | [![Crowdin](https://badges.crowdin.net/uniswap-interface/localized.svg)](https://crowdin.com/project/uniswap-interface) |
-| mobile  | [![Crowdin](https://badges.crowdin.net/uniswap-wallet/localized.svg)](https://crowdin.com/project/uniswap-wallet) |
+| wallet  | [![Crowdin](https://badges.crowdin.net/uniswap-wallet/localized.svg)](https://crowdin.com/project/uniswap-wallet) |
 
 ## 🗂 Directory Structure
 
diff --git a/RELEASE b/RELEASE
index 87dfb045593..3144e55e250 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,24 +1,9 @@
-IPFS hash of the deployment:
-- CIDv0: `QmdnXm6P6JYgiiW7hLc8cFmDMQYLE2WuZWAw6JMhxzQTby`
-- CIDv1: `bafybeihfqcgfsnr2ocpxfqatxukii6i6vzrv2vjxm7qwnsxemv7sskmudq`
-
-The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
-
-You can also access the Uniswap Interface from an IPFS gateway.
-**BEWARE**: The Uniswap interface uses [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported.
-**You should always use an IPFS gateway that enforces origin separation**, or our hosted deployment of the latest release at [app.uniswap.org](https://app.uniswap.org).
-Your Uniswap settings are never remembered across different URLs.
-
-IPFS gateways:
-- https://bafybeihfqcgfsnr2ocpxfqatxukii6i6vzrv2vjxm7qwnsxemv7sskmudq.ipfs.dweb.link/
-- https://bafybeihfqcgfsnr2ocpxfqatxukii6i6vzrv2vjxm7qwnsxemv7sskmudq.ipfs.cf-ipfs.com/
-- [ipfs://QmdnXm6P6JYgiiW7hLc8cFmDMQYLE2WuZWAw6JMhxzQTby/](ipfs://QmdnXm6P6JYgiiW7hLc8cFmDMQYLE2WuZWAw6JMhxzQTby/)
-
-### 5.40.1 (2024-07-15)
-
-
-### Bug Fixes
-
-* **web:** [ext-gtm] Remove outline on button on pageload - prod (#10194) 623eeca
+Developed by Uniswap Labs, the Uniswap Extension allows you to access and explore onchain apps while maintaining full control of your crypto assets. The Uniswap Extension is the first wallet extension to live in your browser’s sidebar, persisting no matter where you are on the web. So you can explore crypto without obstructing your window or losing your place.
 
+- Connect to thousands of onchain apps across Ethereum, Base, Arbitrum and many other EVM blockchains
+- Explore tokens directly on Uniswap, one of the most trusted DeFi protocols with over $2 trillion in volume
+- View all of your crypto assets without switching, across Ethereum and other EVM-compatible blockchains
+- Easily create a new wallet or import your existing wallet
+- Safely send and receive crypto tokens with other wallets
 
+The Uniswap Extension’s source code is audited by the security firm Trail of Bits as an added measure to ensure that your crypto assets are safe.
diff --git a/VERSION b/VERSION
index 2a30392f23e..74fce0ec11b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-web/5.40.1
\ No newline at end of file
+extension/1.0.3
\ No newline at end of file
diff --git a/apps/extension/.depcheckrc b/apps/extension/.depcheckrc
new file mode 100644
index 00000000000..ed92562bf95
--- /dev/null
+++ b/apps/extension/.depcheckrc
@@ -0,0 +1,17 @@
+ignores: [
+    # Dependencies that depcheck thinks are unused but are actually used
+    "react-native-web",
+    "jest-environment-jsdom",
+    "webpack-cli",
+    # Dependencies that depcheck thinks are missing but are actually present or never used
+    ## Internal packages / workspaces
+    "src",
+    "tsconfig",
+    # Webpack plugins
+    "@svgr/webpack",
+    "tamagui-loader",
+    "esbuild-loader",
+    "swc-loader",
+    ## Testing
+    "@testing-library/dom",
+  ]
diff --git a/apps/extension/.eslintignore b/apps/extension/.eslintignore
new file mode 100644
index 00000000000..8e9904e772b
--- /dev/null
+++ b/apps/extension/.eslintignore
@@ -0,0 +1 @@
+jest-setup.js
diff --git a/apps/extension/.eslintrc.js b/apps/extension/.eslintrc.js
new file mode 100644
index 00000000000..f21f9aa9ba3
--- /dev/null
+++ b/apps/extension/.eslintrc.js
@@ -0,0 +1,28 @@
+module.exports = {
+  root: true,
+  extends: ['@uniswap/eslint-config/native'],
+  ignorePatterns: ['node_modules', 'dist', '.turbo', 'build', '.eslintrc.js', 'webpack.config.js', 'webpack.dev.config.js', 'manifest.json'],
+  parserOptions: {
+    project: 'tsconfig.json',
+    tsconfigRootDir: __dirname,
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      rules: {
+        'no-relative-import-paths/no-relative-import-paths': [
+          'error',
+          {
+            allowSameFolder: false,
+          },
+        ],
+      },
+    },
+  ],
+  rules: {},
+}
diff --git a/apps/extension/.gitignore b/apps/extension/.gitignore
new file mode 100644
index 00000000000..085e25d9614
--- /dev/null
+++ b/apps/extension/.gitignore
@@ -0,0 +1,30 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dev
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+.tamagui
+
+# Sentry Config File
+.env.sentry-build-plugin
diff --git a/apps/extension/README.md b/apps/extension/README.md
new file mode 100644
index 00000000000..371217ca5fd
--- /dev/null
+++ b/apps/extension/README.md
@@ -0,0 +1,53 @@
+# Uniswap Extension
+
+## Developer Quickstart
+
+### Running the extension locally
+
+To run the extension, run the following from the top level of the monorepo:
+
+```bash
+yarn
+yarn extension start
+```
+
+### Environment variables
+
+You need to get the environment variables from 1password in order to get full functionality. Run the command `yarn extension env:local:download` to copy them to your root folder.
+
+### Loading the extension into Chrome
+
+1. Go to **chrome://extensions**
+2. At the top right, turn on **Developer mode**
+3. Click **Load unpacked**
+4. Find and select the extension folder (apps/extension/dev)
+
+## Running the extension locally with an absolute path (for testing scantastic)
+
+Our scantastic API requires a consistent origin header so the build must be loaded from an absolute path. This works because Chrome generates a consistent ID for the extension based on the path it was loaded from.
+
+To run the extension, run the following from the top level of the monorepo:
+
+Mac:
+
+```bash
+yarn
+yarn extension start:absolute
+```
+
+Windows:
+
+```bash
+yarn
+yarn extension start:absolute:windows
+```
+
+1. Go to **chrome://extensions**
+2. At the top right, turn on **Developer mode**
+3. Click **Load unpacked**
+4. Find and select the extension folder with an absolute path (`/Users/Shared/stretch` on Mac and `C:/ProgramData/stretch` on Windows)
+5. Your chrome extension url should be `chrome-extension://ceofpnbcmdjbibjjdniemjemmgaibeih` on Mac and `chrome-extension://ffogefanhjekjafbpofianlhkonejcoe` on Windows. The backend allows this origin and the ID will be consistently generated based off an absolute path that is consistent on all machines.
+
+## Migrations
+
+We use `redux-persist` to persist the Redux state between user sessions. Most of this state is shared between the mobile app and the extension. Please review the [Wallet Migrations README](../../packages/wallet/src/state//README.md) for details on how to write migrations when you add or remove anything from the Redux state structure.
diff --git a/apps/extension/jest-setup.js b/apps/extension/jest-setup.js
new file mode 100644
index 00000000000..82ba3fa4ea8
--- /dev/null
+++ b/apps/extension/jest-setup.js
@@ -0,0 +1,71 @@
+import 'utilities/src/logger/mocks'
+
+import { chrome } from 'jest-chrome'
+import { AppearanceSettingType } from 'wallet/src/features/appearance/slice'
+import { TextEncoder, TextDecoder } from 'util';
+
+process.env.IS_UNISWAP_EXTENSION = true 
+
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;
+
+const ignoreLogs = {
+  error: [
+    // We need to use _persist property to ensure that the state is properly
+    // rehydrated (https://github.com/Uniswap/universe/pull/7502/files#r1566259088)
+    'Unexpected key "_persist" found in previous state received by the reducer.'
+  ]
+}
+
+// Ignore certain logs that are expected during tests.
+Object.entries(ignoreLogs).forEach(([method, messages]) => {
+  const key = method
+  const originalMethod = console[key]
+  console[key] = ((...args) => {
+    if (messages.some((message) => args.some((arg) => typeof arg === 'string' && arg.startsWith(message)))) {
+      return
+    }
+    originalMethod(...args)
+  })
+})
+
+globalThis.matchMedia =
+  globalThis.matchMedia ||
+  ((query) => {
+    const reducedMotion = query.match(/prefers-reduced-motion: ([a-zA-Z0-9-]+)/)
+
+    return {
+      // Needed for reanimated to disable reduced motion warning in tests
+      matches: reducedMotion ? reducedMotion[1] === 'no-preference' : false,
+      addListener: jest.fn(),
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+    }
+  })
+
+require('react-native-reanimated').setUpTests()
+
+global.chrome = chrome
+
+jest.mock('src/app/navigation/utils', () => ({
+  useExtensionNavigation: () => ({
+    navigateTo: jest.fn(),
+    navigateBack: jest.fn(),
+  })
+}))
+
+jest.mock('wallet/src/features/focus/useIsFocused', () => {
+  return jest.fn().mockReturnValue(true)
+})
+
+const mockAppearanceSetting = AppearanceSettingType.System
+jest.mock('wallet/src/features/appearance/hooks', () => {
+  return {
+    useCurrentAppearanceSetting: () => mockAppearanceSetting,
+  }
+})
+jest.mock('wallet/src/features/appearance/hooks', () => {
+  return {
+    useSelectedColorScheme: () => 'light',
+  }
+})
diff --git a/apps/extension/jest.config.js b/apps/extension/jest.config.js
new file mode 100644
index 00000000000..a571f8b3f3f
--- /dev/null
+++ b/apps/extension/jest.config.js
@@ -0,0 +1,58 @@
+const preset = require('../../config/jest-presets/jest/jest-preset')
+
+const fileExtensions = [
+  'eot',
+  'gif',
+  'jpeg',
+  'jpg',
+  'otf',
+  'png',
+  'ttf',
+  'woff',
+  'woff2',
+  'mp4',
+]
+
+module.exports = {
+  ...preset,
+  preset: 'jest-expo',
+  transform: {
+    '^.+\\.(t|j)sx?$': [
+      'babel-jest',
+      {
+        configFile: './src/test/babel.config.js',
+      }
+    ],
+  },
+  moduleNameMapper: {
+    ...preset.moduleNameMapper,
+    '^react-native$': 'react-native-web',
+  },
+  moduleFileExtensions: [
+    'web.js',
+    'web.jsx',
+    'web.ts',
+    'web.tsx',
+    ...fileExtensions,
+    ...preset.moduleFileExtensions,
+  ],
+  resolver: "<rootDir>/src/test/jest-resolver.js",
+  displayName: 'Extension Wallet',
+  collectCoverageFrom: [
+    'src/app/**/*.{js,ts,tsx}',
+    'src/background/**/*.{js,ts,tsx}',
+    'src/contentScript/**/*.{js,ts,tsx}',
+    '!src/**/*.stories.**',
+    '!**/node_modules/**',
+  ],
+  coverageThreshold: {
+    global: {
+      lines: 0,
+    },
+  },
+  setupFiles: [
+    '../../config/jest-presets/jest/setup.js',
+    './jest-setup.js',
+    '../../node_modules/react-native-gesture-handler/jestSetup.js',
+  ],
+}
diff --git a/apps/extension/package.json b/apps/extension/package.json
new file mode 100644
index 00000000000..c4dccfd68f8
--- /dev/null
+++ b/apps/extension/package.json
@@ -0,0 +1,99 @@
+{
+  "name": "@uniswap/extension",
+  "version": "0.0.0",
+  "browserslist": "last 2 chrome versions",
+  "dependencies": {
+    "@apollo/client": "3.10.4",
+    "@ethersproject/providers": "5.7.2",
+    "@metamask/rpc-errors": "6.2.1",
+    "@reduxjs/toolkit": "1.9.3",
+    "@sentry/browser": "7.80.0",
+    "@sentry/react": "7.80.0",
+    "@sentry/webpack-plugin": "2.10.3",
+    "@svgr/webpack": "8.0.1",
+    "@tamagui/core": "1.95.1",
+    "@types/uuid": "9.0.1",
+    "@uniswap/analytics-events": "2.32.0",
+    "@uniswap/universal-router-sdk": "2.2.0",
+    "@uniswap/v3-sdk": "3.13.0",
+    "dotenv-webpack": "8.0.1",
+    "ethers": "5.7.2",
+    "eventemitter3": "5.0.1",
+    "i18next": "23.10.0",
+    "node-polyfill-webpack-plugin": "2.0.1",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-i18next": "14.1.0",
+    "react-native": "0.73.6",
+    "react-native-gesture-handler": "2.15.0",
+    "react-native-reanimated": "npm:react-native-reanimated@3.8.1",
+    "react-native-svg": "15.1.0",
+    "react-native-web": "0.19.10",
+    "react-qr-code": "2.0.12",
+    "react-redux": "8.0.5",
+    "react-router-dom": "6.10.0",
+    "redux": "4.2.1",
+    "redux-logger": "3.0.6",
+    "redux-persist": "6.0.0",
+    "redux-persist-webextension-storage": "1.0.2",
+    "redux-saga": "1.2.2",
+    "symbol-observable": "4.0.0",
+    "typed-redux-saga": "1.5.0",
+    "ua-parser-js": "1.0.37",
+    "ui": "workspace:^",
+    "uniswap": "workspace:^",
+    "utilities": "workspace:^",
+    "uuid": "9.0.0",
+    "wallet": "workspace:^",
+    "zod": "3.22.4"
+  },
+  "devDependencies": {
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
+    "@testing-library/dom": "^7.11.0",
+    "@testing-library/react": "13.4.0",
+    "@types/chrome": "0.0.254",
+    "@types/jest": "29.5.0",
+    "@types/react": "^18.0.15",
+    "@types/react-dom": "^18.0.6",
+    "@types/redux-logger": "3.0.9",
+    "@types/redux-persist-webextension-storage": "1.0.3",
+    "@types/ua-parser-js": "0.7.31",
+    "@uniswap/eslint-config": "workspace:^",
+    "@welldone-software/why-did-you-render": "8.0.1",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "esbuild-loader": "^3.0.1",
+    "eslint": "8.44.0",
+    "jest": "29.7.0",
+    "jest-chrome": "0.8.0",
+    "jest-environment-jsdom": "29.5.0",
+    "jest-extended": "4.0.1",
+    "mini-css-extract-plugin": "^2.7.6",
+    "react-refresh": "^0.14.0",
+    "serve": "^14.2.0",
+    "statsig-js": "4.41.0",
+    "swc-loader": "^0.2.3",
+    "tamagui-loader": "1.95.1",
+    "typescript": "5.3.3",
+    "webpack": "5.90.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.13.1"
+  },
+  "private": true,
+  "scripts": {
+    "build:production": "webpack --node-env=production --env BUILD_ENV=prod BUILD_NUM=${BUILD_NUM:-0}",
+    "check:deps:usage": "depcheck",
+    "env:local:download": "bash ../../scripts/downloadEnvLocal.sh web-local-envs ../../.env",
+    "env:local:upload": "bash ../../scripts/uploadEnvLocal.sh web-local-envs ../../.env",
+    "format": "../../scripts/prettier.sh",
+    "lint": "eslint . --ext ts,tsx --max-warnings=0",
+    "lint:fix": "eslint . --ext ts,tsx --fix",
+    "start": "webpack serve --config webpack.config.js",
+    "start:absolute": "yarn start:absolute:mac",
+    "start:absolute:mac": "yarn start --output-path /Users/Shared/stretch",
+    "start:absolute:windows": "yarn start --output-path C:/ProgramData/stretch",
+    "test": "jest",
+    "snapshots": "jest -u",
+    "typecheck": "tsc -b"
+  }
+}
diff --git a/apps/extension/src/app/Global.css b/apps/extension/src/app/Global.css
new file mode 100644
index 00000000000..85648681006
--- /dev/null
+++ b/apps/extension/src/app/Global.css
@@ -0,0 +1,31 @@
+body,
+html {
+  height: 100%;
+  max-width: 100vw;
+}
+
+#root {
+  height: 100vh;
+  display: flex;
+
+  scrollbar-width: 'thin';
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes shine {
+  from {
+    -webkit-mask-position: 150%;
+  }
+  to {
+    -webkit-mask-position: -50%;
+  }
+}
diff --git a/apps/extension/src/app/OnboardingApp.test.tsx b/apps/extension/src/app/OnboardingApp.test.tsx
new file mode 100644
index 00000000000..c016ae7b8f8
--- /dev/null
+++ b/apps/extension/src/app/OnboardingApp.test.tsx
@@ -0,0 +1,10 @@
+import { render } from '@testing-library/react'
+import OnboardingApp from 'src/app/OnboardingApp'
+import { initializeReduxStore } from 'src/store/store'
+
+describe('OnboardingApp', () => {
+  it('renders without error', async () => {
+    await initializeReduxStore()
+    render(<OnboardingApp />)
+  })
+})
diff --git a/apps/extension/src/app/OnboardingApp.tsx b/apps/extension/src/app/OnboardingApp.tsx
new file mode 100644
index 00000000000..7656388958d
--- /dev/null
+++ b/apps/extension/src/app/OnboardingApp.tsx
@@ -0,0 +1,216 @@
+import '@tamagui/core/reset.css'
+import 'src/app/Global.css'
+import 'symbol-observable' // Needed by `reduxed-chrome-storage` as polyfill, order matters
+
+import { useEffect } from 'react'
+import { I18nextProvider } from 'react-i18next'
+import { RouteObject, RouterProvider } from 'react-router-dom'
+import { PersistGate } from 'redux-persist/integration/react'
+import { ExtensionStatsigProvider } from 'src/app/StatsigProvider'
+import { GraphqlProvider } from 'src/app/apollo'
+import { ErrorElement } from 'src/app/components/ErrorElement'
+import { Complete } from 'src/app/features/onboarding/Complete'
+import {
+  CreateOnboardingSteps,
+  ImportOnboardingSteps,
+  OnboardingStepsProvider,
+  ResetSteps,
+  ScanOnboardingSteps,
+} from 'src/app/features/onboarding/OnboardingSteps'
+import { OnboardingWrapper } from 'src/app/features/onboarding/OnboardingWrapper'
+import { PasswordImport } from 'src/app/features/onboarding/PasswordImport'
+import { NameWallet } from 'src/app/features/onboarding/create/NameWallet'
+import { PasswordCreate } from 'src/app/features/onboarding/create/PasswordCreate'
+import { TestMnemonic } from 'src/app/features/onboarding/create/TestMnemonic'
+import { ViewMnemonic } from 'src/app/features/onboarding/create/ViewMnemonic'
+import { ImportMnemonic } from 'src/app/features/onboarding/import/ImportMnemonic'
+import { SelectWallets } from 'src/app/features/onboarding/import/SelectWallets'
+import { IntroScreen } from 'src/app/features/onboarding/intro/IntroScreen'
+import { IntroScreenBetaWaitlist } from 'src/app/features/onboarding/intro/IntroScreenBetaWaitlist'
+import { UnsupportedBrowserScreen } from 'src/app/features/onboarding/intro/UnsupportedBrowserScreen'
+import { ResetComplete } from 'src/app/features/onboarding/reset/ResetComplete'
+import { OTPInput } from 'src/app/features/onboarding/scan/OTPInput'
+import { ScanToOnboard } from 'src/app/features/onboarding/scan/ScanToOnboard'
+import { ScantasticContextProvider } from 'src/app/features/onboarding/scan/ScantasticContextProvider'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate, setRouter, setRouterState } from 'src/app/navigation/state'
+import { sentryCreateHashRouter } from 'src/app/sentry'
+import { initExtensionAnalytics } from 'src/app/utils/analytics'
+import { checksIfSupportsSidePanel } from 'src/app/utils/chrome'
+import { PrimaryAppInstanceDebuggerLazy } from 'src/store/PrimaryAppInstanceDebuggerLazy'
+import { getReduxPersistor, getReduxStore } from 'src/store/store'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
+import i18n from 'uniswap/src/i18n/i18n'
+import { ExtensionOnboardingFlow } from 'uniswap/src/types/screens/extension'
+import { ErrorBoundary } from 'wallet/src/components/ErrorBoundary/ErrorBoundary'
+import { LocalizationContextProvider } from 'wallet/src/features/language/LocalizationContext'
+import { SharedProvider } from 'wallet/src/provider'
+
+const supportsSidePanel = checksIfSupportsSidePanel()
+
+const unsupportedRoute: RouteObject = {
+  path: '',
+  element: <UnsupportedBrowserScreen />,
+}
+
+const allRoutes = [
+  {
+    path: '',
+    element: <IntroScreenBehindFeatureFlag />,
+  },
+  {
+    path: OnboardingRoutes.UnsupportedBrowser,
+    element: <UnsupportedBrowserScreen />,
+  },
+  {
+    path: OnboardingRoutes.Create,
+    element: (
+      <MaybeRedirectToScantastic>
+        <OnboardingStepsProvider
+          key={OnboardingRoutes.Create}
+          steps={{
+            [CreateOnboardingSteps.Password]: <PasswordCreate />,
+            [CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
+            [CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
+            [CreateOnboardingSteps.Naming]: <NameWallet />,
+            [CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
+          }}
+        />
+      </MaybeRedirectToScantastic>
+    ),
+  },
+  {
+    path: OnboardingRoutes.Import,
+    element: (
+      <MaybeRedirectToScantastic>
+        <OnboardingStepsProvider
+          key={OnboardingRoutes.Import}
+          steps={{
+            [ImportOnboardingSteps.Mnemonic]: <ImportMnemonic />,
+            [ImportOnboardingSteps.Password]: <PasswordImport flow={ExtensionOnboardingFlow.Import} />,
+            [ImportOnboardingSteps.Select]: <SelectWallets flow={ExtensionOnboardingFlow.Import} />,
+            [ImportOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.Import} />,
+          }}
+        />
+      </MaybeRedirectToScantastic>
+    ),
+  },
+  {
+    path: OnboardingRoutes.Scan,
+    element: <ScantasticFlow key={OnboardingRoutes.Scan} />,
+  },
+  {
+    path: OnboardingRoutes.ResetScan,
+    element: <ScantasticFlow key={OnboardingRoutes.ResetScan} isResetting />,
+  },
+  {
+    path: OnboardingRoutes.Reset,
+    element: (
+      <MaybeRedirectToScantastic>
+        <OnboardingStepsProvider
+          key={OnboardingRoutes.Reset}
+          isResetting
+          steps={{
+            [ResetSteps.Mnemonic]: <ImportMnemonic />,
+            [ResetSteps.Password]: <PasswordImport flow={ExtensionOnboardingFlow.Import} />,
+            [ResetSteps.Select]: <SelectWallets flow={ExtensionOnboardingFlow.Import} />,
+            [ResetSteps.Complete]: <ResetComplete />,
+          }}
+        />
+      </MaybeRedirectToScantastic>
+    ),
+  },
+]
+
+const router = sentryCreateHashRouter([
+  {
+    path: `/${TopLevelRoutes.Onboarding}`,
+    element: <OnboardingWrapper />,
+    errorElement: <ErrorElement />,
+    children: !supportsSidePanel ? [unsupportedRoute] : allRoutes,
+  },
+])
+
+function ScantasticFlow({ isResetting = false }: { isResetting?: boolean }): JSX.Element {
+  return (
+    <OnboardingStepsProvider
+      ContainerComponent={ScantasticContextProvider}
+      isResetting={isResetting}
+      steps={{
+        [ScanOnboardingSteps.Scan]: <ScanToOnboard />,
+        [ScanOnboardingSteps.OTP]: <OTPInput />,
+        [ScanOnboardingSteps.Password]: <PasswordImport allowBack={false} flow={ExtensionOnboardingFlow.Scantastic} />,
+        [ScanOnboardingSteps.Select]: <SelectWallets flow={ExtensionOnboardingFlow.Scantastic} />,
+        [ScanOnboardingSteps.Complete]: isResetting ? (
+          <ResetComplete />
+        ) : (
+          <Complete flow={ExtensionOnboardingFlow.Scantastic} />
+        ),
+      }}
+    />
+  )
+}
+
+function IntroScreenBehindFeatureFlag(): JSX.Element {
+  const scantasticOnboardingOnly = useFeatureFlag(FeatureFlags.ScantasticOnboardingOnly)
+  return scantasticOnboardingOnly ? <IntroScreenBetaWaitlist /> : <IntroScreen />
+}
+
+function MaybeRedirectToScantastic({ children }: { children: JSX.Element }): JSX.Element | null {
+  const scantasticOnboardingOnly = useFeatureFlag(FeatureFlags.ScantasticOnboardingOnly)
+  if (scantasticOnboardingOnly) {
+    navigate(`/${TopLevelRoutes.Onboarding}`, { replace: true })
+    return null
+  }
+  return children
+}
+
+/**
+ * Note: we are using a pattern here to avoid circular dependencies, because
+ * this is the root of the app and it imports all sub-pages, we need to push the
+ * router/router state to a different file so it can be imported by those pages
+ */
+router.subscribe((state) => {
+  setRouterState(state)
+})
+
+setRouter(router)
+
+export default function OnboardingApp(): JSX.Element {
+  // initialize analytics on load
+  useEffect(() => {
+    async function initAndLogLoad(): Promise<void> {
+      await initExtensionAnalytics()
+      sendAnalyticsEvent(ExtensionEventName.OnboardingLoad)
+    }
+    initAndLogLoad().catch(() => undefined)
+  }, [])
+
+  return (
+    <Trace>
+      <PersistGate persistor={getReduxPersistor()}>
+        <ExtensionStatsigProvider>
+          <I18nextProvider i18n={i18n}>
+            <SharedProvider reduxStore={getReduxStore()}>
+              <ErrorBoundary>
+                <GraphqlProvider>
+                  <LocalizationContextProvider>
+                    <UnitagUpdaterContextProvider>
+                      <PrimaryAppInstanceDebuggerLazy />
+                      <RouterProvider router={router} />
+                    </UnitagUpdaterContextProvider>
+                  </LocalizationContextProvider>
+                </GraphqlProvider>
+              </ErrorBoundary>
+            </SharedProvider>
+          </I18nextProvider>
+        </ExtensionStatsigProvider>
+      </PersistGate>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/SidebarApp.tsx b/apps/extension/src/app/SidebarApp.tsx
new file mode 100644
index 00000000000..18891423472
--- /dev/null
+++ b/apps/extension/src/app/SidebarApp.tsx
@@ -0,0 +1,263 @@
+import '@tamagui/core/reset.css'
+import 'src/app/Global.css'
+
+import { useEffect, useRef, useState } from 'react'
+import { I18nextProvider } from 'react-i18next'
+import { RouterProvider, ScrollRestoration } from 'react-router-dom'
+import { PersistGate } from 'redux-persist/integration/react'
+import { ExtensionStatsigProvider } from 'src/app/StatsigProvider'
+import { GraphqlProvider } from 'src/app/apollo'
+import { ErrorElement } from 'src/app/components/ErrorElement'
+import { TraceUserProperties } from 'src/app/components/Trace/TraceUserProperties'
+import { AccountSwitcherScreen } from 'src/app/features/accounts/AccountSwitcherScreen'
+import { DappContextProvider } from 'src/app/features/dapp/DappContext'
+import { addRequest } from 'src/app/features/dappRequests/saga'
+import { ReceiveScreen } from 'src/app/features/receive/ReceiveScreen'
+import { DevMenuScreen } from 'src/app/features/settings/DevMenuScreen'
+import { SettingsPrivacyScreen } from 'src/app/features/settings/SettingsPrivacyScreen'
+import { RemoveRecoveryPhraseVerify } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseVerify'
+import { RemoveRecoveryPhraseWallets } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseWallets'
+import { SettingsViewRecoveryPhraseScreen } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/ViewRecoveryPhraseScreen'
+import { SettingsScreen } from 'src/app/features/settings/SettingsScreen'
+import { SettingsScreenWrapper } from 'src/app/features/settings/SettingsScreenWrapper'
+import { SettingsChangePasswordScreen } from 'src/app/features/settings/password/SettingsChangePasswordScreen'
+import { SwapFlowScreen } from 'src/app/features/swap/SwapFlowScreen'
+import { TransferFlowScreen } from 'src/app/features/transfer/TransferFlowScreen'
+import { useIsWalletUnlocked } from 'src/app/hooks/useIsWalletUnlocked'
+import { MainContent, WebNavigation } from 'src/app/navigation'
+import { AppRoutes, RemoveRecoveryPhraseRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { setRouter, setRouterState } from 'src/app/navigation/state'
+import { SentryAppNameTag, initializeSentry, sentryCreateHashRouter } from 'src/app/sentry'
+import { initExtensionAnalytics } from 'src/app/utils/analytics'
+import { getLocalUserId } from 'src/app/utils/storage'
+import {
+  DappBackgroundPortChannel,
+  createBackgroundToSidePanelMessagePort,
+} from 'src/background/messagePassing/messageChannels'
+import { BackgroundToSidePanelRequestType } from 'src/background/messagePassing/types/requests'
+import { PrimaryAppInstanceDebuggerLazy } from 'src/store/PrimaryAppInstanceDebuggerLazy'
+import { getReduxPersistor, getReduxStore, useAppDispatch } from 'src/store/store'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
+import i18n from 'uniswap/src/i18n/i18n'
+import { isDevEnv } from 'utilities/src/environment'
+import { logger } from 'utilities/src/logger/logger'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useInterval } from 'utilities/src/time/timing'
+import { ErrorBoundary } from 'wallet/src/components/ErrorBoundary/ErrorBoundary'
+import { LocalizationContextProvider } from 'wallet/src/features/language/LocalizationContext'
+import { syncAppWithDeviceLanguage } from 'wallet/src/features/language/slice'
+import { SharedProvider } from 'wallet/src/provider'
+
+getLocalUserId()
+  .then((userId) => {
+    initializeSentry(SentryAppNameTag.Sidebar, userId)
+  })
+  .catch((error) => {
+    logger.error(error, {
+      tags: { file: 'SidebarApp.tsx', function: 'getLocalUserId' },
+    })
+  })
+
+const router = sentryCreateHashRouter([
+  {
+    path: '',
+    element: <SidebarWrapper />,
+    errorElement: <ErrorElement />,
+    children: [
+      {
+        path: '',
+        element: <MainContent />,
+      },
+      {
+        path: AppRoutes.AccountSwitcher,
+        element: <AccountSwitcherScreen />,
+      },
+      {
+        path: AppRoutes.Settings,
+        element: <SettingsScreenWrapper />,
+        children: [
+          {
+            path: '',
+            element: <SettingsScreen />,
+          },
+          {
+            path: SettingsRoutes.ChangePassword,
+            element: <SettingsChangePasswordScreen />,
+          },
+          isDevEnv()
+            ? {
+                path: SettingsRoutes.DevMenu,
+                element: <DevMenuScreen />,
+              }
+            : {},
+          {
+            path: SettingsRoutes.ViewRecoveryPhrase,
+            element: <SettingsViewRecoveryPhraseScreen />,
+          },
+          {
+            path: SettingsRoutes.RemoveRecoveryPhrase,
+            children: [
+              {
+                path: RemoveRecoveryPhraseRoutes.Wallets,
+                element: <RemoveRecoveryPhraseWallets />,
+              },
+              {
+                path: RemoveRecoveryPhraseRoutes.Verify,
+                element: <RemoveRecoveryPhraseVerify />,
+              },
+            ],
+          },
+          {
+            path: SettingsRoutes.Privacy,
+            element: <SettingsPrivacyScreen />,
+          },
+        ],
+      },
+      {
+        path: AppRoutes.Transfer,
+        element: <TransferFlowScreen />,
+      },
+      {
+        path: AppRoutes.Swap,
+        element: <SwapFlowScreen />,
+      },
+      {
+        path: AppRoutes.Receive,
+        element: <ReceiveScreen />,
+      },
+    ],
+  },
+])
+
+const PORT_PING_INTERVAL = 5 * ONE_SECOND_MS
+function useDappRequestPortListener(): void {
+  const dispatch = useAppDispatch()
+  const [currentPortChannel, setCurrentPortChannel] = useState<DappBackgroundPortChannel | undefined>()
+  const [windowId, setWindowId] = useState<string | undefined>()
+
+  useEffect(() => {
+    chrome.windows.getCurrent((window) => {
+      setWindowId(window.id?.toString())
+    })
+
+    return () => currentPortChannel?.port.disconnect()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  useEffect(() => {
+    if (windowId === undefined || currentPortChannel) {
+      return
+    }
+
+    try {
+      const port = chrome.runtime.connect({ name: windowId.toString() })
+      const portChannel = createBackgroundToSidePanelMessagePort(port)
+      portChannel.addMessageListener(BackgroundToSidePanelRequestType.DappRequestReceived, (message) => {
+        const { dappRequest, senderTabInfo, isSidebarClosed } = message
+        dispatch(
+          addRequest({
+            dappRequest,
+            senderTabInfo,
+            isSidebarClosed,
+          }),
+        )
+      })
+
+      port.onDisconnect.addListener(() => {
+        sendAnalyticsEvent(ExtensionEventName.SidebarClosed)
+        setCurrentPortChannel(undefined)
+      })
+      setCurrentPortChannel(portChannel)
+    } catch (error) {
+      logger.error(error, {
+        tags: { file: 'SidebarApp.tsx', function: 'useDappRequestPortListener' },
+      })
+    }
+  }, [dispatch, windowId, currentPortChannel])
+
+  useInterval(() => {
+    try {
+      // Need to send general ping message, no type-safety needed
+      currentPortChannel?.port.postMessage('statusPing')
+    } catch (error) {
+      currentPortChannel?.port.disconnect()
+      setCurrentPortChannel(undefined)
+
+      logger.error(error, {
+        tags: { file: 'SidebarApp.tsx', function: 'useDappRequestPortListener' },
+      })
+    }
+  }, PORT_PING_INTERVAL)
+}
+
+function SidebarWrapper(): JSX.Element {
+  const dispatch = useAppDispatch()
+  useDappRequestPortListener()
+
+  useEffect(() => {
+    dispatch(syncAppWithDeviceLanguage())
+  }, [dispatch])
+
+  return (
+    <>
+      <ScrollRestoration />
+      <WebNavigation />
+    </>
+  )
+}
+
+/**
+ * Note: we are using a pattern here to avoid circular dependencies, because
+ * this is the root of the app and it imports all sub-pages, we need to push the
+ * router/router state to a different file so it can be imported by those pages
+ */
+router.subscribe((state) => {
+  setRouterState(state)
+})
+
+setRouter(router)
+
+export default function SidebarApp(): JSX.Element {
+  // initialize analytics on load
+  useEffect(() => {
+    initExtensionAnalytics().catch(() => undefined)
+  }, [])
+
+  const isLoggedIn = useIsWalletUnlocked()
+  const hasSentLoginEvent = useRef(false)
+  useEffect(() => {
+    if (isLoggedIn !== null && !hasSentLoginEvent.current) {
+      hasSentLoginEvent.current = true
+      sendAnalyticsEvent(ExtensionEventName.SidebarLoad, { locked: !isLoggedIn })
+    }
+  }, [isLoggedIn])
+
+  return (
+    <Trace>
+      <PersistGate persistor={getReduxPersistor()}>
+        <ExtensionStatsigProvider>
+          <I18nextProvider i18n={i18n}>
+            <SharedProvider reduxStore={getReduxStore()}>
+              <ErrorBoundary>
+                <GraphqlProvider>
+                  <LocalizationContextProvider>
+                    <UnitagUpdaterContextProvider>
+                      <TraceUserProperties />
+                      <DappContextProvider>
+                        <PrimaryAppInstanceDebuggerLazy />
+                        <RouterProvider router={router} />
+                      </DappContextProvider>
+                    </UnitagUpdaterContextProvider>
+                  </LocalizationContextProvider>
+                </GraphqlProvider>
+              </ErrorBoundary>
+            </SharedProvider>
+          </I18nextProvider>
+        </ExtensionStatsigProvider>
+      </PersistGate>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/StatsigProvider.tsx b/apps/extension/src/app/StatsigProvider.tsx
new file mode 100644
index 00000000000..c0102bdb782
--- /dev/null
+++ b/apps/extension/src/app/StatsigProvider.tsx
@@ -0,0 +1,53 @@
+import { getLocalUserId } from 'src/app/utils/storage'
+import { getStatsigEnvironmentTier } from 'src/app/version'
+import Statsig from 'statsig-js' // Use JS package for browser
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { DUMMY_STATSIG_SDK_KEY, StatsigCustomAppValue } from 'uniswap/src/features/gating/constants'
+import { StatsigOptions, StatsigProvider, StatsigUser } from 'uniswap/src/features/gating/sdk/statsig'
+import { useAsyncData } from 'utilities/src/react/hooks'
+
+async function getStatsigUser(): Promise<StatsigUser> {
+  return {
+    userID: await getLocalUserId(),
+    appVersion: process.env.VERSION,
+    custom: {
+      app: StatsigCustomAppValue.Extension,
+    },
+  }
+}
+
+export function ExtensionStatsigProvider({ children }: { children: React.ReactNode }): JSX.Element {
+  const { data: user } = useAsyncData(getStatsigUser)
+
+  const nonNullUser: StatsigUser = user ?? {
+    userID: undefined,
+    custom: {
+      app: StatsigCustomAppValue.Extension,
+    },
+    appVersion: process.env.VERSION,
+  }
+
+  const options: StatsigOptions = {
+    environment: {
+      tier: getStatsigEnvironmentTier(),
+    },
+    api: uniswapUrls.statsigProxyUrl,
+    disableAutoMetricsLogging: true,
+    disableErrorLogging: true,
+  }
+
+  return (
+    <StatsigProvider options={options} sdkKey={DUMMY_STATSIG_SDK_KEY} user={nonNullUser} waitForInitialization={false}>
+      {children}
+    </StatsigProvider>
+  )
+}
+
+export async function initStatSigForBrowserScripts(): Promise<void> {
+  await Statsig.initialize(DUMMY_STATSIG_SDK_KEY, await getStatsigUser(), {
+    api: uniswapUrls.statsigProxyUrl,
+    environment: {
+      tier: getStatsigEnvironmentTier(),
+    },
+  })
+}
diff --git a/apps/extension/src/app/apollo.tsx b/apps/extension/src/app/apollo.tsx
new file mode 100644
index 00000000000..450dbf02cb3
--- /dev/null
+++ b/apps/extension/src/app/apollo.tsx
@@ -0,0 +1,20 @@
+import { ApolloProvider } from '@apollo/client'
+import { PropsWithChildren } from 'react'
+import { localStorage } from 'redux-persist-webextension-storage'
+// eslint-disable-next-line no-restricted-imports
+import { usePersistedApolloClient } from 'wallet/src/data/apollo/usePersistedApolloClient'
+
+// Extension local storage has 10 MB limit, so we want to be very careful to leave enough space for the redux store + any other data that we might want to store in local storage
+const MAX_CACHE_SIZE_IN_BYTES = 1024 * 1024 * 5 // 5 MB
+
+export function GraphqlProvider({ children }: PropsWithChildren<unknown>): JSX.Element {
+  const apolloClient = usePersistedApolloClient({
+    storageWrapper: localStorage,
+    maxCacheSizeInBytes: MAX_CACHE_SIZE_IN_BYTES,
+  })
+
+  if (!apolloClient) {
+    return <></>
+  }
+  return <ApolloProvider client={apolloClient}>{children}</ApolloProvider>
+}
diff --git a/apps/extension/src/app/components/ComingSoon.tsx b/apps/extension/src/app/components/ComingSoon.tsx
new file mode 100644
index 00000000000..682ce848e62
--- /dev/null
+++ b/apps/extension/src/app/components/ComingSoon.tsx
@@ -0,0 +1,33 @@
+import { PropsWithChildren } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Flex, Text, Tooltip } from 'ui/src'
+
+type Side = 'top' | 'right' | 'bottom' | 'left'
+type Alignment = 'start' | 'end'
+type AlignedPlacement = `${Side}-${Alignment}`
+
+export function ComingSoon({
+  children,
+  placement = 'bottom-end',
+}: PropsWithChildren & {
+  placement?: Side | AlignedPlacement
+}): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Tooltip delay={20} placement={placement}>
+      <Tooltip.Trigger>
+        <Flex grow flex={1}>
+          {children}
+        </Flex>
+      </Tooltip.Trigger>
+      <Tooltip.Content px="$none" py="$none">
+        <Flex p="$spacing12">
+          <Text color="$neutral2" variant="body3">
+            {t('settings.setting.beta.tooltip')}
+          </Text>
+        </Flex>
+      </Tooltip.Content>
+    </Tooltip>
+  )
+}
diff --git a/apps/extension/src/app/components/ErrorElement.tsx b/apps/extension/src/app/components/ErrorElement.tsx
new file mode 100644
index 00000000000..6875a070794
--- /dev/null
+++ b/apps/extension/src/app/components/ErrorElement.tsx
@@ -0,0 +1,13 @@
+import { PropsWithChildren } from 'react'
+import { useRouteError } from 'react-router-dom'
+
+export function ErrorElement({ children }: PropsWithChildren<unknown>): JSX.Element {
+  const error = useRouteError()
+
+  if (!error) {
+    return <>{children}</>
+  }
+
+  // Need to throw here to propagate to the ErrorBoundary
+  throw error
+}
diff --git a/apps/extension/src/app/components/Input.tsx b/apps/extension/src/app/components/Input.tsx
new file mode 100644
index 00000000000..d7953e88d59
--- /dev/null
+++ b/apps/extension/src/app/components/Input.tsx
@@ -0,0 +1,38 @@
+import { forwardRef } from 'react'
+import { Input as TamaguiInput, InputProps as TamaguiInputProps } from 'ui/src'
+import { inputStyles } from 'ui/src/components/input/utils'
+import { fonts } from 'ui/src/theme/fonts'
+
+export type InputProps = {
+  large?: boolean
+  hideInput?: boolean
+  centered?: boolean
+} & TamaguiInputProps
+
+export type Input = TamaguiInput
+
+export const Input = forwardRef<Input, InputProps>(function _Input(
+  { large = false, hideInput = false, centered = false, ...rest }: InputProps,
+  ref,
+): JSX.Element {
+  return (
+    <TamaguiInput
+      ref={ref}
+      backgroundColor={large ? '$surface1' : '$surface2'}
+      borderColor="$surface3"
+      borderRadius="$rounded16"
+      borderWidth={1}
+      focusStyle={inputStyles.inputFocus}
+      fontSize={fonts.subheading2.fontSize}
+      height="auto"
+      hoverStyle={inputStyles.inputHover}
+      placeholderTextColor="$neutral3"
+      px={centered ? '$spacing60' : '$spacing24'}
+      py={large ? '$spacing20' : '$spacing16'}
+      secureTextEntry={hideInput}
+      textAlign={centered ? 'center' : 'left'}
+      width="100%"
+      {...rest}
+    />
+  )
+})
diff --git a/apps/extension/src/app/components/MnemonicViewer.tsx b/apps/extension/src/app/components/MnemonicViewer.tsx
new file mode 100644
index 00000000000..73ef4ddf95d
--- /dev/null
+++ b/apps/extension/src/app/components/MnemonicViewer.tsx
@@ -0,0 +1,91 @@
+import { useCallback, useEffect, useMemo } from 'react'
+import { CopyButton } from 'src/app/components/buttons/CopyButton'
+import { Flex, Text, useMedia } from 'ui/src'
+import { logger } from 'utilities/src/logger/logger'
+
+const ROW_SIZE = 3
+
+export const MnemonicViewer = ({ mnemonic }: { mnemonic?: string[] }): JSX.Element => {
+  const media = useMedia()
+  const px = media.xxs ? '$spacing12' : '$spacing32'
+
+  const onCopyPress = useCallback(async () => {
+    if (!mnemonic) {
+      return
+    }
+    const mnemonicString = mnemonic.join(' ')
+    try {
+      if (mnemonicString) {
+        await navigator.clipboard.writeText(mnemonicString)
+      }
+    } catch (error) {
+      logger.error(error, {
+        tags: { file: 'MnemonicViewer.tsx', function: 'onCopyPress' },
+      })
+    }
+  }, [mnemonic])
+
+  useEffect(() => {
+    return () => {
+      navigator.clipboard.writeText('').catch((error) => {
+        logger.error(error, {
+          tags: { file: 'MnemonicViewer.tsx', function: 'MnemonicViewer#useEffect' },
+        })
+      })
+    }
+  }, [])
+
+  const rows = useMemo(() => {
+    if (!mnemonic) {
+      return null
+    }
+    const elements = []
+    for (let i = 0; i < mnemonic.length; i += ROW_SIZE) {
+      elements.push(<SeedPhraseRow key={i} startIndex={i + 1} words={mnemonic.slice(i, i + ROW_SIZE)} />)
+    }
+    return elements
+  }, [mnemonic])
+
+  return (
+    <Flex
+      backgroundColor="$surface2"
+      borderColor="$surface3"
+      borderRadius="$rounded20"
+      borderWidth={1}
+      gap="$spacing12"
+      position="relative"
+      px={px}
+      py="$spacing24"
+      width="100%"
+    >
+      {rows}
+      <Flex alignItems="center" left="50%" position="absolute" top={-16} transform="translateX(-50%)">
+        <CopyButton onCopyPress={onCopyPress} />
+      </Flex>
+    </Flex>
+  )
+}
+
+function SeedPhraseRow({ words, startIndex }: { words: string[]; startIndex: number }): JSX.Element {
+  return (
+    <Flex fill row>
+      {words.map((word, index) => (
+        <SeedPhraseWord key={index} index={index + startIndex} word={word} />
+      ))}
+    </Flex>
+  )
+}
+
+function SeedPhraseWord({ index, word }: { index: number; word: string }): JSX.Element {
+  const media = useMedia()
+  const fontVariant = 'body3'
+  const gap = media.xxs ? '$spacing4' : '$spacing8'
+  return (
+    <Flex fill row flexBasis={0} gap={gap}>
+      <Text color="$neutral3" minWidth={16} variant={fontVariant}>
+        {index}
+      </Text>
+      <Text variant={fontVariant}>{word}</Text>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/components/OptionalStrictMode.tsx b/apps/extension/src/app/components/OptionalStrictMode.tsx
new file mode 100644
index 00000000000..75de22e68ca
--- /dev/null
+++ b/apps/extension/src/app/components/OptionalStrictMode.tsx
@@ -0,0 +1,8 @@
+import { StrictMode } from 'react'
+
+// TODO(EXT-1229): We had to remove `React.StrictMode` because it's not
+// currently supported by Reanimated Web. We should consider re-enabling
+// once Reanimated fixes this.
+export function OptionalStrictMode(props: { children: React.ReactNode }): JSX.Element {
+  return process.env.ENABLE_STRICT_MODE ? <StrictMode>{props.children}</StrictMode> : <>{props.children}</>
+}
diff --git a/apps/extension/src/app/components/PasswordInput.tsx b/apps/extension/src/app/components/PasswordInput.tsx
new file mode 100644
index 00000000000..7ba406b366a
--- /dev/null
+++ b/apps/extension/src/app/components/PasswordInput.tsx
@@ -0,0 +1,66 @@
+import { forwardRef } from 'react'
+import { TextInput } from 'react-native'
+import { Input, InputProps } from 'src/app/components/Input'
+import { Button, Flex, FlexProps, IconProps, Text } from 'ui/src'
+import { Eye, EyeOff } from 'ui/src/components/icons'
+import { PasswordStrength, getPasswordStrengthTextAndColor } from 'wallet/src/utils/password'
+
+export const PADDING_STRENGTH_INDICATOR = 76
+
+const iconProps: IconProps = {
+  color: '$neutral3',
+  size: '$icon.20',
+}
+const hoverStyle: FlexProps = {
+  backgroundColor: 'transparent',
+}
+
+interface PasswordInputProps extends InputProps {
+  passwordStrength?: PasswordStrength
+  hideInput: boolean
+  onToggleHideInput?: (hideInput: boolean) => void
+}
+
+export const PasswordInput = forwardRef<TextInput, PasswordInputProps>(function PasswordInput(
+  { passwordStrength, hideInput, onToggleHideInput, value, ...inputProps },
+  ref,
+): JSX.Element {
+  return (
+    <Flex row alignItems="center" position="relative" width="100%">
+      <Input ref={ref} hideInput={hideInput} minHeight="$spacing24" pr="$spacing48" value={value} {...inputProps} />
+
+      {passwordStrength !== undefined ? (
+        <StrengthIndicator strength={passwordStrength} />
+      ) : (
+        onToggleHideInput && (
+          <Button
+            backgroundColor="$transparent"
+            hoverStyle={hoverStyle}
+            position="absolute"
+            pressStyle={hoverStyle}
+            right="$spacing8"
+            onPress={(): void => onToggleHideInput(!hideInput)}
+          >
+            {hideInput ? <Eye {...iconProps} /> : <EyeOff {...iconProps} />}
+          </Button>
+        )
+      )}
+    </Flex>
+  )
+})
+
+function StrengthIndicator({ strength }: { strength: PasswordStrength }): JSX.Element | null {
+  if (strength === PasswordStrength.NONE) {
+    return null
+  }
+
+  const { text, color } = getPasswordStrengthTextAndColor(strength)
+
+  return (
+    <Flex position="absolute" right="$spacing24">
+      <Text color={color} variant="buttonLabel4">
+        {text}
+      </Text>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/components/Trace/TraceUserProperties.tsx b/apps/extension/src/app/components/Trace/TraceUserProperties.tsx
new file mode 100644
index 00000000000..0d66f9f6f7f
--- /dev/null
+++ b/apps/extension/src/app/components/Trace/TraceUserProperties.tsx
@@ -0,0 +1,72 @@
+import { useEffect } from 'react'
+import { useColorScheme } from 'react-native'
+import { ExtensionUserPropertyName, setUserProperty } from 'uniswap/src/features/telemetry/user'
+// eslint-disable-next-line no-restricted-imports
+import { analytics } from 'utilities/src/telemetry/analytics/analytics'
+import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import { useGatingUserPropertyUsernames } from 'wallet/src/features/gating/userPropertyHooks'
+import { useCurrentLanguage } from 'wallet/src/features/language/hooks'
+import {
+  useActiveAccount,
+  useHideSmallBalancesSetting,
+  useHideSpamTokensSetting,
+  useSignerAccounts,
+  useViewOnlyAccounts,
+} from 'wallet/src/features/wallet/hooks'
+
+/** Component that tracks UserProperties during the lifetime of the app */
+export function TraceUserProperties(): null {
+  const colorScheme = useColorScheme()
+  const viewOnlyAccounts = useViewOnlyAccounts()
+  const activeAccount = useActiveAccount()
+  const signerAccounts = useSignerAccounts()
+  const hideSmallBalances = useHideSmallBalancesSetting()
+  const hideSpamTokens = useHideSpamTokensSetting()
+  const currentLanguage = useCurrentLanguage()
+  const appFiatCurrencyInfo = useAppFiatCurrencyInfo()
+
+  useGatingUserPropertyUsernames()
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.AppVersion, chrome.runtime.getManifest().version)
+    return () => {
+      analytics.flushEvents()
+    }
+  }, [])
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.DarkMode, colorScheme === 'dark')
+  }, [colorScheme])
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.WalletSignerCount, signerAccounts.length)
+    setUserProperty(
+      ExtensionUserPropertyName.WalletSignerAccounts,
+      signerAccounts.map((account) => account.address),
+    )
+  }, [signerAccounts])
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.WalletViewOnlyCount, viewOnlyAccounts.length)
+  }, [viewOnlyAccounts])
+
+  useEffect(() => {
+    if (!activeAccount) {
+      return
+    }
+    setUserProperty(ExtensionUserPropertyName.ActiveWalletAddress, activeAccount.address)
+    setUserProperty(ExtensionUserPropertyName.ActiveWalletType, activeAccount.type)
+    setUserProperty(ExtensionUserPropertyName.IsHideSmallBalancesEnabled, hideSmallBalances)
+    setUserProperty(ExtensionUserPropertyName.IsHideSpamTokensEnabled, hideSpamTokens)
+  }, [activeAccount, hideSmallBalances, hideSpamTokens])
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.Language, currentLanguage)
+  }, [currentLanguage])
+
+  useEffect(() => {
+    setUserProperty(ExtensionUserPropertyName.Currency, appFiatCurrencyInfo.code)
+  }, [appFiatCurrencyInfo])
+
+  return null
+}
diff --git a/apps/extension/src/app/components/buttons/CopyButton.tsx b/apps/extension/src/app/components/buttons/CopyButton.tsx
new file mode 100644
index 00000000000..ac94f03c820
--- /dev/null
+++ b/apps/extension/src/app/components/buttons/CopyButton.tsx
@@ -0,0 +1,75 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { AnimatePresence, Flex, Text, TouchableArea } from 'ui/src'
+import { Check, CopySheets } from 'ui/src/components/icons'
+import { iconSizes, zIndices } from 'ui/src/theme'
+
+export function CopyButton({ onCopyPress }: { onCopyPress: () => Promise<void> }): JSX.Element {
+  const { t } = useTranslation()
+
+  const [valueCopied, setValueCopied] = useState(false)
+
+  const onPress = async (): Promise<void> => {
+    await onCopyPress()
+    setValueCopied(true)
+  }
+
+  return (
+    <Flex row gap="$spacing24">
+      <TouchableArea borderRadius="$rounded20" zIndex={zIndices.fixed} onPress={onCopyPress}>
+        <Flex
+          row
+          alignItems="center"
+          backgroundColor="$surface1"
+          borderColor={valueCopied ? '$statusSuccess' : '$surface3'}
+          borderRadius="$rounded20"
+          borderWidth="$spacing1"
+          gap="$spacing4"
+          justifyContent="center"
+          paddingEnd="$spacing16"
+          px="$spacing8"
+          py="$spacing8"
+          shadowColor="$shadowColor"
+          shadowOffset={{ width: 0, height: 0 }}
+          shadowOpacity={0.1}
+          shadowRadius={4}
+          // fixed width means no resize on the animation to copied
+          width={84}
+          onPress={onPress}
+        >
+          <AnimatePresence exitBeforeEnter initial={false}>
+            {/* note there's various x/y adjustments here due to visual imbalance of icons/text */}
+            <Flex
+              key={valueCopied ? 'copy' : 'copied'}
+              row
+              alignItems="center"
+              animateEnterExit="fadeInDownOutDown"
+              animation="100ms"
+              gap="$spacing8"
+              justifyContent="center"
+              // copied check icon is less wide, content needs to move left to balance
+              x={valueCopied ? -1 : 0}
+            >
+              {valueCopied ? (
+                // check icon is a bit smaller and to the right
+                <Check color="$statusSuccess" size={iconSizes.icon12 + 2} x={2} />
+              ) : (
+                <CopySheets color="$neutral2" size={iconSizes.icon12} />
+              )}
+              <Text
+                color={valueCopied ? '$statusSuccess' : '$neutral2'}
+                cursor="pointer"
+                flexShrink={1}
+                variant="buttonLabel4"
+                x={valueCopied ? -2 : 0}
+                y={0.5}
+              >
+                {valueCopied ? t('common.button.copied') : t('common.button.copy')}
+              </Text>
+            </Flex>
+          </AnimatePresence>
+        </Flex>
+      </TouchableArea>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/components/layout/ScreenHeader.tsx b/apps/extension/src/app/components/layout/ScreenHeader.tsx
new file mode 100644
index 00000000000..980a327454e
--- /dev/null
+++ b/apps/extension/src/app/components/layout/ScreenHeader.tsx
@@ -0,0 +1,34 @@
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex, GeneratedIcon, IconProps, Text, TouchableArea } from 'ui/src'
+import { BackArrow } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+
+export function ScreenHeader({
+  onBackClick,
+  title,
+  rightColumn,
+  Icon = BackArrow,
+}: {
+  title?: JSX.Element | string
+  onBackClick?: () => void
+  rightColumn?: JSX.Element
+  Icon?: GeneratedIcon | ((props: IconProps) => JSX.Element)
+}): JSX.Element {
+  const { navigateBack } = useExtensionNavigation()
+
+  return (
+    <Flex row alignItems="center" px="$spacing8" py="$spacing4" width="100%">
+      <TouchableArea onPress={onBackClick ?? navigateBack}>
+        <Icon color="$neutral2" size="$icon.24" />
+      </TouchableArea>
+
+      {/* When there's no right column, we adjust the margin to match the icon width. This is so that the title is centered on the screen. */}
+      <Flex centered fill mr={rightColumn ? '$none' : iconSizes.icon24} py="$spacing8">
+        {/* // Render empty string if no title to account for Text element added padding for consistent size*/}
+        <Text variant="subheading1">{title ?? ' '}</Text>
+      </Flex>
+
+      {rightColumn && <Flex>{rightColumn}</Flex>}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/components/loading/LoadingSpinner.tsx b/apps/extension/src/app/components/loading/LoadingSpinner.tsx
new file mode 100644
index 00000000000..ebf93d8c501
--- /dev/null
+++ b/apps/extension/src/app/components/loading/LoadingSpinner.tsx
@@ -0,0 +1,28 @@
+import { Flex } from 'ui/src'
+import { LoadingSpinnerInner, LoadingSpinnerOuter } from 'ui/src/components/icons'
+
+const SPINNER_HEIGHT = 80
+
+export function LoadingSpinner(): JSX.Element {
+  return (
+    <>
+      <Flex height={SPINNER_HEIGHT} position="relative" width={80}>
+        <Flex bottom={0} left={0} position="absolute" right={0} top={0}>
+          <LoadingSpinnerOuter color="$DEP_brandedAccentSoft" size={80} />
+        </Flex>
+        <Flex
+          bottom={0}
+          left={0}
+          position="absolute"
+          right={0}
+          style={{ animation: `spin ${SPIN_SPEED_MS}ms linear infinite` }}
+          top={0}
+        >
+          <LoadingSpinnerInner color="$accent1" size={80} />
+        </Flex>
+      </Flex>
+    </>
+  )
+}
+
+const SPIN_SPEED_MS = 1000
diff --git a/apps/extension/src/app/components/loading/SelectWalletSkeleton.tsx b/apps/extension/src/app/components/loading/SelectWalletSkeleton.tsx
new file mode 100644
index 00000000000..1a4cbcb8e55
--- /dev/null
+++ b/apps/extension/src/app/components/loading/SelectWalletSkeleton.tsx
@@ -0,0 +1,43 @@
+import { SkeletonBox } from 'src/app/components/loading/SkeletonBox'
+import { Flex } from 'ui/src'
+import { WALLET_PREVIEW_CARD_HEIGHT } from 'wallet/src/components/WalletPreviewCard/WalletPreviewCard'
+
+export function SelectWalletsSkeleton({ repeat = 3 }: { repeat?: number }): JSX.Element {
+  return (
+    <Flex fill gap="$spacing12">
+      {new Array(repeat).fill(null).map((_, i, { length }) => (
+        <WalletSkeleton key={i} opacity={(length - i) / length} />
+      ))}
+    </Flex>
+  )
+}
+
+function WalletSkeleton({ opacity }: { opacity: number }): JSX.Element {
+  return (
+    <Flex
+      row
+      alignItems="center"
+      borderColor="$surface3"
+      borderRadius="$rounded20"
+      borderWidth={1}
+      height={WALLET_PREVIEW_CARD_HEIGHT}
+      justifyContent="flex-start"
+      opacity={opacity}
+      overflow="hidden"
+      px="$spacing16"
+      py="$spacing16"
+      style={{
+        boxShadow: 'rgba(0, 0, 0, 0.05) 0px 0px 8px',
+      }}
+    >
+      <Flex fill row alignItems="center" gap="$spacing12">
+        <Flex backgroundColor="$neutral3" borderRadius="$roundedFull" height={32} opacity={0.5} width={32} />
+
+        <Flex grow alignItems="flex-start" gap="$spacing2">
+          <SkeletonBox height={21} width={150} />
+          <SkeletonBox height={21} width={95} />
+        </Flex>
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/components/loading/SkeletonBox.css b/apps/extension/src/app/components/loading/SkeletonBox.css
new file mode 100644
index 00000000000..aebf9b3e3e0
--- /dev/null
+++ b/apps/extension/src/app/components/loading/SkeletonBox.css
@@ -0,0 +1,40 @@
+.skeleton-box {
+  display: inline-block;
+  height: 1em;
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton-box::after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  transform: translateX(-100%);
+  background-image: linear-gradient(
+    -75deg,
+    rgba(240, 240, 240, 0) 0,
+    rgba(240, 240, 240, 0.2) 20%,
+    rgba(240, 240, 240, 0.5) 60%,
+    rgba(240, 240, 240, 0)
+  );
+  animation: skeleton-box-shimmer 1s linear infinite;
+  content: '';
+}
+
+.t_dark .skeleton-box::after {
+  background-image: linear-gradient(
+    -75deg,
+    rgba(30, 30, 30, 0) 0,
+    rgba(30, 30, 30, 0.2) 20%,
+    rgba(30, 30, 30, 0.5) 60%,
+    rgba(30, 30, 30, 0)
+  );
+}
+
+@keyframes skeleton-box-shimmer {
+  100% {
+    transform: translateX(100%);
+  }
+}
diff --git a/apps/extension/src/app/components/loading/SkeletonBox.tsx b/apps/extension/src/app/components/loading/SkeletonBox.tsx
new file mode 100644
index 00000000000..07291bb34ef
--- /dev/null
+++ b/apps/extension/src/app/components/loading/SkeletonBox.tsx
@@ -0,0 +1,16 @@
+import 'src/app/components/loading/SkeletonBox.css'
+
+/**
+ * Unlike the `ui/src/Skeleton`, this `SkeletonBox` animation does not run in the main thread, so it won't be choppy if the main thread is busy.
+ */
+export function SkeletonBox({
+  width = '100%',
+  height,
+  borderRadius = '5px',
+}: {
+  width?: number | string
+  height: number | string
+  borderRadius?: string
+}): JSX.Element {
+  return <div className="skeleton-box" style={{ width, height, borderRadius }} />
+}
diff --git a/apps/extension/src/app/components/modal/FeedbackRequestModal.tsx b/apps/extension/src/app/components/modal/FeedbackRequestModal.tsx
new file mode 100644
index 00000000000..967b34fceb0
--- /dev/null
+++ b/apps/extension/src/app/components/modal/FeedbackRequestModal.tsx
@@ -0,0 +1,62 @@
+import { t } from 'i18next'
+import { Button, Flex, Text, useSporeColors } from 'ui/src'
+import { MessageStar } from 'ui/src/components/icons'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { selectExtensionBetaFeedbackState } from 'wallet/src/features/behaviorHistory/selectors'
+import { ExtensionBetaFeedbackState, setExtensionBetaFeedbackState } from 'wallet/src/features/behaviorHistory/slice'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
+
+export function FeedbackRequestModal(): JSX.Element {
+  const dispatch = useAppDispatch()
+  const colors = useSporeColors()
+
+  const onDismiss = (): void => {
+    dispatch(setExtensionBetaFeedbackState(ExtensionBetaFeedbackState.Shown))
+  }
+
+  const openFeedbackUrl = (): void => {
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    window.open(uniswapUrls.extensionFeedbackFormUrl, '_blank')
+    onDismiss()
+  }
+
+  const isOpen = useAppSelector(selectExtensionBetaFeedbackState) === ExtensionBetaFeedbackState.ReadyToShow
+
+  return (
+    <BottomSheetModal
+      alignment="center"
+      backgroundColor={colors.surface1.val}
+      isModalOpen={isOpen}
+      name={ModalName.ExtensionBetaFeedbackModal}
+      onClose={onDismiss}
+    >
+      <Flex alignItems="center" gap="$spacing12" pt="$spacing12">
+        <Flex backgroundColor="$accent2" borderRadius="$rounded12" p="$spacing12">
+          <MessageStar color="$accent1" size="$icon.24" />
+        </Flex>
+        <Flex alignItems="center" gap="$spacing12" pb="$spacing16" pt="$spacing8" px="$spacing4">
+          <Text color="$neutral1" textAlign="center" variant="subheading2">
+            {t('extension.feedback.title')}
+          </Text>
+          <Text color="$neutral2" textAlign="center" variant="body3">
+            {t('extension.feedback.description')}
+          </Text>
+        </Flex>
+        <Flex fill row gap="$spacing12" width="100%">
+          <Button flex={1} textAlign="center" theme="tertiary" width="100%" onPress={onDismiss}>
+            <Text color="$neutral2" variant="buttonLabel3">
+              {t('common.button.later')}
+            </Text>
+          </Button>
+          <Button flex={1} textAlign="center" theme="accentSecondary" width="100%" onPress={openFeedbackUrl}>
+            <Text color="$accent1" variant="buttonLabel3">
+              {t('common.button.share')}
+            </Text>
+          </Button>
+        </Flex>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
diff --git a/apps/extension/src/app/components/modal/InfoModal.tsx b/apps/extension/src/app/components/modal/InfoModal.tsx
new file mode 100644
index 00000000000..e254a9e8a53
--- /dev/null
+++ b/apps/extension/src/app/components/modal/InfoModal.tsx
@@ -0,0 +1,82 @@
+import { ReactNode } from 'react'
+import { Anchor, Button, Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
+import { X } from 'ui/src/components/icons'
+import { zIndices } from 'ui/src/theme'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { ModalNameType } from 'uniswap/src/features/telemetry/constants'
+
+export interface BottomModalProps {
+  name: ModalNameType
+  isOpen: boolean
+  showCloseButton?: boolean
+  onDismiss?: () => void
+  icon: ReactNode
+  title: string
+  description: string
+  buttonText: string
+  buttonTheme?: 'primary' | 'secondary' | 'tertiary'
+  onButtonPress?: () => void
+  linkText?: string
+  linkUrl?: string
+}
+
+export function InfoModal({
+  name,
+  isOpen,
+  showCloseButton,
+  onDismiss,
+  icon,
+  title,
+  description,
+  buttonText,
+  buttonTheme,
+  onButtonPress,
+  linkText,
+  linkUrl,
+}: React.PropsWithChildren<BottomModalProps>): JSX.Element {
+  const colors = useSporeColors()
+
+  return (
+    <BottomSheetModal
+      alignment="bottom"
+      backgroundColor={colors.surface1.val}
+      isModalOpen={isOpen}
+      name={name}
+      onClose={onDismiss}
+    >
+      {showCloseButton && (
+        <TouchableArea
+          p="$spacing16"
+          position="absolute"
+          right={0}
+          top={0}
+          zIndex={zIndices.default}
+          onPress={onDismiss}
+        >
+          <X color="$neutral2" size="$icon.16" />
+        </TouchableArea>
+      )}
+      <Flex alignItems="center" gap="$spacing8" pt="$spacing16">
+        {icon}
+        <Flex alignItems="center" gap="$spacing8" pb="$spacing16" pt="$spacing8" px="$spacing4">
+          <Text color="$neutral1" textAlign="center" variant="subheading2">
+            {title}
+          </Text>
+          <Text color="$neutral2" textAlign="center" variant="body3">
+            {description}
+          </Text>
+        </Flex>
+        <Button size="medium" theme={buttonTheme} width="100%" onPress={onButtonPress}>
+          {buttonText}
+        </Button>
+        {linkText && linkUrl && (
+          <Anchor href={linkUrl} lineHeight={16} p="$spacing12" target="_blank" textDecorationLine="none">
+            <Text color="$neutral2" textAlign="center" variant="buttonLabel4">
+              {linkText}
+            </Text>
+          </Anchor>
+        )}
+      </Flex>
+    </BottomSheetModal>
+  )
+}
diff --git a/apps/extension/src/app/components/tabs/ActivityTab.tsx b/apps/extension/src/app/components/tabs/ActivityTab.tsx
new file mode 100644
index 00000000000..e79552959a3
--- /dev/null
+++ b/apps/extension/src/app/components/tabs/ActivityTab.tsx
@@ -0,0 +1,23 @@
+import { memo } from 'react'
+import { ScrollView } from 'ui/src'
+import { useActivityData } from 'wallet/src/features/activity/useActivityData'
+
+export const ActivityTab = memo(function _ActivityTab({ address }: { address: Address }): JSX.Element {
+  const { maybeLoaderComponent, maybeEmptyComponent, renderActivityItem, sectionData } = useActivityData({
+    owner: address,
+  })
+
+  if (maybeLoaderComponent) {
+    return maybeLoaderComponent
+  }
+
+  if (maybeEmptyComponent) {
+    return maybeEmptyComponent
+  }
+
+  return (
+    <ScrollView showsVerticalScrollIndicator={false} width="100%">
+      {(sectionData ?? []).map((item) => renderActivityItem({ item }))}
+    </ScrollView>
+  )
+})
diff --git a/apps/extension/src/app/components/tabs/NftsTab.tsx b/apps/extension/src/app/components/tabs/NftsTab.tsx
new file mode 100644
index 00000000000..4ef7b375af4
--- /dev/null
+++ b/apps/extension/src/app/components/tabs/NftsTab.tsx
@@ -0,0 +1,100 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { memo, useCallback } from 'react'
+import { ContextMenu, Flex } from 'ui/src'
+import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
+import { ElementName, SectionName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { NftsList } from 'wallet/src/components/nfts/NftsList'
+import { selectNftsVisibility } from 'wallet/src/features/favorites/selectors'
+import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
+import { ESTIMATED_NFT_LIST_ITEM_SIZE } from 'wallet/src/features/nfts/constants'
+import { NFTItem } from 'wallet/src/features/nfts/types'
+import { useNFTContextMenu } from 'wallet/src/features/nfts/useNftContextMenu'
+import { getIsNftHidden } from 'wallet/src/features/nfts/utils'
+import { useAppSelector } from 'wallet/src/state'
+
+export const NftsTab = memo(function _NftsTab({ owner }: { owner: Address }): JSX.Element {
+  const renderNFTItem = useCallback(
+    (item: NFTItem) => {
+      const onPress = (): void => {
+        sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+          element: ElementName.NftItem,
+          section: SectionName.HomeNFTsTab,
+        })
+      }
+
+      return <NftView item={item} owner={owner} onPress={onPress} />
+    },
+    [owner],
+  )
+
+  return (
+    <NftsList
+      emptyStateStyle={defaultEmptyStyle}
+      errorStateStyle={defaultEmptyStyle}
+      owner={owner}
+      renderNFTItem={renderNFTItem}
+    />
+  )
+})
+
+function NftView({ owner, item, onPress }: { owner: Address; item: NFTItem; onPress: () => void }): JSX.Element {
+  const { menuActions } = useNFTContextMenu({
+    contractAddress: item.contractAddress,
+    tokenId: item.tokenId,
+    owner,
+    isSpam: item.isSpam,
+    chainId: fromGraphQLChain(item.chain) ?? UniverseChainId.Mainnet,
+  })
+
+  const menuOptions = menuActions.map((action) => ({
+    label: action.title,
+    onPress: action.onPress,
+    Icon: action.Icon,
+    destructive: action.destructive,
+  }))
+
+  const nftVisibility = useAppSelector(selectNftsVisibility)
+  const hidden = getIsNftHidden({
+    contractAddress: item.contractAddress,
+    tokenId: item.tokenId,
+    isSpam: item.isSpam,
+    nftVisibility,
+  })
+
+  const itemId = `${item.chain}-${item.contractAddress}-${item.tokenId}-${hidden}`
+
+  return (
+    <Flex grow shrink p="$spacing4">
+      <ContextMenu itemId={itemId} menuOptions={menuOptions}>
+        <Flex
+          alignItems="center"
+          aspectRatio={1}
+          backgroundColor="$surface3"
+          borderRadius="$rounded12"
+          overflow="hidden"
+          width="100%"
+          onPress={onPress}
+        >
+          <NFTViewer
+            showSvgPreview
+            contractAddress={item.contractAddress}
+            imageDimensions={item.imageDimensions}
+            limitGIFSize={ESTIMATED_NFT_LIST_ITEM_SIZE}
+            placeholderContent={item.name || item.collectionName}
+            squareGridView={true}
+            tokenId={item.tokenId}
+            uri={item.imageUrl ?? ''}
+          />
+        </Flex>
+      </ContextMenu>
+    </Flex>
+  )
+}
+
+const defaultEmptyStyle = {
+  minHeight: 100,
+  paddingVertical: '$spacing12',
+  width: '100%',
+}
diff --git a/apps/extension/src/app/constants.ts b/apps/extension/src/app/constants.ts
new file mode 100644
index 00000000000..a27c12025f6
--- /dev/null
+++ b/apps/extension/src/app/constants.ts
@@ -0,0 +1,3 @@
+import { SpaceTokens } from 'ui/src'
+
+export const SCREEN_ITEM_HORIZONTAL_PAD = '$spacing12' satisfies SpaceTokens
diff --git a/apps/extension/src/app/events/constants.ts b/apps/extension/src/app/events/constants.ts
new file mode 100644
index 00000000000..7a81e3140fd
--- /dev/null
+++ b/apps/extension/src/app/events/constants.ts
@@ -0,0 +1,3 @@
+export enum GlobalErrorEvent {
+  ReduxStorageExceeded = 'ReduxStorageExceeded',
+}
diff --git a/apps/extension/src/app/events/global.ts b/apps/extension/src/app/events/global.ts
new file mode 100644
index 00000000000..d631a731e36
--- /dev/null
+++ b/apps/extension/src/app/events/global.ts
@@ -0,0 +1,5 @@
+import EventEmitter from 'eventemitter3'
+import { GlobalErrorEvent } from 'src/app/events/constants'
+
+class GlobalEventEmitter extends EventEmitter<GlobalErrorEvent> {}
+export const globalEventEmitter = new GlobalEventEmitter()
diff --git a/apps/extension/src/app/features/accounts/AccountItem.tsx b/apps/extension/src/app/features/accounts/AccountItem.tsx
new file mode 100644
index 00000000000..f7a5372367f
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/AccountItem.tsx
@@ -0,0 +1,192 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { BaseSyntheticEvent, useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { EditLabelModal } from 'src/app/features/accounts/EditLabelModal'
+import { removeAllDappConnectionsForAccount } from 'src/app/features/dapp/actions'
+import { ContextMenu, Flex, MenuContentItem, Text, TouchableArea } from 'ui/src'
+import { CopySheets, Edit, TrashFilled, TripleDots } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { NumberType } from 'utilities/src/format/types'
+import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
+import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { usePortfolioTotalValue } from 'wallet/src/features/dataApi/balances'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
+import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import { useActiveAccountWithThrow, useDisplayName, useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+
+type AccountItemProps = {
+  address: Address
+  onAccountSelect?: () => void
+}
+
+export function AccountItem({ address, onAccountSelect }: AccountItemProps): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const { data, loading, error } = usePortfolioTotalValue({ address })
+  const { balanceUSD } = data || {}
+
+  const { convertFiatAmountFormatted } = useLocalizationContext()
+  const formattedBalance = convertFiatAmountFormatted(balanceUSD, NumberType.PortfolioBalance)
+
+  const [showEditLabelModal, setShowEditLabelModal] = useState(false)
+
+  const displayName = useDisplayName(address)
+  const hasDisplayName = displayName?.type === DisplayNameType.Unitag || displayName?.type === DisplayNameType.ENS
+
+  const accounts = useSignerAccounts()
+  const activeAccount = useActiveAccountWithThrow()
+  const activeAccountDisplayName = useDisplayName(activeAccount.address)
+
+  const [showRemoveWalletModal, setShowRemoveWalletModal] = useState(false)
+  const onRemoveWallet = useCallback(async () => {
+    const accountForDeletion = accounts.find((account) => account.address === address)
+    if (!accountForDeletion) {
+      return
+    }
+
+    await removeAllDappConnectionsForAccount(accountForDeletion)
+    dispatch(
+      editAccountActions.trigger({
+        type: EditAccountAction.Remove,
+        accounts: [accountForDeletion],
+      }),
+    )
+  }, [accounts, address, dispatch])
+
+  const onPressCopyAddress = useCallback(
+    async (e: BaseSyntheticEvent) => {
+      // We have to manually prevent click-through because the way the context menu is inside of a TouchableArea in this component it
+      // means that without it the TouchableArea handler will get called
+      // TODO(EXT-1325): Use a different ContextMenu component that works inside a TouchableArea
+      e.preventDefault()
+      e.stopPropagation()
+
+      await setClipboard(address)
+      dispatch(
+        pushNotification({
+          type: AppNotificationType.Copied,
+          copyType: CopyNotificationType.Address,
+        }),
+      )
+      sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+        element: ElementName.CopyAddress,
+        modal: ModalName.AccountSwitcher,
+      })
+    },
+    [address, dispatch],
+  )
+
+  const menuOptions = useMemo((): MenuContentItem[] => {
+    return [
+      // hide edit label if account has unitag or ENS
+      ...(!hasDisplayName
+        ? [
+            {
+              label: t('account.wallet.menu.edit.title'),
+              onPress: (e: BaseSyntheticEvent): void => {
+                // We have to manually prevent click-through because the way the context menu is inside of a TouchableArea in this component it
+                // means that without it the TouchableArea handler will get called
+                e.preventDefault()
+                e.stopPropagation()
+
+                setShowEditLabelModal(true)
+              },
+              Icon: Edit,
+            },
+          ]
+        : []),
+
+      {
+        label: t('account.wallet.menu.copy.title'),
+        onPress: onPressCopyAddress,
+        Icon: CopySheets,
+      },
+      {
+        label: t('account.wallet.menu.remove.title'),
+        onPress: (e: BaseSyntheticEvent): void => {
+          // We have to manually prevent click-through because the way the context menu is inside of a TouchableArea in this component it
+          // means that without it the TouchableArea handler will get called
+          e.preventDefault()
+          e.stopPropagation()
+
+          setShowRemoveWalletModal(true)
+        },
+        textProps: { color: '$statusCritical' },
+        Icon: TrashFilled,
+        iconProps: { color: '$statusCritical' },
+      },
+    ]
+  }, [hasDisplayName, onPressCopyAddress, t])
+
+  return (
+    <>
+      {showRemoveWalletModal && (
+        <WarningModal
+          caption={t('account.recoveryPhrase.remove.mnemonic.description', {
+            walletName: activeAccountDisplayName?.name ?? '',
+          })}
+          closeText={t('common.button.cancel')}
+          confirmText={t('common.button.continue')}
+          icon={<TrashFilled color="$statusCritical" size="$icon.24" strokeWidth="$spacing1" />}
+          modalName={ModalName.RemoveWallet}
+          severity={WarningSeverity.High}
+          title={t('account.wallet.remove.title', { name: displayName?.name ?? '' })}
+          onClose={() => setShowRemoveWalletModal(false)}
+          onConfirm={onRemoveWallet}
+        />
+      )}
+      {showEditLabelModal && <EditLabelModal address={address} onClose={() => setShowEditLabelModal(false)} />}
+      <TouchableArea
+        hoverable
+        backgroundColor="$surface1"
+        borderRadius="$rounded16"
+        cursor="pointer"
+        p="$spacing12"
+        onPress={onAccountSelect}
+      >
+        <Flex centered fill group row gap="$spacing8" justifyContent="space-between">
+          <AddressDisplay
+            address={address}
+            captionVariant="body3"
+            showViewOnlyBadge={false}
+            size={iconSizes.icon40}
+            variant="subheading2"
+          />
+          <Flex>
+            <Text
+              $group-hover={{ opacity: 0 }}
+              color="$neutral2"
+              opacity={1}
+              position="absolute"
+              right={0}
+              top="50%"
+              transform="translateY(-50%)"
+              variant="body3"
+            >
+              {loading || error ? '' : formattedBalance}
+            </Text>
+            <ContextMenu closeOnClick itemId={address} menuOptions={menuOptions} onLeftClick>
+              <Flex
+                $group-hover={{ opacity: 1 }}
+                borderRadius="$roundedFull"
+                hoverStyle={{ backgroundColor: '$surface2Hovered' }}
+                opacity={0}
+                p="$spacing4"
+              >
+                <TripleDots color="$neutral2" size="$icon.16" />
+              </Flex>
+            </ContextMenu>
+          </Flex>
+        </Flex>
+      </TouchableArea>
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/accounts/AccountSwitcherScreen.test.tsx b/apps/extension/src/app/features/accounts/AccountSwitcherScreen.test.tsx
new file mode 100644
index 00000000000..8d6c2a71e55
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/AccountSwitcherScreen.test.tsx
@@ -0,0 +1,26 @@
+import { AccountSwitcherScreen } from 'src/app/features/accounts/AccountSwitcherScreen'
+import { preloadedExtensionState } from 'src/test/fixtures/redux'
+import { cleanup, render } from 'src/test/test-utils'
+
+const preloadedState = preloadedExtensionState()
+
+const SAMPLE_DAPP = 'http://example.com'
+
+jest.mock('src/app/features/dapp/DappContext', () => {
+  const real = jest.requireActual('src/app/features/dapp/DappContext')
+  return { ...real, useDappContext: jest.fn(() => ({ dappUrl: SAMPLE_DAPP })) }
+})
+
+jest.mock('src/app/features/dapp/hooks', () => {
+  const { ACCOUNT, ACCOUNT3 } = require('wallet/src/test/fixtures')
+  return { useDappConnectedAccounts: jest.fn(() => [ACCOUNT, ACCOUNT3]) }
+})
+
+describe(AccountSwitcherScreen, () => {
+  it('renders correctly', async () => {
+    const tree = render(<AccountSwitcherScreen />, { preloadedState })
+
+    expect(tree).toMatchSnapshot()
+    cleanup()
+  })
+})
diff --git a/apps/extension/src/app/features/accounts/AccountSwitcherScreen.tsx b/apps/extension/src/app/features/accounts/AccountSwitcherScreen.tsx
new file mode 100644
index 00000000000..df1927578c0
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/AccountSwitcherScreen.tsx
@@ -0,0 +1,275 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useSelector } from 'react-redux'
+import { ComingSoon } from 'src/app/components/ComingSoon'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { AccountItem } from 'src/app/features/accounts/AccountItem'
+import { CreateWalletModal } from 'src/app/features/accounts/CreateWalletModal'
+import { EditLabelModal } from 'src/app/features/accounts/EditLabelModal'
+import { useDappContext } from 'src/app/features/dapp/DappContext'
+import { updateDappConnectedAddressFromExtension } from 'src/app/features/dapp/actions'
+import { useDappConnectedAccounts } from 'src/app/features/dapp/hooks'
+import { isConnectedAccount } from 'src/app/features/dapp/utils'
+import { PopupName, openPopup } from 'src/app/features/popups/slice'
+import { AppRoutes, RemoveRecoveryPhraseRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { useAppDispatch } from 'src/store/store'
+import { Button, Flex, MenuContent, MenuContentItem, Popover, ScrollView, Text, useSporeColors } from 'ui/src'
+import { WalletFilled, X } from 'ui/src/components/icons'
+import { spacing } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ModalName, WalletEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { ImportType } from 'uniswap/src/types/onboarding'
+import { logger } from 'utilities/src/logger/logger'
+import { sleep } from 'utilities/src/time/timing'
+import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
+import { PlusCircle } from 'wallet/src/components/icons/PlusCircle'
+import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { createOnboardingAccount } from 'wallet/src/features/onboarding/createOnboardingAccount'
+import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
+import { AccountType, BackupType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
+import { createAccountsActions } from 'wallet/src/features/wallet/create/createAccountsSaga'
+import { useActiveAccountWithThrow, useDisplayName, useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { selectSortedSignerMnemonicAccounts } from 'wallet/src/features/wallet/selectors'
+import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
+import { DisplayNameType } from 'wallet/src/features/wallet/types'
+
+const MIN_MENU_WIDTH = 200
+
+export function AccountSwitcherScreen(): JSX.Element {
+  const colors = useSporeColors()
+  const dispatch = useAppDispatch()
+  const { t } = useTranslation()
+
+  const activeAccount = useActiveAccountWithThrow()
+  const activeAddress = activeAccount.address
+  const isViewOnly = activeAccount.type === AccountType.Readonly
+
+  const accounts = useSignerAccounts()
+  const accountAddresses = useMemo(
+    () => accounts.map((account) => account.address).filter((address) => address !== activeAddress),
+    [accounts, activeAddress],
+  )
+  const { dappUrl } = useDappContext()
+
+  const connectedAccounts = useDappConnectedAccounts(dappUrl)
+
+  // TODO: EXT-899 https://linear.app/uniswap/issue/EXT-899/enable-unitag-edit-button-is-account-header
+  const activeAccountDisplayName = useDisplayName(activeAddress)
+  const activeAccountHasUnitag = activeAccountDisplayName?.type === DisplayNameType.Unitag
+
+  const [showEditLabelModal, setShowEditLabelModal] = useState(false)
+
+  const [showRemoveWalletModal, setShowRemoveWalletModal] = useState(false)
+  const [showCreateWalletModal, setShowCreateWalletModal] = useState(false)
+
+  const [pendingWallet, setPendingWallet] = useState<SignerMnemonicAccount>()
+
+  const sortedMnemonicAccounts = useSelector(selectSortedSignerMnemonicAccounts)
+
+  useEffect(() => {
+    const createOnboardingAccountAfterTransitionAnimation = async (): Promise<void> => {
+      // TODO: EXT-1164 - Move Keyring methods to workers to not block main thread during onboarding
+      // Delays computation heavy function invocation to avoid disrupting transition animation
+      await sleep(400)
+      setPendingWallet(await createOnboardingAccount(sortedMnemonicAccounts))
+    }
+    createOnboardingAccountAfterTransitionAnimation().catch((e) => {
+      logger.error(e, {
+        tags: { file: 'AccountSwitcherScreen', function: 'createOnboardingAccount' },
+      })
+    })
+  }, [sortedMnemonicAccounts])
+
+  const onNavigateToRemoveWallet = (): void => {
+    setShowRemoveWalletModal(false)
+    navigate(`/${AppRoutes.Settings}/${SettingsRoutes.RemoveRecoveryPhrase}/${RemoveRecoveryPhraseRoutes.Wallets}`)
+  }
+
+  const onCancelCreateWallet = (): void => {
+    setShowCreateWalletModal(false)
+  }
+
+  const onConfirmCreateWallet = useCallback(
+    async (walletLabel: string): Promise<void> => {
+      setShowCreateWalletModal(false)
+      if (!pendingWallet) {
+        return
+      }
+
+      if (walletLabel) {
+        pendingWallet.name = walletLabel
+      }
+
+      dispatch(
+        createAccountsActions.trigger({
+          accounts: [pendingWallet],
+        }),
+      )
+
+      sendAnalyticsEvent(WalletEventName.WalletAdded, {
+        wallet_type: ImportType.CreateAdditional,
+        accounts_imported_count: 1,
+        wallets_imported: [pendingWallet.address],
+        cloud_backup_used: pendingWallet.backups?.includes(BackupType.Cloud) ?? false,
+        modal: ModalName.AccountSwitcher,
+      })
+
+      navigate(-1)
+
+      // Only show connect popup if some account is connected to current dapp
+      if (connectedAccounts.length > 0) {
+        dispatch(openPopup(PopupName.Connect))
+      }
+    },
+    [connectedAccounts.length, dispatch, pendingWallet],
+  )
+
+  const addWalletMenuOptions: MenuContentItem[] = [
+    {
+      label: t('account.wallet.button.create'),
+      onPress: (): void => setShowCreateWalletModal(true),
+    },
+    {
+      label: t('account.wallet.button.import'),
+      onPress: (): void => setShowRemoveWalletModal(true),
+    },
+  ]
+
+  const contentShadowProps = {
+    shadowColor: colors.shadowColor.val,
+    shadowRadius: 12,
+    shadowOpacity: 0.1,
+    zIndex: 1,
+  }
+
+  return (
+    <Trace logImpression modal={ModalName.AccountSwitcher}>
+      {showEditLabelModal && <EditLabelModal address={activeAddress} onClose={() => setShowEditLabelModal(false)} />}
+      {showRemoveWalletModal && (
+        <WarningModal
+          caption={t('account.recoveryPhrase.remove.import.description')}
+          closeText={t('common.button.cancel')}
+          confirmText={t('common.button.continue')}
+          icon={<WalletFilled color="$statusCritical" size="$icon.24" />}
+          modalName={ModalName.RemoveWallet}
+          severity={WarningSeverity.High}
+          title={t('account.wallet.button.import')}
+          onClose={() => setShowRemoveWalletModal(false)}
+          onConfirm={onNavigateToRemoveWallet}
+        />
+      )}
+      {showCreateWalletModal && (
+        <CreateWalletModal
+          pendingWallet={pendingWallet}
+          onCancel={onCancelCreateWallet}
+          onConfirm={onConfirmCreateWallet}
+        />
+      )}
+      <Flex backgroundColor="$surface1" px="$spacing12" py="$spacing8">
+        <ScreenHeader Icon={X} />
+        <Flex gap="$spacing16" pb="$spacing4" pt="$spacing8" px="$spacing12">
+          <AddressDisplay
+            showCopy
+            address={activeAddress}
+            captionVariant="body3"
+            direction="column"
+            gapBetweenLines="$spacing8"
+            horizontalGap="$spacing8"
+            showViewOnlyBadge={isViewOnly}
+            size={spacing.spacing60 - spacing.spacing4}
+            variant="subheading1"
+          />
+          {activeAccountHasUnitag ? (
+            <UnitagActionButton />
+          ) : (
+            <Button
+              size="small"
+              testID={TestID.AccountCard}
+              theme="secondary"
+              onPress={() => setShowEditLabelModal(true)}
+            >
+              {t('account.wallet.header.button.title')}
+            </Button>
+          )}
+        </Flex>
+        <ScrollView backgroundColor="$surface1" height="auto">
+          {accountAddresses.length > 0 && (
+            <Text color="$neutral2" mb="$spacing8" mt="$spacing16" px="$spacing12" variant="body2">
+              {t('account.wallet.header.other')}
+            </Text>
+          )}
+          <Flex>
+            {accountAddresses.map((address: string) => {
+              return (
+                <AccountItem
+                  key={address}
+                  address={address}
+                  onAccountSelect={async (): Promise<void> => {
+                    dispatch(setAccountAsActive(address))
+                    await updateDappConnectedAddressFromExtension(address)
+                    if (connectedAccounts.length > 0 && !isConnectedAccount(connectedAccounts, address)) {
+                      dispatch(openPopup(PopupName.Connect))
+                    }
+                    navigate(-1)
+                  }}
+                />
+              )
+            })}
+          </Flex>
+          <Popover offset={-spacing.spacing4} placement="top-start">
+            <Popover.Trigger>
+              <Flex
+                row
+                alignItems="center"
+                cursor="pointer"
+                gap="$spacing12"
+                mt="$spacing12"
+                pb="$spacing4"
+                px="$spacing12"
+              >
+                <PlusCircle />
+                <Text color="$neutral2" py="$spacing8" variant="buttonLabel3">
+                  {t('account.wallet.button.add')}
+                </Text>
+              </Flex>
+            </Popover.Trigger>
+            <Popover.Content
+              animation={[
+                'quick',
+                {
+                  opacity: {
+                    overshootClamping: true,
+                  },
+                },
+              ]}
+              borderColor="$surface3"
+              borderRadius="$rounded16"
+              borderWidth="$spacing1"
+              disableRemoveScroll={false}
+              enterStyle={{ y: -10, opacity: 0 }}
+              exitStyle={{ y: -10, opacity: 0 }}
+              p="$none"
+              {...contentShadowProps}
+            >
+              <MenuContent items={addWalletMenuOptions} minWidth={MIN_MENU_WIDTH} />
+            </Popover.Content>
+          </Popover>
+        </ScrollView>
+      </Flex>
+    </Trace>
+  )
+}
+
+const UnitagActionButton = (): JSX.Element => {
+  const { t } = useTranslation()
+  return (
+    <ComingSoon placement="top">
+      <Button color="$neutral2" disabled={true} size="small" testID={TestID.AccountCard} theme="secondary">
+        {t('account.wallet.header.button.disabled.title')}
+      </Button>
+    </ComingSoon>
+  )
+}
diff --git a/apps/extension/src/app/features/accounts/CreateWalletModal.tsx b/apps/extension/src/app/features/accounts/CreateWalletModal.tsx
new file mode 100644
index 00000000000..2ce86ea5e32
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/CreateWalletModal.tsx
@@ -0,0 +1,91 @@
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { OpaqueColorValue } from 'react-native'
+import { Button, Flex, Text, getUniconColors, useIsDarkMode } from 'ui/src'
+import { iconSizes, opacify } from 'ui/src/theme'
+import { TextInput } from 'uniswap/src/components/input/TextInput'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { shortenAddress } from 'uniswap/src/utils/addresses'
+import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
+
+type CreateWalletModalProps = {
+  pendingWallet?: SignerMnemonicAccount
+  onCancel: () => void
+  onConfirm: (walletLabel: string) => void
+}
+
+// Expects a pending account to be created before opening this modal
+export function CreateWalletModal({ pendingWallet, onCancel, onConfirm }: CreateWalletModalProps): JSX.Element | null {
+  const { t } = useTranslation()
+  const isDark = useIsDarkMode()
+
+  const [inputText, setInputText] = useState<string>('')
+
+  const nextDerivationIndex = pendingWallet?.derivationIndex
+  const onboardingAccountAddress = pendingWallet?.address
+
+  const onPressConfirm = useCallback(() => {
+    onConfirm(inputText)
+  }, [inputText, onConfirm])
+
+  const placeholderText = nextDerivationIndex
+    ? t('account.wallet.create.placeholder', { index: nextDerivationIndex + 1 })
+    : ''
+
+  const { color: uniconColor } = onboardingAccountAddress
+    ? getUniconColors(onboardingAccountAddress, isDark)
+    : { color: '' }
+
+  // Cast because Button component doesnt acccept sytling outside of theme color values for hover and press states
+  const hoverAndPressButtonStyle = useMemo(() => {
+    return {
+      backgroundColor: opacify(15, uniconColor) as unknown as OpaqueColorValue,
+    }
+  }, [uniconColor])
+
+  return (
+    <BottomSheetModal name={ModalName.AccountEditLabel} onClose={onCancel}>
+      <Flex centered fill borderRadius="$rounded16" gap="$spacing24" mt="$spacing16">
+        <Flex centered gap="$spacing12" width="100%">
+          {onboardingAccountAddress && <AccountIcon address={onboardingAccountAddress} size={iconSizes.icon48} />}
+          <Flex borderColor="$surface3" borderRadius="$rounded16" borderWidth="$spacing1" width="100%">
+            <TextInput
+              autoFocus
+              borderRadius="$rounded16"
+              placeholder={placeholderText}
+              py="$spacing12"
+              textAlign="center"
+              value={inputText}
+              width="100%"
+              onChangeText={setInputText}
+            />
+          </Flex>
+          {onboardingAccountAddress && (
+            <Text color="$neutral3" variant="body3">
+              {shortenAddress(onboardingAccountAddress)}
+            </Text>
+          )}
+        </Flex>
+
+        <Flex centered fill row gap="$spacing12" justifyContent="space-between" width="100%">
+          <Button color="$neutral1" flex={1} flexBasis={1} size="small" theme="secondary" onPress={onCancel}>
+            {t('common.button.cancel')}
+          </Button>
+          <Button
+            flex={1}
+            flexBasis={1}
+            hoverStyle={hoverAndPressButtonStyle}
+            pressStyle={hoverAndPressButtonStyle}
+            size="small"
+            style={{ color: uniconColor, backgroundColor: opacify(10, uniconColor) }}
+            onPress={onPressConfirm}
+          >
+            {t('common.button.create')}
+          </Button>
+        </Flex>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
diff --git a/apps/extension/src/app/features/accounts/EditLabelModal.tsx b/apps/extension/src/app/features/accounts/EditLabelModal.tsx
new file mode 100644
index 00000000000..d7f29cb9915
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/EditLabelModal.tsx
@@ -0,0 +1,74 @@
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Button, Flex, Text } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { TextInput } from 'uniswap/src/components/input/TextInput'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { shortenAddress } from 'utilities/src/addresses'
+import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import { useDisplayName } from 'wallet/src/features/wallet/hooks'
+import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useAppDispatch } from 'wallet/src/state'
+
+type EditLabelModalProps = {
+  address: Address
+  onClose: () => void
+}
+
+export function EditLabelModal({ address, onClose }: EditLabelModalProps): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  const displayName = useDisplayName(address)
+  const defaultText = displayName?.type === DisplayNameType.Local ? displayName.name : ''
+
+  const [inputText, setInputText] = useState<string>(defaultText)
+  const [isfocused, setIsFocused] = useState(false)
+
+  const onConfirm = useCallback(async () => {
+    await dispatch(
+      editAccountActions.trigger({
+        type: EditAccountAction.Rename,
+        address,
+        newName: inputText,
+      }),
+    )
+    onClose()
+  }, [address, dispatch, inputText, onClose])
+
+  return (
+    <BottomSheetModal name={ModalName.AccountEditLabel} onClose={onClose}>
+      <Flex centered fill borderRadius="$rounded16" gap="$spacing24" mt="$spacing16">
+        <Flex centered gap="$spacing12" width="100%">
+          <AccountIcon address={address} size={iconSizes.icon48} />
+          <Flex borderColor="$surface3" borderRadius="$rounded16" borderWidth="$spacing1" width="100%">
+            <TextInput
+              autoFocus
+              borderRadius="$rounded16"
+              placeholder={isfocused ? '' : t('account.wallet.edit.label.input.placeholder')}
+              textAlign="center"
+              value={inputText}
+              width="100%"
+              onBlur={() => setIsFocused(false)}
+              onChangeText={setInputText}
+              onFocus={() => setIsFocused(true)}
+            />
+          </Flex>
+          <Text color="$neutral3" variant="body2">
+            {shortenAddress(address)}
+          </Text>
+        </Flex>
+        <Flex centered fill row gap="$spacing12" justifyContent="space-between" width="100%">
+          <Button color="$neutral1" flex={1} flexBasis={1} size="small" theme="secondary" onPress={onClose}>
+            {t('common.button.cancel')}
+          </Button>
+          <Button flex={1} flexBasis={1} size="small" theme="accentSecondary" onPress={onConfirm}>
+            {t('common.button.save')}
+          </Button>
+        </Flex>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
diff --git a/apps/extension/src/app/features/accounts/__snapshots__/AccountSwitcherScreen.test.tsx.snap b/apps/extension/src/app/features/accounts/__snapshots__/AccountSwitcherScreen.test.tsx.snap
new file mode 100644
index 00000000000..6f10c474ac9
--- /dev/null
+++ b/apps/extension/src/app/features/accounts/__snapshots__/AccountSwitcherScreen.test.tsx.snap
@@ -0,0 +1,463 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountSwitcherScreen renders correctly 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <span
+        class="t_light is_inversed _dsp_contents"
+      >
+        <span
+          class=" t_light _dsp_contents is_Theme"
+        >
+          <div
+            class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-568007324 _pr-1481558245 _pl-1481558245 _pt-1481558276 _pb-1481558276"
+          >
+            <div
+              class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _pr-1481558276 _pl-1481558276 _pt-1481558307 _pb-1481558307 _width-10037"
+            >
+              <div
+                class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+              >
+                <svg
+                  fill="none"
+                  stroke-width="8"
+                  style="color: rgb(125, 125, 125); width: 24px; height: 24px;"
+                  viewBox="0 0 16 16"
+                >
+                  <path
+                    d="M12.5303 4.53033C12.8232 4.23744 12.8232 3.76256 12.5303 3.46967C12.2374 3.17678 11.7626 3.17678 11.4697 3.46967L12.5303 4.53033ZM3.46967 11.4697C3.17678 11.7626 3.17678 12.2374 3.46967 12.5303C3.76256 12.8232 4.23744 12.8232 4.53033 12.5303L3.46967 11.4697ZM4.53033 3.46967C4.23744 3.17678 3.76256 3.17678 3.46967 3.46967C3.17678 3.76256 3.17678 4.23744 3.46967 4.53033L4.53033 3.46967ZM11.4697 12.5303C11.7626 12.8232 12.2374 12.8232 12.5303 12.5303C12.8232 12.2374 12.8232 11.7626 12.5303 11.4697L11.4697 12.5303ZM11.4697 3.46967L3.46967 11.4697L4.53033 12.5303L12.5303 4.53033L11.4697 3.46967ZM3.46967 4.53033L11.4697 12.5303L12.5303 11.4697L4.53033 3.46967L3.46967 4.53033Z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
+              <div
+                class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _justifyContent-center _flexGrow-1 _mr-24px _pt-1481558276 _pb-1481558276"
+              >
+                <span
+                  class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
+                  data-disable-theme="true"
+                >
+                   
+                </span>
+              </div>
+            </div>
+            <div
+              class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _gap-1481558214 _pb-1481558307 _pt-1481558276 _pr-1481558245 _pl-1481558245"
+            >
+              <div
+                class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _flexDirection-column _gap-1481558276"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-733175080 _borderTopColor-733175080 _borderRightColor-733175080 _borderBottomColor-733175080 _borderLeftColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-0px _borderRightWidth-0px _borderBottomWidth-0px _borderLeftWidth-0px _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  data-testid="account-icon"
+                >
+                  <svg
+                    height="56"
+                    viewBox="0 0 56 56"
+                    width="56"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <g
+                      style="transform-origin: center center;"
+                    >
+                      <circle
+                        cx="28"
+                        cy="28"
+                        fill="#4300B01F"
+                        r="28"
+                      />
+                      <g
+                        transform="translate(9.333333333333332, 9.333333333333332) scale(0.7777777777777778)"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M13.2 6C9.22355 6 6 9.22355 6 13.2V34.8C6 38.7765 9.22355 42 13.2 42H34.8C38.7765 42 42 38.7765 42 34.8V13.2C42 9.22355 38.7765 6 34.8 6H13.2ZM26.1213 14.1213C24.9497 12.9497 23.0503 12.9497 21.8787 14.1213L14.1213 21.8787C12.9497 23.0503 12.9497 24.9497 14.1213 26.1213L21.8787 33.8787C23.0503 35.0503 24.9497 35.0503 26.1213 33.8787L33.8787 26.1213C35.0503 24.9497 35.0503 23.0503 33.8787 21.8787L26.1213 14.1213Z"
+                          fill="#4300B0"
+                          fill-rule="evenodd"
+                        />
+                      </g>
+                    </g>
+                  </svg>
+                </div>
+                <div
+                  class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _gap-1481558276"
+                >
+                  <div
+                    class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558245"
+                  >
+                    <div
+                      class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558307"
+                    >
+                      <span
+                        class="font_heading _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-nowrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontFamily-299667014 _fontSize-18px _lineHeight-24px _fontWeight-400 _maxWidth-10037 _overflowX-hidden _overflowY-hidden _textOverflow-ellipsis _flexShrink-1"
+                        data-disable-theme="true"
+                        data-testid="address-display/name/Jacob Haley"
+                      >
+                        Jacob Haley
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                    data-testid="copy"
+                  >
+                    <div
+                      class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _gap-1481558307 _mt-1481558400 _pr-1481558400 _pl-1481558400 _pt-1481558400 _pb-1481558400"
+                    >
+                      <span
+                        class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-14px _lineHeight-20px _fontWeight-400"
+                        data-disable-theme="true"
+                      >
+                        0x​0fc6...be59
+                      </span>
+                      <svg
+                        fill="none"
+                        stroke-width="8"
+                        style="color: rgb(125, 125, 125); width: 14px; height: 14px;"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M18.375 6.25H9.625C7.448 6.25 6.25 7.448 6.25 9.625V18.375C6.25 20.552 7.448 21.75 9.625 21.75H18.375C20.552 21.75 21.75 20.552 21.75 18.375V9.625C21.75 7.448 20.552 6.25 18.375 6.25ZM20.25 18.375C20.25 19.707 19.707 20.25 18.375 20.25H9.625C8.293 20.25 7.75 19.707 7.75 18.375V9.625C7.75 8.293 8.293 7.75 9.625 7.75H18.375C19.707 7.75 20.25 8.293 20.25 9.625V18.375ZM3.75 5.62V14.38C3.75 15.578 4.23309 15.873 4.39209 15.971C4.74609 16.187 4.85589 16.649 4.63989 17.002C4.49789 17.233 4.25202 17.36 3.99902 17.36C3.86602 17.36 3.72991 17.324 3.60791 17.25C2.70691 16.698 2.25 15.733 2.25 14.38V5.62C2.25 3.478 3.47912 2.25 5.62012 2.25H14.3799C16.0649 2.25 16.87 2.98897 17.25 3.60797C17.466 3.96097 17.355 4.42298 17.002 4.63898C16.648 4.85598 16.1879 4.74399 15.9709 4.39099C15.8739 4.23199 15.5779 3.74902 14.3799 3.74902H5.62012C4.29212 3.75002 3.75 4.292 3.75 5.62Z"
+                          fill="currentColor"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <span
+                class="t_sub_theme t_secondary_Button _dsp_contents is_Theme"
+              >
+                <button
+                  class="is_Button _backgroundColor-0hover-513675900 _backgroundColor-0active-744986709 _opacity-0active-0d0t746 _display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _justifyContent-center _backgroundColor-1633501478 _borderTopColor-2122800589 _borderRightColor-2122800589 _borderBottomColor-2122800589 _borderLeftColor-2122800589 _cursor-pointer _height-auto _pt-1481558276 _pr-1481558276 _pb-1481558276 _pl-1481558276 _borderTopLeftRadius-1307609967 _borderTopRightRadius-1307609967 _borderBottomRightRadius-1307609967 _borderBottomLeftRadius-1307609967 _gap-1481558307 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  data-disable-theme="true"
+                  data-testid="account-card"
+                >
+                  <span
+                    class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-675002279 _cursor-pointer _fontSize-229441158 _fontWeight-233016109 _lineHeight-222976511"
+                  >
+                    Edit label
+                  </span>
+                </button>
+              </span>
+            </div>
+            <span
+              class="_dsp_contents"
+            >
+              <div
+                class="css-view-175oi2r r-WebkitOverflowScrolling-150rngu r-flexDirection-eqz5dr r-flexGrow-16y2uox r-flexShrink-1wbh5a2 r-overflowX-11yh6sk r-overflowY-1rnoaur r-transform-agouwx is_ScrollView _backgroundColor-568007324 _height-auto"
+              >
+                <div
+                  class="css-view-175oi2r"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  />
+                  <div
+                    aria-expanded="false"
+                    aria-haspopup="dialog"
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-state="closed"
+                  >
+                    <div
+                      class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _cursor-pointer _gap-1481558245 _mt-1481558245 _pb-1481558307 _pr-1481558245 _pl-1481558245"
+                    >
+                      <div
+                        class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-568007324 _borderTopColor-568007262 _borderRightColor-568007262 _borderBottomColor-568007262 _borderLeftColor-568007262 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _height-40px _pt-1481558276 _pr-1481558276 _pb-1481558276 _pl-1481558276 _width-40px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-1138931271"
+                      >
+                        <svg
+                          fill="none"
+                          stroke-width="2"
+                          style="color: rgb(125, 125, 125); width: 16px; height: 16px;"
+                          viewBox="0 0 16 16"
+                        >
+                          <path
+                            d="M8 1v14"
+                            stroke="currentColor"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                          />
+                          <path
+                            d="M1 8h14"
+                            stroke="currentColor"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                          />
+                        </svg>
+                      </div>
+                      <span
+                        class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _pt-1481558276 _pb-1481558276 _fontSize-16px _lineHeight-24px _fontWeight-500"
+                        data-disable-theme="true"
+                      >
+                        Add wallet
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </span>
+          </div>
+        </span>
+      </span>
+    </div>
+  </body>,
+  "container": <div>
+    <span
+      class="t_light is_inversed _dsp_contents"
+    >
+      <span
+        class=" t_light _dsp_contents is_Theme"
+      >
+        <div
+          class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-568007324 _pr-1481558245 _pl-1481558245 _pt-1481558276 _pb-1481558276"
+        >
+          <div
+            class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _pr-1481558276 _pl-1481558276 _pt-1481558307 _pb-1481558307 _width-10037"
+          >
+            <div
+              class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+            >
+              <svg
+                fill="none"
+                stroke-width="8"
+                style="color: rgb(125, 125, 125); width: 24px; height: 24px;"
+                viewBox="0 0 16 16"
+              >
+                <path
+                  d="M12.5303 4.53033C12.8232 4.23744 12.8232 3.76256 12.5303 3.46967C12.2374 3.17678 11.7626 3.17678 11.4697 3.46967L12.5303 4.53033ZM3.46967 11.4697C3.17678 11.7626 3.17678 12.2374 3.46967 12.5303C3.76256 12.8232 4.23744 12.8232 4.53033 12.5303L3.46967 11.4697ZM4.53033 3.46967C4.23744 3.17678 3.76256 3.17678 3.46967 3.46967C3.17678 3.76256 3.17678 4.23744 3.46967 4.53033L4.53033 3.46967ZM11.4697 12.5303C11.7626 12.8232 12.2374 12.8232 12.5303 12.5303C12.8232 12.2374 12.8232 11.7626 12.5303 11.4697L11.4697 12.5303ZM11.4697 3.46967L3.46967 11.4697L4.53033 12.5303L12.5303 4.53033L11.4697 3.46967ZM3.46967 4.53033L11.4697 12.5303L12.5303 11.4697L4.53033 3.46967L3.46967 4.53033Z"
+                  fill="currentColor"
+                />
+              </svg>
+            </div>
+            <div
+              class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _justifyContent-center _flexGrow-1 _mr-24px _pt-1481558276 _pb-1481558276"
+            >
+              <span
+                class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
+                data-disable-theme="true"
+              >
+                 
+              </span>
+            </div>
+          </div>
+          <div
+            class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _gap-1481558214 _pb-1481558307 _pt-1481558276 _pr-1481558245 _pl-1481558245"
+          >
+            <div
+              class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _flexDirection-column _gap-1481558276"
+            >
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-733175080 _borderTopColor-733175080 _borderRightColor-733175080 _borderBottomColor-733175080 _borderLeftColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-0px _borderRightWidth-0px _borderBottomWidth-0px _borderLeftWidth-0px _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                data-testid="account-icon"
+              >
+                <svg
+                  height="56"
+                  viewBox="0 0 56 56"
+                  width="56"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <g
+                    style="transform-origin: center center;"
+                  >
+                    <circle
+                      cx="28"
+                      cy="28"
+                      fill="#4300B01F"
+                      r="28"
+                    />
+                    <g
+                      transform="translate(9.333333333333332, 9.333333333333332) scale(0.7777777777777778)"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M13.2 6C9.22355 6 6 9.22355 6 13.2V34.8C6 38.7765 9.22355 42 13.2 42H34.8C38.7765 42 42 38.7765 42 34.8V13.2C42 9.22355 38.7765 6 34.8 6H13.2ZM26.1213 14.1213C24.9497 12.9497 23.0503 12.9497 21.8787 14.1213L14.1213 21.8787C12.9497 23.0503 12.9497 24.9497 14.1213 26.1213L21.8787 33.8787C23.0503 35.0503 24.9497 35.0503 26.1213 33.8787L33.8787 26.1213C35.0503 24.9497 35.0503 23.0503 33.8787 21.8787L26.1213 14.1213Z"
+                        fill="#4300B0"
+                        fill-rule="evenodd"
+                      />
+                    </g>
+                  </g>
+                </svg>
+              </div>
+              <div
+                class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _gap-1481558276"
+              >
+                <div
+                  class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558245"
+                >
+                  <div
+                    class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558307"
+                  >
+                    <span
+                      class="font_heading _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-nowrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontFamily-299667014 _fontSize-18px _lineHeight-24px _fontWeight-400 _maxWidth-10037 _overflowX-hidden _overflowY-hidden _textOverflow-ellipsis _flexShrink-1"
+                      data-disable-theme="true"
+                      data-testid="address-display/name/Jacob Haley"
+                    >
+                      Jacob Haley
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                  data-testid="copy"
+                >
+                  <div
+                    class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _gap-1481558307 _mt-1481558400 _pr-1481558400 _pl-1481558400 _pt-1481558400 _pb-1481558400"
+                  >
+                    <span
+                      class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-14px _lineHeight-20px _fontWeight-400"
+                      data-disable-theme="true"
+                    >
+                      0x​0fc6...be59
+                    </span>
+                    <svg
+                      fill="none"
+                      stroke-width="8"
+                      style="color: rgb(125, 125, 125); width: 14px; height: 14px;"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M18.375 6.25H9.625C7.448 6.25 6.25 7.448 6.25 9.625V18.375C6.25 20.552 7.448 21.75 9.625 21.75H18.375C20.552 21.75 21.75 20.552 21.75 18.375V9.625C21.75 7.448 20.552 6.25 18.375 6.25ZM20.25 18.375C20.25 19.707 19.707 20.25 18.375 20.25H9.625C8.293 20.25 7.75 19.707 7.75 18.375V9.625C7.75 8.293 8.293 7.75 9.625 7.75H18.375C19.707 7.75 20.25 8.293 20.25 9.625V18.375ZM3.75 5.62V14.38C3.75 15.578 4.23309 15.873 4.39209 15.971C4.74609 16.187 4.85589 16.649 4.63989 17.002C4.49789 17.233 4.25202 17.36 3.99902 17.36C3.86602 17.36 3.72991 17.324 3.60791 17.25C2.70691 16.698 2.25 15.733 2.25 14.38V5.62C2.25 3.478 3.47912 2.25 5.62012 2.25H14.3799C16.0649 2.25 16.87 2.98897 17.25 3.60797C17.466 3.96097 17.355 4.42298 17.002 4.63898C16.648 4.85598 16.1879 4.74399 15.9709 4.39099C15.8739 4.23199 15.5779 3.74902 14.3799 3.74902H5.62012C4.29212 3.75002 3.75 4.292 3.75 5.62Z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <span
+              class="t_sub_theme t_secondary_Button _dsp_contents is_Theme"
+            >
+              <button
+                class="is_Button _backgroundColor-0hover-513675900 _backgroundColor-0active-744986709 _opacity-0active-0d0t746 _display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _justifyContent-center _backgroundColor-1633501478 _borderTopColor-2122800589 _borderRightColor-2122800589 _borderBottomColor-2122800589 _borderLeftColor-2122800589 _cursor-pointer _height-auto _pt-1481558276 _pr-1481558276 _pb-1481558276 _pl-1481558276 _borderTopLeftRadius-1307609967 _borderTopRightRadius-1307609967 _borderBottomRightRadius-1307609967 _borderBottomLeftRadius-1307609967 _gap-1481558307 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                data-disable-theme="true"
+                data-testid="account-card"
+              >
+                <span
+                  class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-675002279 _cursor-pointer _fontSize-229441158 _fontWeight-233016109 _lineHeight-222976511"
+                >
+                  Edit label
+                </span>
+              </button>
+            </span>
+          </div>
+          <span
+            class="_dsp_contents"
+          >
+            <div
+              class="css-view-175oi2r r-WebkitOverflowScrolling-150rngu r-flexDirection-eqz5dr r-flexGrow-16y2uox r-flexShrink-1wbh5a2 r-overflowX-11yh6sk r-overflowY-1rnoaur r-transform-agouwx is_ScrollView _backgroundColor-568007324 _height-auto"
+            >
+              <div
+                class="css-view-175oi2r"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                />
+                <div
+                  aria-expanded="false"
+                  aria-haspopup="dialog"
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-state="closed"
+                >
+                  <div
+                    class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _cursor-pointer _gap-1481558245 _mt-1481558245 _pb-1481558307 _pr-1481558245 _pl-1481558245"
+                  >
+                    <div
+                      class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-568007324 _borderTopColor-568007262 _borderRightColor-568007262 _borderBottomColor-568007262 _borderLeftColor-568007262 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _height-40px _pt-1481558276 _pr-1481558276 _pb-1481558276 _pl-1481558276 _width-40px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-1138931271"
+                    >
+                      <svg
+                        fill="none"
+                        stroke-width="2"
+                        style="color: rgb(125, 125, 125); width: 16px; height: 16px;"
+                        viewBox="0 0 16 16"
+                      >
+                        <path
+                          d="M8 1v14"
+                          stroke="currentColor"
+                          stroke-linecap="round"
+                          stroke-linejoin="round"
+                        />
+                        <path
+                          d="M1 8h14"
+                          stroke="currentColor"
+                          stroke-linecap="round"
+                          stroke-linejoin="round"
+                        />
+                      </svg>
+                    </div>
+                    <span
+                      class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _pt-1481558276 _pb-1481558276 _fontSize-16px _lineHeight-24px _fontWeight-500"
+                      data-disable-theme="true"
+                    >
+                      Add wallet
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+        </div>
+      </span>
+    </span>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "store": {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
+  "unmount": [Function],
+}
+`;
diff --git a/apps/extension/src/app/features/dapp/DappContext.tsx b/apps/extension/src/app/features/dapp/DappContext.tsx
new file mode 100644
index 00000000000..25969714c8b
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/DappContext.tsx
@@ -0,0 +1,67 @@
+import { createContext, ReactNode, useContext, useEffect, useState } from 'react'
+import { useDappConnectedAccounts, useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { isConnectedAccount } from 'src/app/features/dapp/utils'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { closePopup, PopupName } from 'src/app/features/popups/slice'
+import { backgroundToSidePanelMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { BackgroundToSidePanelRequestType } from 'src/background/messagePassing/types/requests'
+import { useAppDispatch } from 'src/store/store'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { useActiveAccountAddress } from 'wallet/src/features/wallet/hooks'
+
+type DappContextState = {
+  dappUrl: string
+  dappIconUrl?: string
+  isConnected: boolean
+  lastChainId?: WalletChainId
+}
+
+const DappContext = createContext<DappContextState | undefined>(undefined)
+
+export function DappContextProvider({ children }: { children: ReactNode }): JSX.Element {
+  const [dappUrl, setDappUrl] = useState('')
+  const [dappIconUrl, setDappIconUrl] = useState<string | undefined>(undefined)
+
+  const activeAddress = useActiveAccountAddress()
+  const connectedAccounts = useDappConnectedAccounts(dappUrl)
+  const lastChainId = useDappLastChainId(dappUrl)
+  const dispatch = useAppDispatch()
+
+  const isConnected = !!activeAddress && isConnectedAccount(connectedAccounts, activeAddress)
+
+  useEffect(() => {
+    const updateDappInfo = (): void => {
+      chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
+        const tab = tabs[0]
+        if (tab) {
+          setDappUrl(extractBaseUrl(tab?.url) || '')
+          setDappIconUrl(tab.favIconUrl)
+        }
+      })
+    }
+
+    updateDappInfo()
+
+    return backgroundToSidePanelMessageChannel.addMessageListener(
+      BackgroundToSidePanelRequestType.TabActivated,
+      async (_message) => {
+        updateDappInfo()
+        dispatch(closePopup(PopupName.Connect))
+      },
+    )
+  }, [setDappIconUrl, setDappUrl, dispatch])
+
+  const value = { dappUrl, dappIconUrl, isConnected, lastChainId }
+
+  return <DappContext.Provider value={value}>{children}</DappContext.Provider>
+}
+
+export function useDappContext(): DappContextState {
+  const context = useContext(DappContext)
+
+  if (context === undefined) {
+    throw new Error('useDappContext must be used within a DappContextProvider')
+  }
+
+  return context
+}
diff --git a/apps/extension/src/app/features/dapp/actions.ts b/apps/extension/src/app/features/dapp/actions.ts
new file mode 100644
index 00000000000..a7852020b95
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/actions.ts
@@ -0,0 +1,71 @@
+import { dappStore } from 'src/app/features/dapp/store'
+import { externalDappMessageChannel } from 'src/background/messagePassing/messageChannels'
+import {
+  ExtensionChainChange,
+  ExtensionToDappRequestType,
+  UpdateConnectionRequest,
+} from 'src/background/messagePassing/types/requests'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { getProviderSync } from 'wallet/src/features/wallet/context'
+
+export async function saveDappChain(dappUrl: string, chainId: WalletChainId): Promise<void> {
+  dappStore.updateDappLatestChainId(dappUrl, chainId)
+  const provider = getProviderSync(chainId)
+
+  const response: ExtensionChainChange = {
+    type: ExtensionToDappRequestType.SwitchChain,
+    providerUrl: provider.connection.url,
+    chainId: chainIdToHexadecimalString(chainId),
+  }
+
+  await externalDappMessageChannel.sendMessageToTabUrl(dappUrl, response)
+}
+
+export async function saveDappConnection(dappUrl: string, account: Account): Promise<void> {
+  dappStore.saveDappActiveAccount(dappUrl, account)
+  await updateConnectionFromExtension(dappUrl)
+}
+
+export async function removeDappConnection(dappUrl: string, account?: Account): Promise<void> {
+  dappStore.removeDappConnection(dappUrl, account)
+  await updateConnectionFromExtension(dappUrl)
+}
+
+async function updateConnectionFromExtension(dappUrl: string): Promise<void> {
+  const connectedWallets = dappStore.getDappOrderedConnectedAddresses(dappUrl) ?? []
+  const response: UpdateConnectionRequest = {
+    type: ExtensionToDappRequestType.UpdateConnections,
+    addresses: connectedWallets,
+  }
+
+  await externalDappMessageChannel.sendMessageToTabUrl(dappUrl, response)
+}
+
+export async function updateDappConnectedAddressFromExtension(address: Address): Promise<void> {
+  dappStore.updateDappConnectedAddress(address)
+  const connectedDapps = dappStore.getConnectedDapps(address)
+  for (const dappUrl of connectedDapps) {
+    await updateConnectionFromExtension(dappUrl)
+  }
+}
+
+export async function removeAllDappConnectionsForAccount(account: Account): Promise<void> {
+  const connectedDapps = dappStore.getConnectedDapps(account.address)
+  for (const dappUrl of connectedDapps) {
+    await removeDappConnection(dappUrl, account)
+  }
+}
+
+export async function removeAllDappConnectionsFromExtension(): Promise<void> {
+  const dappUrls = dappStore.getDappUrls()
+  for (const dappUrl of dappUrls) {
+    const response: UpdateConnectionRequest = {
+      type: ExtensionToDappRequestType.UpdateConnections,
+      addresses: [],
+    }
+    await externalDappMessageChannel.sendMessageToTabUrl(dappUrl, response)
+  }
+  dappStore.removeAllDappConnections()
+}
diff --git a/apps/extension/src/app/features/dapp/changeChain.test.ts b/apps/extension/src/app/features/dapp/changeChain.test.ts
new file mode 100644
index 00000000000..6d2d2b4a36b
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/changeChain.test.ts
@@ -0,0 +1,115 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { changeChain } from 'src/app/features/dapp/changeChain'
+import { dappStore } from 'src/app/features/dapp/store'
+import { DappResponseType } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { WalletChainId } from 'uniswap/src/types/chains'
+
+// Mock dependencies
+jest.mock('@ethersproject/providers')
+jest.mock('@metamask/rpc-errors')
+jest.mock('src/app/features/dapp/store')
+jest.mock('uniswap/src/features/telemetry/send')
+jest.mock('uniswap/src/features/chains/utils')
+
+describe('changeChain', () => {
+  const mockRequestId = 'test-request-id'
+  const mockProviderUrl = 'http://localhost:8545'
+  const mockChainId = 1 as WalletChainId
+
+  let mockProvider: JsonRpcProvider
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+
+    mockProvider = {
+      connection: {
+        url: mockProviderUrl,
+      },
+    } as JsonRpcProvider
+  })
+
+  it('should return an error response if updatedChainId is null', () => {
+    const response = changeChain({
+      activeConnectedAddress: undefined,
+      dappUrl: undefined,
+      provider: mockProvider,
+      requestId: mockRequestId,
+      updatedChainId: null,
+    })
+
+    expect(response).toEqual({
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(
+        providerErrors.custom({
+          code: 4902,
+          message: 'Uniswap Wallet does not support switching to this chain.',
+        })
+      ),
+      requestId: mockRequestId,
+    })
+  })
+
+  it('should return an error response if provider is null', () => {
+    const response = changeChain({
+      activeConnectedAddress: undefined,
+      dappUrl: undefined,
+      provider: null,
+      requestId: mockRequestId,
+      updatedChainId: mockChainId,
+    })
+
+    expect(response).toEqual({
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(providerErrors.unauthorized()),
+      requestId: mockRequestId,
+    })
+  })
+
+  it('should update dappStore and send analytics event if dappUrl is provided', () => {
+    const mockDappUrl = 'http://example.com'
+
+    const response = changeChain({
+      activeConnectedAddress: '0xAddress',
+      dappUrl: mockDappUrl,
+      provider: mockProvider,
+      requestId: mockRequestId,
+      updatedChainId: mockChainId,
+    })
+
+    expect(dappStore.updateDappLatestChainId).toHaveBeenCalledWith(mockDappUrl, mockChainId)
+    expect(sendAnalyticsEvent).toHaveBeenCalledWith(ExtensionEventName.DappChangeChain, {
+      dappUrl: mockDappUrl,
+      chainId: mockChainId,
+      activeConnectedAddress: '0xAddress',
+    })
+
+    expect(response).toEqual({
+      type: DappResponseType.ChainChangeResponse,
+      requestId: mockRequestId,
+      providerUrl: mockProviderUrl,
+      chainId: chainIdToHexadecimalString(mockChainId),
+    })
+  })
+
+  it('should not update dappStore if dappUrl is not provided', () => {
+    const response = changeChain({
+      activeConnectedAddress: '0xAddress',
+      dappUrl: undefined,
+      provider: mockProvider,
+      requestId: mockRequestId,
+      updatedChainId: mockChainId,
+    })
+
+    expect(dappStore.updateDappLatestChainId).not.toHaveBeenCalled()
+
+    expect(response).toEqual({
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(providerErrors.unauthorized()),
+      requestId: mockRequestId,
+    })
+  })
+})
diff --git a/apps/extension/src/app/features/dapp/changeChain.ts b/apps/extension/src/app/features/dapp/changeChain.ts
new file mode 100644
index 00000000000..a7a14a0408a
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/changeChain.ts
@@ -0,0 +1,69 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { dappStore } from 'src/app/features/dapp/store'
+import {
+  ChangeChainResponse,
+  DappResponseType,
+  ErrorResponse,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { WalletChainId } from 'uniswap/src/types/chains'
+
+export function changeChain({
+  activeConnectedAddress,
+  dappUrl,
+  provider,
+  requestId,
+  updatedChainId,
+}: {
+  activeConnectedAddress: Address | undefined
+  dappUrl: string | undefined
+  provider: JsonRpcProvider | undefined | null
+  requestId: string
+  updatedChainId: WalletChainId | null
+}): ChangeChainResponse | ErrorResponse {
+  if (!updatedChainId) {
+    return {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(
+        providerErrors.custom({
+          code: 4902,
+          message: 'Uniswap Wallet does not support switching to this chain.',
+        }),
+      ),
+      requestId,
+    }
+  }
+
+  if (!provider) {
+    return {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(providerErrors.unauthorized()),
+      requestId,
+    }
+  }
+
+  if (dappUrl) {
+    dappStore.updateDappLatestChainId(dappUrl, updatedChainId)
+    sendAnalyticsEvent(ExtensionEventName.DappChangeChain, {
+      dappUrl: dappUrl ?? '',
+      chainId: updatedChainId,
+      activeConnectedAddress: activeConnectedAddress ?? '',
+    })
+
+    return {
+      type: DappResponseType.ChainChangeResponse,
+      requestId,
+      providerUrl: provider.connection.url,
+      chainId: chainIdToHexadecimalString(updatedChainId),
+    }
+  }
+
+  return {
+    type: DappResponseType.ErrorResponse,
+    error: serializeError(providerErrors.unauthorized()),
+    requestId,
+  }
+}
diff --git a/apps/extension/src/app/features/dapp/hooks.test.ts b/apps/extension/src/app/features/dapp/hooks.test.ts
new file mode 100644
index 00000000000..1b5f1f72a6e
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/hooks.test.ts
@@ -0,0 +1,104 @@
+import {
+  useDappConnectedAccounts,
+  useDappInfo,
+  useDappLastChainId,
+  useDappStateUpdated,
+} from 'src/app/features/dapp/hooks'
+import { DappState, dappStore } from 'src/app/features/dapp/store'
+import { act, renderHook, waitFor } from 'src/test/test-utils'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import {
+  ACCOUNT,
+  ACCOUNT2,
+  ACCOUNT3,
+  SAMPLE_SEED_ADDRESS_1,
+  SAMPLE_SEED_ADDRESS_3,
+} from 'wallet/src/test/fixtures'
+
+const SAMPLE_DAPP = 'http://example.com'
+const SAMPLE_DAPP_2 = 'http://uniswap.org'
+
+const dappState: DappState = {
+  [SAMPLE_DAPP]: {
+    lastChainId: UniverseChainId.ArbitrumOne,
+    connectedAccounts: [ACCOUNT, ACCOUNT2],
+    activeConnectedAddress: SAMPLE_SEED_ADDRESS_1,
+  },
+  [SAMPLE_DAPP_2]: {
+    lastChainId: UniverseChainId.Base,
+    connectedAccounts: [ACCOUNT, ACCOUNT3],
+    activeConnectedAddress: SAMPLE_SEED_ADDRESS_3,
+  },
+}
+
+const mockAddListener = jest.fn()
+const mockGet = jest.fn(() => {
+  return Promise.resolve({ dappState })
+})
+Object.defineProperty(global, 'chrome', {
+  value: {
+    runtime: { lastError: undefined },
+    storage: {
+      local: {
+        get: mockGet,
+        set: jest.fn(),
+        onChanged: {
+          addListener: mockAddListener,
+        },
+      },
+    },
+  },
+})
+
+describe('Dapp hooks', () => {
+  let onChangeListener: (changes: { dappState: chrome.storage.StorageChange }) => void
+  beforeAll(async () => {
+    await dappStore.init()
+    onChangeListener = mockAddListener.mock.calls[0][0]
+  })
+
+  it('useDappStateUpdated should update state when chrome storage changes', () => {
+    const { result } = renderHook(() => useDappStateUpdated())
+    expect(result.current).toBe(false)
+    act(() => {
+      onChangeListener({ dappState: { newValue: dappState } })
+    })
+    expect(result.current).toBe(true)
+  })
+
+  it('useDappInfo should return undefined when dappUrl is undefined', async () => {
+    const { result } = renderHook(() => useDappInfo(undefined))
+    await waitFor(() => expect(result.current).toBeUndefined())
+  })
+
+  it('useDappInfo should return DappInfo when dappUrl is defined', async () => {
+    const { result } = renderHook(() => useDappInfo(SAMPLE_DAPP))
+    await waitFor(() =>
+      expect(result.current).toEqual({
+        lastChainId: UniverseChainId.ArbitrumOne,
+        connectedAccounts: [ACCOUNT, ACCOUNT2],
+        activeConnectedAddress: SAMPLE_SEED_ADDRESS_1,
+      })
+    )
+  })
+
+  it('useDappLastChainId should return undefined when dappUrl is undefined', async () => {
+    const { result } = renderHook(() => useDappLastChainId(undefined))
+    await waitFor(() => expect(result.current).toBeUndefined())
+  })
+
+  it('useDappLastChainId should return lastChainId when dappUrl is defined', async () => {
+    const { result } = renderHook(() => useDappLastChainId(SAMPLE_DAPP_2))
+    await waitFor(() => expect(result.current).toBe(UniverseChainId.Base))
+  })
+
+  it('useDappConnectedAccounts should return empty array when dappUrl is undefined', async () => {
+    const { result } = renderHook(() => useDappConnectedAccounts(undefined))
+    await waitFor(() => expect(result.current).toEqual([]))
+  })
+
+  it('useDappConnectedAccounts should return connected accounts when dappUrl is defined', async () => {
+    const { result } = renderHook(() => useDappConnectedAccounts(SAMPLE_DAPP))
+    await waitFor(() => expect(result.current).toEqual([ACCOUNT, ACCOUNT2]))
+  })
+})
diff --git a/apps/extension/src/app/features/dapp/hooks.ts b/apps/extension/src/app/features/dapp/hooks.ts
new file mode 100644
index 00000000000..ae5b5a9530d
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/hooks.ts
@@ -0,0 +1,34 @@
+import { useEffect, useReducer, useState } from 'react'
+import { DappInfo, DappStoreEvent, dappStore } from 'src/app/features/dapp/store'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+
+// exported to be used in tests
+export function useDappStateUpdated(): boolean {
+  const [state, dispatch] = useReducer((v) => !v, false)
+  useEffect(() => {
+    const onUpdate = (): void => dispatch()
+    dappStore.addListener(DappStoreEvent.DappStateUpdated, onUpdate)
+    return () => {
+      dappStore.removeListener(DappStoreEvent.DappStateUpdated, onUpdate)
+    }
+  }, [dispatch])
+  return state
+}
+
+export function useDappInfo(dappUrl: string | undefined): DappInfo | undefined {
+  const [info, setInfo] = useState<DappInfo>()
+  const dappStateUpdated = useDappStateUpdated()
+  useEffect(() => {
+    setInfo(dappStore.getDappInfo(dappUrl))
+  }, [dappUrl, dappStateUpdated])
+  return info
+}
+
+export function useDappLastChainId(dappUrl: string | undefined): WalletChainId | undefined {
+  return useDappInfo(dappUrl)?.lastChainId
+}
+
+export function useDappConnectedAccounts(dappUrl: string | undefined): Account[] {
+  return useDappInfo(dappUrl)?.connectedAccounts || []
+}
diff --git a/apps/extension/src/app/features/dapp/saga.ts b/apps/extension/src/app/features/dapp/saga.ts
new file mode 100644
index 00000000000..b2494f85492
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/saga.ts
@@ -0,0 +1,9 @@
+import { dappStore } from 'src/app/features/dapp/store'
+import { call } from 'typed-redux-saga'
+import { logger } from 'utilities/src/logger/logger'
+
+// Initialize Dapp Store
+export function* initDappStore() {
+  logger.debug('dappStoreSaga', 'initDappStore', 'Initializing Dapp Store')
+  yield* call(dappStore.init)
+}
diff --git a/apps/extension/src/app/features/dapp/store.ts b/apps/extension/src/app/features/dapp/store.ts
new file mode 100644
index 00000000000..2fafa6a3173
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/store.ts
@@ -0,0 +1,199 @@
+import EventEmitter from 'eventemitter3'
+import { getOrderedConnectedAddresses, isConnectedAccount } from 'src/app/features/dapp/utils'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+
+const STATE_STORAGE_KEY = 'dappState'
+
+export interface DappInfo {
+  lastChainId: WalletChainId
+  connectedAccounts: Account[]
+  activeConnectedAddress: Address
+}
+
+export interface DappState {
+  [dappUrl: string]: DappInfo
+}
+
+const initialDappState: DappState = {}
+let state: DappState
+
+// Event Emitter
+export enum DappStoreEvent {
+  DappStateUpdated = 'DappStateUpdated',
+}
+
+class DappStoreEventEmitter extends EventEmitter<DappStoreEvent> {}
+const dappStoreEventEmitter = new DappStoreEventEmitter()
+
+// Init
+let initPromise: Promise<void> | undefined
+
+async function init(): Promise<void> {
+  if (!initPromise) {
+    initPromise = initInternal()
+  }
+
+  return initPromise
+}
+
+async function initInternal(): Promise<void> {
+  state = (await chrome.storage.local.get([STATE_STORAGE_KEY]))?.[STATE_STORAGE_KEY] || initialDappState
+
+  chrome.storage.local.onChanged.addListener((changes) => {
+    if (changes.dappState) {
+      state = changes.dappState.newValue
+      dappStoreEventEmitter.emit(DappStoreEvent.DappStateUpdated, state)
+    }
+  })
+}
+
+// Sequential syncing of state to local storage
+let dappStateSyncPromise = Promise.resolve()
+let dappStateChangesNeedSync = false
+function queueDappStateSync(): void {
+  if (!dappStateChangesNeedSync) {
+    dappStateChangesNeedSync = true
+    dappStateSyncPromise = dappStateSyncPromise.then((): Promise<void> => {
+      dappStateChangesNeedSync = false
+      return chrome.storage.local.set({ [STATE_STORAGE_KEY]: state })
+    })
+  }
+}
+
+/** Returns all dapp URLs that are connected to a particular address. */
+function getConnectedDapps(address: Address): string[] {
+  return Object.entries(state)
+    .filter(([_, dappInfo]) => isConnectedAccount(dappInfo.connectedAccounts, address))
+    .map(([dappUrl]) => dappUrl)
+}
+
+/** Returns connected addresses with the currently connected address listed first. */
+function getDappOrderedConnectedAddresses(dappUrl: string): string[] | undefined {
+  const dappInfo = state[dappUrl]
+  if (!dappInfo) {
+    return undefined
+  }
+  const { connectedAccounts, activeConnectedAddress } = dappInfo
+  return getOrderedConnectedAddresses(connectedAccounts, activeConnectedAddress)
+}
+
+function getDappInfo(dappUrl: string | undefined): DappInfo | undefined {
+  return dappUrl ? state[dappUrl] : undefined
+}
+
+function getDappInfoIfConnected(dappUrl: string | undefined): DappInfo | undefined {
+  const dappInfo = getDappInfo(dappUrl)
+  return dappInfo && dappInfo.connectedAccounts.length > 0 ? dappInfo : undefined
+}
+
+function getDappUrls(): string[] {
+  return Object.keys(state)
+}
+
+// Update the connected address for all dapps
+function updateDappConnectedAddress(address: Address): void {
+  // Never directly mutate state, as some of its fields could have `writable: false`
+  state = Object.fromEntries(
+    Object.entries(state).map(([key, dappUrlState]) => {
+      if (isConnectedAccount(dappUrlState.connectedAccounts, address)) {
+        return [key, { ...dappUrlState, activeConnectedAddress: address }]
+      }
+      return [key, dappUrlState]
+    }),
+  )
+  queueDappStateSync()
+}
+
+function updateDappLatestChainId(dappUrl: string, chainId: WalletChainId): void {
+  // Never directly mutate state, as some of its fields could have `writable: false`
+  state = Object.fromEntries(
+    Object.entries(state).map(([key, dappUrlState]) => {
+      if (key === dappUrl) {
+        return [key, { ...dappUrlState, lastChainId: chainId }]
+      }
+      return [key, dappUrlState]
+    }),
+  )
+  queueDappStateSync()
+}
+
+function saveDappActiveAccount(dappUrl: string, account: Account): void {
+  // Never directly mutate state, as some of its fields could have `writable: false`
+  state = {
+    ...state,
+    [dappUrl]: {
+      lastChainId: state[dappUrl]?.lastChainId ?? UniverseChainId.Mainnet,
+      activeConnectedAddress: account.address,
+      connectedAccounts: ((): Account[] => {
+        const currConnectedAccounts = state[dappUrl]?.connectedAccounts || []
+        const isConnectionNew = !isConnectedAccount(currConnectedAccounts, account.address)
+
+        if (isConnectionNew) {
+          return [...currConnectedAccounts, account]
+        }
+        return currConnectedAccounts
+      })(),
+    },
+  }
+  queueDappStateSync()
+}
+
+/**
+ * Remove a dapp connection
+ * @param dappUrl extracted url for dapp
+ * @param account target account to remove connection. If undefined, will remove all accounts
+ * @returns
+ */
+function removeDappConnection(dappUrl: string, account?: Account): void {
+  // Never directly mutate state, as some of its fields could have `writable: false`
+  state = ((): DappState => {
+    const dappUrlState = state[dappUrl]
+
+    if (!dappUrlState) {
+      return state
+    }
+
+    const updatedAccounts = account
+      ? dappUrlState.connectedAccounts?.filter((existingAccount) => existingAccount.address !== account.address)
+      : []
+
+    const activeConnected = updatedAccounts[0]
+    if (activeConnected) {
+      return {
+        ...state,
+        [dappUrl]: {
+          ...dappUrlState,
+          connectedAccounts: updatedAccounts,
+          activeConnectedAddress: activeConnected.address,
+        },
+      }
+    } else {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { [dappUrl]: _, ...restState } = state
+      return restState
+    }
+  })()
+  queueDappStateSync()
+}
+
+function removeAllDappConnections(): void {
+  state = {}
+  queueDappStateSync()
+}
+
+export const dappStore = {
+  getConnectedDapps,
+  getDappInfo,
+  getDappInfoIfConnected,
+  getDappOrderedConnectedAddresses,
+  getDappUrls,
+  init,
+  removeAllDappConnections,
+  removeDappConnection,
+  saveDappActiveAccount,
+  addListener: dappStoreEventEmitter.addListener.bind(dappStoreEventEmitter),
+  removeListener: dappStoreEventEmitter.removeListener.bind(dappStoreEventEmitter),
+  updateDappConnectedAddress,
+  updateDappLatestChainId,
+}
diff --git a/apps/extension/src/app/features/dapp/utils.test.ts b/apps/extension/src/app/features/dapp/utils.test.ts
new file mode 100644
index 00000000000..35d4e569039
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/utils.test.ts
@@ -0,0 +1,66 @@
+import {
+  getActiveConnectedAccount,
+  getOrderedConnectedAddresses,
+  isConnectedAccount,
+} from 'src/app/features/dapp/utils'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import {
+  ACCOUNT,
+  ACCOUNT2,
+  ACCOUNT3,
+  SAMPLE_SEED_ADDRESS_1,
+  SAMPLE_SEED_ADDRESS_2,
+  SAMPLE_SEED_ADDRESS_3,
+} from 'wallet/src/test/fixtures'
+
+describe('isConnectedAccount', () => {
+  it('returns true if the account is connected', () => {
+    const accounts: Account[] = [ACCOUNT, ACCOUNT2]
+    expect(isConnectedAccount(accounts, SAMPLE_SEED_ADDRESS_1)).toBe(true)
+  })
+
+  it('returns false if the account is not connected', () => {
+    const accounts: Account[] = [ACCOUNT]
+    expect(isConnectedAccount(accounts, SAMPLE_SEED_ADDRESS_2)).toBe(false)
+  })
+})
+
+describe('getActiveConnectedAccount', () => {
+  const accounts: Account[] = [ACCOUNT, ACCOUNT2]
+
+  it('returns the account for the given address', () => {
+    const result = getActiveConnectedAccount(accounts, SAMPLE_SEED_ADDRESS_2)
+    expect(result).toEqual(ACCOUNT2)
+  })
+
+  it('throws an error if the address is not in the list', () => {
+    expect(() => {
+      getActiveConnectedAccount(accounts, SAMPLE_SEED_ADDRESS_3)
+    }).toThrow('The activeConnectedAddress must be in the list of connectedAccounts.')
+  })
+})
+
+describe('getOrderedConnectedAddresses', () => {
+  const accounts: Account[] = [ACCOUNT, ACCOUNT2, ACCOUNT3]
+
+  it('places the active address first', () => {
+    const activeAddress = SAMPLE_SEED_ADDRESS_2
+    const expectedOrder = [SAMPLE_SEED_ADDRESS_2, SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_3]
+    const result = getOrderedConnectedAddresses(accounts, activeAddress)
+    expect(result).toEqual(expectedOrder)
+  })
+
+  it('returns the same order if the active address is already first', () => {
+    const activeAddress = SAMPLE_SEED_ADDRESS_1
+    const expectedOrder = [SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2, SAMPLE_SEED_ADDRESS_3]
+    const result = getOrderedConnectedAddresses(accounts, activeAddress)
+    expect(result).toEqual(expectedOrder)
+  })
+
+  it('handles cases where the active address is not in the list', () => {
+    const activeAddress = '0xabc' // Not in the accounts list
+    const expectedOrder = [SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2, SAMPLE_SEED_ADDRESS_3] // Original order since active address is not found
+    const result = getOrderedConnectedAddresses(accounts, activeAddress)
+    expect(result).toEqual(expectedOrder)
+  })
+})
diff --git a/apps/extension/src/app/features/dapp/utils.ts b/apps/extension/src/app/features/dapp/utils.ts
new file mode 100644
index 00000000000..094d617a214
--- /dev/null
+++ b/apps/extension/src/app/features/dapp/utils.ts
@@ -0,0 +1,21 @@
+import { bubbleToTop } from 'utilities/src/primitives/array'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+
+export function isConnectedAccount(connectedAccounts: Account[], address: Address): boolean {
+  return connectedAccounts.some((account) => account.address === address)
+}
+
+/** Gets the Account for a specific address. The address param must be in the list of connectedAccounts. */
+export function getActiveConnectedAccount(connectedAccounts: Account[], activeConnectedAddress: Address): Account {
+  const activeConnectedAccount = connectedAccounts.find((account) => account.address === activeConnectedAddress)
+  if (!activeConnectedAccount) {
+    throw new Error('The activeConnectedAddress must be in the list of connectedAccounts.')
+  }
+  return activeConnectedAccount
+}
+
+/** Returns all connected addresses with the currently connected address listed first. */
+export function getOrderedConnectedAddresses(connectedAccounts: Account[], activeConnectedAddress: Address): Address[] {
+  const connectedAddresses = connectedAccounts.map((account) => account.address)
+  return bubbleToTop(connectedAddresses, (address) => address === activeConnectedAddress)
+}
diff --git a/apps/extension/src/app/features/dappRequests/DappRequestContent.tsx b/apps/extension/src/app/features/dappRequests/DappRequestContent.tsx
new file mode 100644
index 00000000000..5cf80a45725
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/DappRequestContent.tsx
@@ -0,0 +1,425 @@
+import { PropsWithChildren, memo, useCallback } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import { ConnectionRequestContent } from 'src/app/features/dappRequests/requestContent/Connection/ConnectionRequestContent'
+import { EthSendRequestContent } from 'src/app/features/dappRequests/requestContent/EthSend/EthSend'
+import { NetworksFooter } from 'src/app/features/dappRequests/requestContent/NetworksFooter'
+import { PersonalSignRequestContent } from 'src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent'
+import { SignTypedDataRequestContent } from 'src/app/features/dappRequests/requestContent/SignTypeData/SignTypedDataRequestContent'
+import { rejectAllRequests } from 'src/app/features/dappRequests/saga'
+import { DappRequestStoreItem } from 'src/app/features/dappRequests/slice'
+import {
+  isDappRequestStoreItemForEthSendTxn,
+  isGetAccountRequest,
+  isRequestAccountRequest,
+  isRequestPermissionsRequest,
+  isSignMessageRequest,
+  isSignTypedDataRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { useAppDispatch } from 'src/store/store'
+import {
+  Anchor,
+  AnimatePresence,
+  Button,
+  Flex,
+  Text,
+  TouchableArea,
+  UniversalImage,
+  UniversalImageResizeMode,
+  styled,
+  useSporeColors,
+} from 'ui/src'
+import { ReceiptText, RotatableChevron } from 'ui/src/components/icons'
+import { iconSizes, zIndices } from 'ui/src/theme'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { formatDappURL } from 'utilities/src/format/urls'
+import { logger } from 'utilities/src/logger/logger'
+import { DappIconPlaceholder } from 'wallet/src/components/WalletConnect/DappIconPlaceholder'
+import { useUSDValue } from 'wallet/src/features/gas/hooks'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { AddressFooter } from 'wallet/src/features/transactions/TransactionRequest/AddressFooter'
+import { NetworkFeeFooter } from 'wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter'
+import { TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+
+interface DappRequestHeaderProps {
+  title: string
+  headerIcon?: JSX.Element
+}
+
+interface DappRequestFooterProps {
+  chainId?: WalletChainId
+  connectedAccountAddress?: string
+  confirmText: string
+  maybeCloseOnConfirm?: boolean
+  onCancel?: (requestToConfirm?: DappRequestStoreItem, transactionTypeInfo?: TransactionTypeInfo) => void
+  onConfirm?: (requestToCancel?: DappRequestStoreItem) => void
+  showAllNetworks?: boolean
+  showNetworkCost?: boolean
+  transactionGasFeeResult?: GasFeeResult
+}
+
+type DappRequestContentProps = DappRequestHeaderProps & DappRequestFooterProps
+
+const REJECT_MESSAGE_HEIGHT = 48
+
+const AnimatedPane = styled(Flex, {
+  variants: {
+    forwards: (dir: boolean) => ({
+      enterStyle: {
+        x: dir ? 10 : -10,
+        opacity: 0,
+      },
+    }),
+    increasing: (dir: boolean) => ({
+      enterStyle: dir
+        ? {
+            y: 10,
+            opacity: 0,
+          }
+        : undefined,
+      exitStyle: !dir
+        ? {
+            y: 10,
+            opacity: 0,
+          }
+        : undefined,
+    }),
+  } as const,
+})
+
+export function DappRequestWrapper(): JSX.Element {
+  const { t } = useTranslation()
+  const colors = useSporeColors()
+  const dispatch = useAppDispatch()
+
+  const { totalRequestCount, onPressPrevious, onPressNext, currentIndex, increasing } = useDappRequestQueueContext()
+
+  const disabledPrevious = currentIndex <= 0
+  const disabledNext = currentIndex >= totalRequestCount - 1
+
+  const onRejectAll = async (): Promise<void> => {
+    dispatch(rejectAllRequests())
+  }
+
+  return (
+    <BottomSheetModal alignment="top" backgroundColor="$transparent" name={ModalName.DappRequest} padding="$none">
+      <Flex>
+        <AnimatePresence>
+          {totalRequestCount > 1 && (
+            <Flex
+              row
+              alignItems="center"
+              animateEnterExit="fadeInDownOutUp"
+              animation="200ms"
+              backgroundColor="$surface1"
+              borderRadius="$rounded16"
+              gap="$spacing4"
+              justifyContent="center"
+              minHeight={REJECT_MESSAGE_HEIGHT}
+              p="$spacing12"
+            >
+              <ReceiptText color="$neutral2" size={iconSizes.icon20} />
+              <Flex grow>
+                <Text color="$neutral2" variant="body4">
+                  <Trans
+                    components={{
+                      highlight: (
+                        <Text
+                          color="$neutral2"
+                          opacity={1}
+                          variant="body4"
+                          // `variant` prop must be first
+                          // eslint-disable-next-line react/jsx-sort-props
+                          fontWeight="500"
+                        />
+                      ),
+                    }}
+                    i18nKey="dapp.request.reject.info"
+                    values={{ totalRequestCount }}
+                  />
+                </Text>
+              </Flex>
+              <TouchableArea onPress={onRejectAll}>
+                <Text color="$statusCritical" fontWeight="500" variant="body4">
+                  {t('dapp.request.reject.action')}
+                </Text>
+              </TouchableArea>
+            </Flex>
+          )}
+        </AnimatePresence>
+        <Flex
+          animation="200ms"
+          backgroundColor="$surface1"
+          borderRadius="$rounded24"
+          gap="$spacing12"
+          p="$spacing12"
+          position="absolute"
+          width="100%"
+          y={totalRequestCount > 1 ? REJECT_MESSAGE_HEIGHT + 12 : 0}
+        >
+          {totalRequestCount > 1 && (
+            <Flex
+              row
+              alignSelf="flex-start"
+              backgroundColor="$surface2"
+              borderRadius="$rounded8"
+              justifyContent="center"
+              p="$spacing4"
+              position="absolute"
+              right={12}
+              zIndex={zIndices.fixed}
+            >
+              <TouchableArea
+                borderRadius="$rounded4"
+                disabled={disabledPrevious}
+                disabledStyle={{
+                  cursor: 'default',
+                }}
+                hoverStyle={{
+                  backgroundColor: colors.surface2Hovered.val,
+                }}
+                onPress={onPressPrevious}
+              >
+                <RotatableChevron
+                  color={disabledPrevious ? '$neutral3' : '$neutral2'}
+                  direction="left"
+                  height={iconSizes.icon16}
+                  width={iconSizes.icon16}
+                />
+              </TouchableArea>
+              <Text color="$neutral2" variant="buttonLabel4">
+                {currentIndex + 1}
+              </Text>
+              <Text color="$neutral2" mx="$spacing4" variant="buttonLabel4">
+                /
+              </Text>
+              <AnimatePresence exitBeforeEnter custom={{ increasing }} initial={false}>
+                <AnimatedPane key={totalRequestCount} animation="200ms">
+                  <Text color="$neutral2" variant="buttonLabel4">
+                    {totalRequestCount}
+                  </Text>
+                </AnimatedPane>
+              </AnimatePresence>
+              <TouchableArea
+                borderRadius="$rounded4"
+                disabled={disabledNext}
+                disabledStyle={{ cursor: 'default' }}
+                hoverStyle={{
+                  backgroundColor: colors.surface2Hovered.val,
+                }}
+                onPress={onPressNext}
+              >
+                <RotatableChevron
+                  color={disabledNext ? '$neutral3' : '$neutral2'}
+                  direction="right"
+                  height={iconSizes.icon16}
+                  width={iconSizes.icon16}
+                />
+              </TouchableArea>
+            </Flex>
+          )}
+          <DappRequest />
+        </Flex>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
+
+const DappRequest = memo(function _DappRequest(): JSX.Element {
+  const { t } = useTranslation()
+  const { request } = useDappRequestQueueContext()
+
+  if (request) {
+    if (isSignMessageRequest(request.dappRequest)) {
+      return <PersonalSignRequestContent dappRequest={request.dappRequest} />
+    }
+    if (isSignTypedDataRequest(request.dappRequest)) {
+      return <SignTypedDataRequestContent dappRequest={request.dappRequest} />
+    }
+    if (isDappRequestStoreItemForEthSendTxn(request)) {
+      return <EthSendRequestContent request={request} />
+    }
+    if (
+      isGetAccountRequest(request.dappRequest) ||
+      isRequestAccountRequest(request.dappRequest) ||
+      isRequestPermissionsRequest(request.dappRequest)
+    ) {
+      return <ConnectionRequestContent />
+    }
+  }
+
+  return <DappRequestContent confirmText={t('common.button.confirm')} title={t('dapp.request.base.title')} />
+})
+
+export function DappRequestContent({
+  chainId,
+  title,
+  headerIcon,
+  confirmText,
+  connectedAccountAddress,
+  maybeCloseOnConfirm,
+  onCancel,
+  onConfirm,
+  showAllNetworks,
+  showNetworkCost,
+  transactionGasFeeResult,
+  children,
+}: PropsWithChildren<DappRequestContentProps>): JSX.Element {
+  const { forwards, currentIndex } = useDappRequestQueueContext()
+
+  return (
+    <>
+      <DappRequestHeader headerIcon={headerIcon} title={title} />
+      <AnimatePresence exitBeforeEnter custom={{ forwards }}>
+        <AnimatedPane key={currentIndex} animation="200ms">
+          {children}
+        </AnimatedPane>
+      </AnimatePresence>
+      <DappRequestFooter
+        chainId={chainId}
+        confirmText={confirmText}
+        connectedAccountAddress={connectedAccountAddress}
+        maybeCloseOnConfirm={maybeCloseOnConfirm}
+        showAllNetworks={showAllNetworks}
+        showNetworkCost={showNetworkCost}
+        transactionGasFeeResult={transactionGasFeeResult}
+        onCancel={onCancel}
+        onConfirm={onConfirm}
+      />
+    </>
+  )
+}
+
+function DappRequestHeader({ headerIcon, title }: DappRequestHeaderProps): JSX.Element {
+  const { dappIconUrl, dappUrl } = useDappRequestQueueContext()
+  const hostname = new URL(dappUrl).hostname.toUpperCase()
+  const fallbackIcon = <DappIconPlaceholder iconSize={iconSizes.icon40} name={hostname} />
+
+  return (
+    <Flex mb="$spacing4" ml="$spacing8" mt="$spacing8">
+      <Flex row>
+        <Flex grow>
+          {headerIcon || (
+            <UniversalImage
+              fallback={fallbackIcon}
+              size={{
+                width: iconSizes.icon40,
+                height: iconSizes.icon40,
+                resizeMode: UniversalImageResizeMode.Contain,
+              }}
+              uri={dappIconUrl}
+            />
+          )}
+        </Flex>
+      </Flex>
+      <Text mt="$spacing8" variant="subheading1">
+        {title}
+      </Text>
+      <Anchor href={dappUrl} rel="noopener noreferrer" target="_blank" textDecorationLine="none">
+        <Text color="$accent1" mt="$spacing4" textAlign="left" variant="body4">
+          {formatDappURL(dappUrl)}
+        </Text>
+      </Anchor>
+    </Flex>
+  )
+}
+
+const WINDOW_CLOSE_DELAY = 10
+
+export function DappRequestFooter({
+  chainId,
+  connectedAccountAddress,
+  confirmText,
+  maybeCloseOnConfirm,
+  onCancel,
+  onConfirm,
+  showAllNetworks,
+  showNetworkCost,
+  transactionGasFeeResult,
+}: DappRequestFooterProps): JSX.Element {
+  const { t } = useTranslation()
+  const activeAccount = useActiveAccountWithThrow()
+  const {
+    dappUrl,
+    currentAccount,
+    request,
+    totalRequestCount,
+    onConfirm: defaultOnConfirm,
+    onCancel: defaultOnCancel,
+  } = useDappRequestQueueContext()
+
+  const activeChain = useDappLastChainId(dappUrl)
+
+  if (!request) {
+    const error = new Error('no request present')
+    logger.error(error, { tags: { file: 'DappRequestContent', function: 'DappRequestFooter' } })
+    throw error
+  }
+
+  const currentChainId = chainId || activeChain || UniverseChainId.Mainnet
+  const gasFeeUSD = useUSDValue(currentChainId, transactionGasFeeResult?.value)
+
+  const shouldCloseSidebar = request.isSidebarClosed && totalRequestCount <= 1
+
+  const handleOnConfirm = useCallback(async () => {
+    if (onConfirm) {
+      onConfirm()
+    } else {
+      await defaultOnConfirm(request)
+    }
+
+    if (maybeCloseOnConfirm && shouldCloseSidebar) {
+      setTimeout(window.close, WINDOW_CLOSE_DELAY)
+    }
+  }, [request, maybeCloseOnConfirm, onConfirm, defaultOnConfirm, shouldCloseSidebar])
+
+  const handleOnCancel = useCallback(async () => {
+    if (onCancel) {
+      onCancel()
+    } else {
+      await defaultOnCancel(request)
+    }
+
+    if (shouldCloseSidebar) {
+      setTimeout(window.close, WINDOW_CLOSE_DELAY)
+    }
+  }, [request, onCancel, defaultOnCancel, shouldCloseSidebar])
+
+  return (
+    <>
+      <Flex gap="$spacing8" mt="$spacing8">
+        {showNetworkCost && (
+          <NetworkFeeFooter
+            chainId={currentChainId}
+            gasFeeUSD={transactionGasFeeResult ? gasFeeUSD : '0'}
+            showNetworkLogo={!!transactionGasFeeResult}
+          />
+        )}
+        {showAllNetworks && <NetworksFooter />}
+        <AddressFooter
+          activeAccountAddress={activeAccount.address}
+          connectedAccountAddress={connectedAccountAddress || currentAccount.address}
+        />
+        <Flex row gap="$spacing12" pt="$spacing8">
+          <Button flex={1} flexBasis={1} size="small" theme="secondary" onPress={handleOnCancel}>
+            {t('common.button.cancel')}
+          </Button>
+          <Button
+            disabled={transactionGasFeeResult ? !gasFeeUSD : false}
+            flex={1}
+            flexBasis={1}
+            size="small"
+            theme="primary"
+            onPress={handleOnConfirm}
+          >
+            {confirmText}
+          </Button>
+        </Flex>
+      </Flex>
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/DappRequestQueueContext.tsx b/apps/extension/src/app/features/dappRequests/DappRequestQueueContext.tsx
new file mode 100644
index 00000000000..781cf2311f7
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/DappRequestQueueContext.tsx
@@ -0,0 +1,144 @@
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { PropsWithChildren, createContext, useContext, useEffect, useRef, useState } from 'react'
+import {
+  confirmRequest,
+  confirmRequestNoDappInfo,
+  isDappRequestWithDappInfo,
+  rejectRequest,
+} from 'src/app/features/dappRequests/saga'
+import { DappRequestStoreItem } from 'src/app/features/dappRequests/slice'
+import { DappResponseType } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { useAppDispatch, useAppSelector } from 'src/store/store'
+import { TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+
+interface DappRequestQueueContextValue {
+  forwards: boolean // direction of sliding animation
+  increasing: boolean // direction of number increasing animation
+  request: DappRequestStoreItem | undefined
+  currentAccount: Account // Account the request is going to (not necessarily the active account)
+  dappUrl: string
+  dappIconUrl: string
+  currentIndex: number
+  totalRequestCount: number
+  onPressNext: () => void
+  onPressPrevious: () => void
+  onConfirm: (request: DappRequestStoreItem, transactionTypeInfo?: TransactionTypeInfo) => Promise<void>
+  onCancel: (request: DappRequestStoreItem) => Promise<void>
+}
+
+const DappRequestQueueContext = createContext<DappRequestQueueContextValue | undefined>(undefined)
+
+export function DappRequestQueueProvider({ children }: PropsWithChildren): JSX.Element {
+  const dispatch = useAppDispatch()
+  const [currentIndex, setCurrentIndex] = useState(0)
+
+  // Show the top most pending request
+  const pendingRequests = useAppSelector((state) => state.dappRequests.pending)
+
+  const request = pendingRequests[currentIndex]
+  const totalRequestCount = pendingRequests.length
+
+  const activeAccount = useActiveAccountWithThrow()
+
+  // values to help with animations
+  const [forwards, setForwards] = useState(true)
+  const [increasing, setIncreasing] = useState(true)
+  const prevTotalRequestCountRef = useRef(totalRequestCount)
+
+  useEffect(() => {
+    if (totalRequestCount > prevTotalRequestCountRef.current) {
+      setIncreasing(true)
+    }
+
+    if (totalRequestCount < prevTotalRequestCountRef.current) {
+      setIncreasing(false)
+    }
+
+    prevTotalRequestCountRef.current = totalRequestCount
+  }, [totalRequestCount])
+
+  const dappUrl = extractBaseUrl(request?.senderTabInfo.url) || ''
+  const dappIconUrl = request?.senderTabInfo?.favIconUrl || ''
+
+  let currentAccount = activeAccount
+  if (request?.dappInfo) {
+    const { activeConnectedAddress, connectedAccounts } = request.dappInfo
+    const connectedAccount = connectedAccounts.find((account) => account.address === activeConnectedAddress)
+
+    if (connectedAccount) {
+      currentAccount = connectedAccount
+    }
+  }
+
+  const onConfirm = async (
+    requestToConfirm: DappRequestStoreItem,
+    transactionTypeInfo?: TransactionTypeInfo,
+  ): Promise<void> => {
+    const requestWithTxInfo = {
+      ...requestToConfirm,
+      transactionTypeInfo,
+    }
+    if (isDappRequestWithDappInfo(requestWithTxInfo)) {
+      await dispatch(confirmRequest(requestWithTxInfo))
+    } else {
+      await dispatch(confirmRequestNoDappInfo(requestWithTxInfo))
+    }
+
+    setCurrentIndex((prev) => Math.max(0, prev - 1))
+  }
+
+  const onCancel = async (requestToCancel: DappRequestStoreItem): Promise<void> => {
+    await dispatch(
+      rejectRequest({
+        senderTabInfo: requestToCancel.senderTabInfo,
+        errorResponse: {
+          requestId: requestToCancel.dappRequest.requestId,
+          type: DappResponseType.ErrorResponse,
+          error: serializeError(providerErrors.userRejectedRequest()),
+        },
+      }),
+    )
+
+    setCurrentIndex((prev) => Math.max(0, prev - 1))
+  }
+
+  const onPressNext = (): void => {
+    setForwards(true)
+    setCurrentIndex((prev) => Math.min(prev + 1, totalRequestCount - 1))
+  }
+
+  const onPressPrevious = (): void => {
+    setForwards(false)
+    setCurrentIndex((prev) => Math.max(0, prev - 1))
+  }
+
+  const value = {
+    forwards,
+    increasing,
+    currentIndex,
+    totalRequestCount,
+    request,
+    dappUrl,
+    dappIconUrl,
+    currentAccount,
+    onConfirm,
+    onCancel,
+    onPressNext,
+    onPressPrevious,
+  }
+
+  return <DappRequestQueueContext.Provider value={value}>{children}</DappRequestQueueContext.Provider>
+}
+
+export function useDappRequestQueueContext(): DappRequestQueueContextValue {
+  const context = useContext(DappRequestQueueContext)
+
+  if (context === undefined) {
+    throw new Error('useDappRequestQueueContext must be used within a DappRequestQueueProvider')
+  }
+
+  return context
+}
diff --git a/apps/extension/src/app/features/dappRequests/accounts.ts b/apps/extension/src/app/features/dappRequests/accounts.ts
new file mode 100644
index 00000000000..6970e63f864
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/accounts.ts
@@ -0,0 +1,154 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { saveDappConnection } from 'src/app/features/dapp/actions'
+import { DappInfo, dappStore } from 'src/app/features/dapp/store'
+import { getOrderedConnectedAddresses } from 'src/app/features/dapp/utils'
+import { SenderTabInfo } from 'src/app/features/dappRequests/slice'
+import {
+  AccountResponse,
+  DappRequest,
+  DappResponseType,
+  ErrorResponse,
+  GetAccountRequest,
+  RequestAccountRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { dappResponseMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { call, put } from 'typed-redux-saga'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { getProvider } from 'wallet/src/features/wallet/context'
+import { selectActiveAccount } from 'wallet/src/features/wallet/selectors'
+import { appSelect } from 'wallet/src/state'
+
+function getAccountResponse(
+  chainId: WalletChainId,
+  dappRequest: DappRequest,
+  provider: JsonRpcProvider,
+  dappInfo: DappInfo,
+): AccountResponse {
+  const orderedConnectedAddresses = getOrderedConnectedAddresses(
+    dappInfo.connectedAccounts,
+    dappInfo.activeConnectedAddress,
+  )
+
+  return {
+    type: DappResponseType.AccountResponse,
+    requestId: dappRequest.requestId,
+    connectedAddresses: orderedConnectedAddresses,
+    chainId: chainIdToHexadecimalString(chainId),
+    providerUrl: provider.connection.url,
+  }
+}
+
+function sendAccountResponseAnalyticsEvent(
+  senderUrl: string,
+  chainId: WalletChainId,
+  dappInfo: DappInfo,
+  accountResponse: AccountResponse,
+): void {
+  const dappUrl = extractBaseUrl(senderUrl)
+
+  sendAnalyticsEvent(ExtensionEventName.DappConnect, {
+    dappUrl: dappUrl ?? '',
+    chainId,
+    activeConnectedAddress: dappInfo.activeConnectedAddress,
+    connectedAddresses: accountResponse.connectedAddresses,
+  })
+}
+/**
+ * Gets the active account, and returns the account address, chainId, and providerUrl.
+ * Chain id + provider url are from the last connected chain for the dApp and wallet. If this has not been set, it will be the default chain and provider.
+ */
+export function* getAccount(
+  dappRequest: GetAccountRequest | RequestAccountRequest,
+  { id, url }: SenderTabInfo,
+  dappInfo: DappInfo,
+) {
+  const chainId = dappInfo.lastChainId
+  const provider = yield* call(getProvider, chainId)
+
+  const response = getAccountResponse(chainId, dappRequest, provider, dappInfo)
+  sendAccountResponseAnalyticsEvent(url, chainId, dappInfo, response)
+
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+/**
+ * Saves the active account as connected to the dapp and parses out necessary data
+ * Triggers a notification for new connections
+ */
+export function* saveAccount({ url, favIconUrl }: SenderTabInfo) {
+  const activeAccount = yield* appSelect(selectActiveAccount)
+  const dappUrl = extractBaseUrl(url)
+  const dappInfo = yield* call(dappStore.getDappInfo, dappUrl)
+
+  if (!dappUrl || !activeAccount) {
+    return
+  }
+
+  yield* call(saveDappConnection, dappUrl, activeAccount)
+  // No dapp info means that this is a first time connection request
+  if (!dappInfo) {
+    yield* put(
+      pushNotification({
+        type: AppNotificationType.DappConnected,
+        dappIconUrl: favIconUrl,
+      }),
+    )
+  }
+
+  const chainId = dappInfo?.lastChainId ?? UniverseChainId.Mainnet
+  const provider = yield* call(getProvider, chainId)
+  const connectedAddresses = (dappUrl && (yield* call(dappStore.getDappOrderedConnectedAddresses, dappUrl))) || []
+
+  return {
+    dappUrl,
+    activeAccount,
+    connectedAddresses,
+    chainId,
+    providerUrl: provider.connection.url,
+  }
+}
+
+/**
+ * Gets the active account, and returns the account address, chainId, and providerUrl.
+ * Chain id + provider url are from the last connected chain for the dApp and wallet. If this has not been set, it will be the default chain and provider.
+ */
+export function* getAccountRequest(request: RequestAccountRequest, senderTabInfo: SenderTabInfo) {
+  const accountInfo = yield* call(saveAccount, senderTabInfo)
+
+  if (!accountInfo) {
+    const errorReponse: ErrorResponse = {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(providerErrors.unauthorized()),
+      requestId: request.requestId,
+    }
+
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, errorReponse)
+  } else {
+    const { dappUrl, activeAccount, connectedAddresses, chainId, providerUrl } = accountInfo
+
+    const accountResponse: AccountResponse = {
+      type: DappResponseType.AccountResponse,
+      requestId: request.requestId,
+      connectedAddresses,
+      chainId: chainIdToHexadecimalString(chainId),
+      providerUrl,
+    }
+
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, accountResponse)
+
+    sendAnalyticsEvent(ExtensionEventName.DappConnectRequest, {
+      dappUrl,
+      chainId,
+      activeConnectedAddress: activeAccount.address,
+      connectedAddresses,
+    })
+  }
+}
diff --git a/apps/extension/src/app/features/dappRequests/dappRequestApprovalWatcherSaga.ts b/apps/extension/src/app/features/dappRequests/dappRequestApprovalWatcherSaga.ts
new file mode 100644
index 00000000000..b2edf654423
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/dappRequestApprovalWatcherSaga.ts
@@ -0,0 +1,252 @@
+/* eslint-disable complexity */
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { PayloadAction } from '@reduxjs/toolkit'
+import { getAccount, getAccountRequest } from 'src/app/features/dappRequests/accounts'
+import { getChainId, getChainIdNoDappInfo } from 'src/app/features/dappRequests/getChainId'
+import {
+  handleGetPermissionsRequest,
+  handleRequestPermissions,
+  handleRevokePermissions,
+} from 'src/app/features/dappRequests/permissions'
+import {
+  DappRequestNoDappInfo,
+  DappRequestRejectParams,
+  DappRequestWithDappInfo,
+  changeChainSaga,
+  confirmRequest,
+  confirmRequestNoDappInfo,
+  handleSendTransaction,
+  handleSignMessage,
+  handleSignTypedData,
+  handleUniswapOpenSidebarRequest,
+  rejectAllRequests,
+  rejectRequest,
+} from 'src/app/features/dappRequests/saga'
+import { dappRequestActions } from 'src/app/features/dappRequests/slice'
+import {
+  BaseSendTransactionRequest,
+  BaseSendTransactionRequestSchema,
+  ChangeChainRequest,
+  ChangeChainRequestSchema,
+  DappRequestType,
+  DappResponseType,
+  ErrorResponse,
+  GetAccountRequest,
+  GetAccountRequestSchema,
+  GetChainIdRequest,
+  GetChainIdRequestSchema,
+  GetPermissionsRequest,
+  GetPermissionsRequestSchema,
+  RequestAccountRequest,
+  RequestAccountRequestSchema,
+  RequestPermissionsRequest,
+  RequestPermissionsRequestSchema,
+  RevokePermissionsRequest,
+  RevokePermissionsRequestSchema,
+  SignMessageRequest,
+  SignMessageRequestSchema,
+  SignTypedDataRequest,
+  SignTypedDataRequestSchema,
+  UniswapOpenSidebarRequest,
+  UniswapOpenSidebarRequestSchema,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { dappResponseMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { appSelect } from 'src/store/store'
+import { WebState } from 'src/store/webReducer'
+import { call, put, takeEvery } from 'typed-redux-saga'
+import { logger } from 'utilities/src/logger/logger'
+
+function* dappRequestApproval({
+  type,
+  payload: request,
+}: PayloadAction<DappRequestWithDappInfo | DappRequestNoDappInfo | DappRequestRejectParams>) {
+  if (type === rejectAllRequests.type) {
+    const pendingRequests = yield* appSelect((state: WebState) => state.dappRequests.pending)
+
+    for (const pendingRequest of pendingRequests) {
+      const errorResponse: ErrorResponse = {
+        type: DappResponseType.ErrorResponse,
+        error: serializeError(providerErrors.userRejectedRequest()),
+        requestId: pendingRequest.dappRequest.requestId,
+      }
+
+      yield* call(dappResponseMessageChannel.sendMessageToTab, pendingRequest.senderTabInfo.id, errorResponse)
+    }
+
+    yield* put(dappRequestActions.removeAll())
+    return
+  }
+
+  const requestId =
+    ('dappRequest' in request && request?.dappRequest?.requestId) ||
+    ('errorResponse' in request && request?.errorResponse?.requestId)
+  const { id: senderTabId } = request.senderTabInfo
+
+  if (!senderTabId) {
+    throw new Error('senderTabId is required')
+  }
+  if (!requestId) {
+    throw new Error('requestId is required')
+  }
+
+  try {
+    if (type === confirmRequest.type) {
+      const confirmedRequest = request as DappRequestWithDappInfo
+      logger.info('dappRequestApprovalWatcher', 'confirmRequest', 'confirm request', request)
+
+      switch (confirmedRequest.dappRequest.type) {
+        case DappRequestType.RequestPermissions: {
+          const validatedRequest: RequestPermissionsRequest = RequestPermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(
+            handleRequestPermissions,
+            validatedRequest,
+            confirmedRequest.senderTabInfo,
+            confirmedRequest.dappInfo,
+          )
+          break
+        }
+        case DappRequestType.RevokePermissions: {
+          const validatedRequest: RevokePermissionsRequest = RevokePermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(handleRevokePermissions, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.GetPermissions: {
+          const validatedRequest: GetPermissionsRequest = GetPermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(
+            handleGetPermissionsRequest,
+            validatedRequest,
+            confirmedRequest.senderTabInfo,
+            confirmedRequest.dappInfo,
+          )
+          break
+        }
+        case DappRequestType.SendTransaction: {
+          const validatedRequest: BaseSendTransactionRequest = BaseSendTransactionRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(
+            handleSendTransaction,
+            validatedRequest,
+            confirmedRequest.senderTabInfo,
+            confirmedRequest.dappInfo,
+            confirmedRequest.transactionTypeInfo,
+          )
+          break
+        }
+        case DappRequestType.GetAccount: {
+          const validatedRequest: GetAccountRequest = GetAccountRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(getAccount, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        case DappRequestType.RequestAccount: {
+          const validatedRequest: RequestAccountRequest = RequestAccountRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(getAccountRequest, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        case DappRequestType.GetChainId: {
+          const validatedRequest: GetChainIdRequest = GetChainIdRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(getChainId, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        case DappRequestType.ChangeChain: {
+          const validatedRequest: ChangeChainRequest = ChangeChainRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(changeChainSaga, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        case DappRequestType.SignMessage: {
+          const validatedRequest: SignMessageRequest = SignMessageRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(handleSignMessage, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        case DappRequestType.SignTypedData: {
+          const validatedRequest: SignTypedDataRequest = SignTypedDataRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(handleSignTypedData, validatedRequest, confirmedRequest.senderTabInfo, confirmedRequest.dappInfo)
+          break
+        }
+        // Add more request types here
+      }
+    } else if (type === confirmRequestNoDappInfo.type) {
+      const confirmedRequest = request as DappRequestNoDappInfo
+      switch (confirmedRequest.dappRequest.type) {
+        case DappRequestType.RequestAccount: {
+          const validatedRequest = RequestAccountRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(getAccountRequest, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.RequestPermissions: {
+          const validatedRequest: RequestPermissionsRequest = RequestPermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(handleRequestPermissions, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.RevokePermissions: {
+          const validatedRequest: RevokePermissionsRequest = RevokePermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(handleRevokePermissions, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.GetPermissions: {
+          const validatedRequest: GetPermissionsRequest = GetPermissionsRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(handleGetPermissionsRequest, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.GetChainId: {
+          const validatedRequest: GetChainIdRequest = GetChainIdRequestSchema.parse(confirmedRequest.dappRequest)
+          yield* call(getChainIdNoDappInfo, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+        case DappRequestType.UniswapOpenSidebar: {
+          const validatedRequest: UniswapOpenSidebarRequest = UniswapOpenSidebarRequestSchema.parse(
+            confirmedRequest.dappRequest,
+          )
+          yield* call(handleUniswapOpenSidebarRequest, validatedRequest, confirmedRequest.senderTabInfo)
+          break
+        }
+      }
+    } else if (type === rejectRequest.type) {
+      const rejectedRequest = request as DappRequestRejectParams
+      logger.info('dappRequestApprovalWatcher', 'rejectRequest', 'dapp request rejected', request)
+
+      const errorResponse: ErrorResponse = {
+        type: DappResponseType.ErrorResponse,
+        error: rejectedRequest.errorResponse.error,
+        requestId: rejectedRequest.errorResponse.requestId,
+      }
+
+      yield* call(dappResponseMessageChannel.sendMessageToTab, rejectedRequest.senderTabInfo.id, errorResponse)
+    }
+  } catch (error) {
+    logger.error(error, {
+      tags: { file: 'dappRequestApprovalWatcherSaga', function: 'dappRequestApprovalWatcher' },
+    })
+
+    const errorResponse: ErrorResponse = {
+      type: DappResponseType.ErrorResponse,
+      requestId,
+      error: serializeError(error),
+    }
+
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabId, errorResponse)
+  } finally {
+    yield* put(dappRequestActions.remove(requestId))
+  }
+}
+
+/**
+ * Watch for pending requests to be confirmed or rejected and dispatch action
+ */
+export function* dappRequestApprovalWatcher() {
+  yield* takeEvery([confirmRequestNoDappInfo, confirmRequest, rejectRequest, rejectAllRequests], dappRequestApproval)
+}
diff --git a/apps/extension/src/app/features/dappRequests/getChainId.ts b/apps/extension/src/app/features/dappRequests/getChainId.ts
new file mode 100644
index 00000000000..4cbfc52ccee
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/getChainId.ts
@@ -0,0 +1,34 @@
+import { DappInfo } from 'src/app/features/dapp/store'
+import { SenderTabInfo } from 'src/app/features/dappRequests/slice'
+import {
+  ChainIdResponse,
+  DappResponseType,
+  GetChainIdRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { dappResponseMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { call } from 'typed-redux-saga'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function* getChainId(request: GetChainIdRequest, { id }: SenderTabInfo, dappInfo: DappInfo) {
+  const response: ChainIdResponse = {
+    type: DappResponseType.ChainIdResponse,
+    requestId: request.requestId,
+    chainId: chainIdToHexadecimalString(dappInfo.lastChainId),
+  }
+
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function* getChainIdNoDappInfo(request: GetChainIdRequest, { id }: SenderTabInfo) {
+  // Sending mainnet as default chain for unconnected dapps
+  const response: ChainIdResponse = {
+    type: DappResponseType.ChainIdResponse,
+    requestId: request.requestId,
+    chainId: chainIdToHexadecimalString(UniverseChainId.Mainnet),
+  }
+
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
diff --git a/apps/extension/src/app/features/dappRequests/permissions.ts b/apps/extension/src/app/features/dappRequests/permissions.ts
new file mode 100644
index 00000000000..3ace013c415
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/permissions.ts
@@ -0,0 +1,126 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { rpcErrors, serializeError } from '@metamask/rpc-errors'
+import { logger } from 'ethers'
+import { removeDappConnection } from 'src/app/features/dapp/actions'
+import { DappInfo } from 'src/app/features/dapp/store'
+import { saveAccount } from 'src/app/features/dappRequests/accounts'
+import { SenderTabInfo } from 'src/app/features/dappRequests/slice'
+import {
+  DappResponseType,
+  ErrorResponse,
+  GetPermissionsRequest,
+  GetPermissionsResponse,
+  RequestPermissionsRequest,
+  RequestPermissionsResponse,
+  RevokePermissionsRequest,
+  RevokePermissionsResponse,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { dappResponseMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { Permission } from 'src/contentScript/WindowEthereumRequestTypes'
+import { ExtensionEthMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import { call, put } from 'typed-redux-saga'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+
+export function getPermissions(dappUrl: string | undefined, connectedAddresses: Address[] | undefined): Permission[] {
+  const permissions: Permission[] = []
+  const isDappConnected = connectedAddresses && connectedAddresses.length > 0
+  if (isDappConnected && dappUrl) {
+    // Safe to assume the eth_accounts permission can be added here,
+    // since dappInfo will only exist if it as been approved already
+    permissions.push({
+      invoker: dappUrl,
+      parentCapability: ExtensionEthMethods.eth_accounts,
+      caveats: [],
+    })
+  }
+
+  return permissions
+}
+
+export function* handleGetPermissionsRequest(
+  request: GetPermissionsRequest,
+  { id, url }: SenderTabInfo,
+  dappInfo?: DappInfo,
+) {
+  const permissions: Permission[] = []
+  if (dappInfo) {
+    permissions.push({
+      invoker: url,
+      parentCapability: ExtensionEthMethods.eth_accounts,
+      caveats: [],
+    })
+  }
+
+  const response: GetPermissionsResponse = {
+    type: DappResponseType.GetPermissionsResponse,
+    requestId: request.requestId,
+    permissions,
+  }
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+export function* handleRequestPermissions(request: RequestPermissionsRequest, senderTabInfo: SenderTabInfo) {
+  const requestedPermissions = Object.keys(request.permissions)
+
+  if (requestedPermissions.includes(ExtensionEthMethods.eth_accounts)) {
+    // Pre-emptively save the dapp connection, to avoid double-approval when dapp calls eth_requestAccounts
+    const accountInfo = yield* call(saveAccount, senderTabInfo)
+    const accounts = accountInfo && {
+      connectedAddresses: accountInfo.connectedAddresses,
+      chainId: chainIdToHexadecimalString(accountInfo.chainId),
+      providerUrl: accountInfo.providerUrl,
+    }
+
+    const permissions: Permission[] = [
+      {
+        invoker: senderTabInfo.url,
+        parentCapability: ExtensionEthMethods.eth_accounts,
+        caveats: [],
+      },
+    ]
+    const response: RequestPermissionsResponse = {
+      type: DappResponseType.RequestPermissionsResponse,
+      requestId: request.requestId,
+      permissions,
+      accounts,
+    }
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, response)
+  } else {
+    logger.info('saga.ts', 'handleRequestPermissions', 'Unknown permissions requested', requestedPermissions)
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(rpcErrors.methodNotFound()),
+      requestId: request.requestId,
+    } satisfies ErrorResponse)
+  }
+}
+
+export function* handleRevokePermissions(request: RevokePermissionsRequest, senderTabInfo: SenderTabInfo) {
+  const revokedPermissions = Object.keys(request.permissions)
+
+  if (revokedPermissions.includes(ExtensionEthMethods.eth_accounts)) {
+    const dappUrl = extractBaseUrl(senderTabInfo.url)
+
+    if (!dappUrl) {
+      return
+    }
+
+    yield* call(removeDappConnection, dappUrl, undefined)
+    yield* put(pushNotification({ type: AppNotificationType.DappDisconnected, dappIconUrl: senderTabInfo.favIconUrl }))
+
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, {
+      type: DappResponseType.RevokePermissionsResponse,
+      requestId: request.requestId,
+    } satisfies RevokePermissionsResponse)
+  } else {
+    logger.info('saga.ts', 'handleRevokePermissions', 'Unknown permissions requested', revokedPermissions)
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(rpcErrors.methodNotFound()),
+      requestId: request.requestId,
+    } satisfies ErrorResponse)
+  }
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/Connection/ConnectionRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/Connection/ConnectionRequestContent.tsx
new file mode 100644
index 00000000000..be130ca36d9
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/Connection/ConnectionRequestContent.tsx
@@ -0,0 +1,27 @@
+import { useTranslation } from 'react-i18next'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { Flex, Text } from 'ui/src'
+
+export function ConnectionRequestContent(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <DappRequestContent
+      showAllNetworks
+      confirmText={t('common.button.connect')}
+      title={t('dapp.request.connect.title')}
+    >
+      <Flex
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded12"
+        borderWidth="$spacing1"
+        p="$spacing12"
+      >
+        <Text color="$neutral2" variant="body4">
+          {t('dapp.request.connect.helptext')}
+        </Text>
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Approve/ApproveRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Approve/ApproveRequestContent.tsx
new file mode 100644
index 00000000000..a236214b83e
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Approve/ApproveRequestContent.tsx
@@ -0,0 +1,104 @@
+import { useTranslation } from 'react-i18next'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import {
+  ApproveSendTransactionRequest,
+  DappRequest as DappRequestBaseType,
+  DappRequestType,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { Flex, Text } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
+import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
+import { TransactionType, TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+
+function useDappRequestTokenRecipientInfo(request: DappRequestBaseType, dappUrl: string): Maybe<CurrencyInfo> {
+  const activeChain = useDappLastChainId(dappUrl)
+  const type = request.type
+  const to = type === DappRequestType.SendTransaction ? request.transaction.to : undefined
+
+  const identifier =
+    activeChain && type === DappRequestType.SendTransaction && to ? buildCurrencyId(activeChain, to) : undefined
+
+  return useCurrencyInfo(identifier)
+}
+
+function parseSpenderAddress(data: string): string {
+  // Check if the data is of the correct length for "approve(address,uint256)"
+  // It should have 10 characters for "0x" + function selector and 64 characters for each parameter
+  if (data.length !== 10 + 64 * 2) {
+    throw new Error('Invalid data length')
+  }
+
+  // The first argument (address) starts 10 characters in (after "0x" + 8 characters for function selector)
+  // and spans the next 64 characters, but the first 24 are padding zeros for the 40-character address
+  const addressHex = data.slice(34, 74) // From position 34 to 74 to capture the address
+
+  // Validate if the address hex is correctly formatted
+  if (!/^[0-9a-fA-F]{40}$/.test(addressHex)) {
+    throw new Error('Invalid characters in hex string')
+  }
+
+  return `0x${addressHex}`
+}
+
+interface ApproveRequestContentProps {
+  transactionGasFeeResult: GasFeeResult
+  dappRequest: ApproveSendTransactionRequest
+  onCancel: () => Promise<void>
+  onConfirm: (transactionTypeInfo?: TransactionTypeInfo) => Promise<void>
+}
+
+export function ApproveRequestContent({
+  dappRequest,
+  transactionGasFeeResult,
+  onCancel,
+  onConfirm,
+}: ApproveRequestContentProps): JSX.Element {
+  const { t } = useTranslation()
+  const { dappUrl } = useDappRequestQueueContext()
+
+  const tokenInfo = useDappRequestTokenRecipientInfo(dappRequest, dappUrl)
+  const tokenSymbol = tokenInfo?.currency.symbol
+  const spender = parseSpenderAddress(dappRequest.transaction.data)
+  const transactionTypeInfo: TransactionTypeInfo | undefined = dappRequest.transaction.to
+    ? {
+        type: TransactionType.Approve,
+        tokenAddress: dappRequest.transaction.to,
+        spender,
+      }
+    : undefined
+  const onConfirmWithTransactionTypeInfo = (): Promise<void> => onConfirm(transactionTypeInfo)
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('dapp.request.approve.action')}
+      headerIcon={<CurrencyLogo hideNetworkLogo currencyInfo={tokenInfo} size={iconSizes.icon40} />}
+      title={tokenSymbol ? t('dapp.request.approve.title', { tokenSymbol }) : t('dapp.request.approve.fallbackTitle')}
+      transactionGasFeeResult={transactionGasFeeResult}
+      onCancel={onCancel}
+      onConfirm={onConfirmWithTransactionTypeInfo}
+    >
+      <Flex
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded12"
+        borderWidth="$spacing1"
+        gap="$spacing4"
+        p="$spacing12"
+      >
+        <Text color="$neutral2" variant="body4">
+          {t('dapp.request.approve.helptext')}
+        </Text>
+        <LearnMoreLink textVariant="body4" url={uniswapUrls.helpArticleUrls.approvalsExplainer} />
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx
new file mode 100644
index 00000000000..33d54ea3c6b
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx
@@ -0,0 +1,121 @@
+import { useCallback, useEffect, useMemo } from 'react'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import { ApproveRequestContent } from 'src/app/features/dappRequests/requestContent/EthSend/Approve/ApproveRequestContent'
+import { FallbackEthSendRequestContent } from 'src/app/features/dappRequests/requestContent/EthSend/FallbackEthSend/FallbackEthSend'
+import { LPRequestContent } from 'src/app/features/dappRequests/requestContent/EthSend/LP/LPRequestContent'
+import { SwapRequestContent } from 'src/app/features/dappRequests/requestContent/EthSend/Swap/SwapRequestContent'
+import {
+  DappRequestStoreItemForEthSendTxn,
+  isApproveRequest,
+  isLPRequest,
+  isSwapRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { PollingInterval } from 'uniswap/src/constants/misc'
+import { logger } from 'utilities/src/logger/logger'
+import { formatExternalTxnWithGasEstimates } from 'wallet/src/features/gas/formatExternalTxnWithGasEstimates'
+import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
+import { GasFeeResult, GasSpeed } from 'wallet/src/features/gas/types'
+import { TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+
+interface EthSendRequestContentProps {
+  request: DappRequestStoreItemForEthSendTxn
+}
+
+export function EthSendRequestContent({ request }: EthSendRequestContentProps): JSX.Element {
+  const { dappRequest } = request
+  const { dappUrl, onConfirm, onCancel } = useDappRequestQueueContext()
+  const chainId = useDappLastChainId(dappUrl)
+
+  // Gas service requires a chain id
+  const formattedTxnForGasQuery = { ...dappRequest.transaction, chainId }
+
+  const transactionGasFeeResult = useTransactionGasFee(
+    formattedTxnForGasQuery,
+    /*speed=*/ GasSpeed.Urgent,
+    /*skip=*/ !formattedTxnForGasQuery,
+    /*pollingInterval=*/ PollingInterval.LightningMcQueen,
+  )
+
+  const isInvalidGasFeeResult = isInvalidGasFeeResultForEthSend(transactionGasFeeResult)
+
+  useEffect(() => {
+    if (isInvalidGasFeeResult) {
+      logger.error(
+        new Error(transactionGasFeeResult.error?.toString() ?? 'Empty gas fee result for dapp txn request.'),
+        {
+          tags: { file: 'features/dappRequests/DappRequestContent, ', function: 'DappRequest' },
+          extra: { dappRequest },
+        },
+      )
+    }
+  }, [dappRequest, isInvalidGasFeeResult, transactionGasFeeResult])
+
+  const requestWithGasValues = useMemo(() => {
+    const txnWithFormattedGasEstimates = formatExternalTxnWithGasEstimates({
+      transaction: dappRequest.transaction,
+      gasFeeResult: transactionGasFeeResult,
+    })
+
+    return {
+      ...request,
+      dappRequest: {
+        ...request.dappRequest,
+        transaction: txnWithFormattedGasEstimates,
+      },
+    }
+  }, [dappRequest.transaction, request, transactionGasFeeResult])
+
+  const onConfirmRequest = useCallback(
+    async (transactionTypeInfo?: TransactionTypeInfo) => {
+      await onConfirm(requestWithGasValues, transactionTypeInfo)
+    },
+    [onConfirm, requestWithGasValues],
+  )
+
+  const onCancelRequest = useCallback(async () => {
+    await onCancel(requestWithGasValues)
+  }, [onCancel, requestWithGasValues])
+
+  if (isSwapRequest(dappRequest)) {
+    return (
+      <SwapRequestContent
+        dappRequest={dappRequest}
+        transactionGasFeeResult={transactionGasFeeResult}
+        onCancel={onCancelRequest}
+        onConfirm={onConfirmRequest}
+      />
+    )
+  } else if (isLPRequest(dappRequest)) {
+    return (
+      <LPRequestContent
+        dappRequest={dappRequest}
+        transactionGasFeeResult={transactionGasFeeResult}
+        onCancel={onCancelRequest}
+        onConfirm={onConfirmRequest}
+      />
+    )
+  } else if (isApproveRequest(dappRequest)) {
+    return (
+      <ApproveRequestContent
+        dappRequest={dappRequest}
+        transactionGasFeeResult={transactionGasFeeResult}
+        onCancel={onCancelRequest}
+        onConfirm={onConfirmRequest}
+      />
+    )
+  } else {
+    return (
+      <FallbackEthSendRequestContent
+        dappRequest={dappRequest}
+        transactionGasFeeResult={transactionGasFeeResult}
+        onCancel={onCancelRequest}
+        onConfirm={onConfirmRequest}
+      />
+    )
+  }
+}
+
+function isInvalidGasFeeResultForEthSend(gasFeeResult: GasFeeResult): boolean {
+  return !!gasFeeResult.error || (!gasFeeResult.loading && (!gasFeeResult.params || !gasFeeResult.value))
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/FallbackEthSend/FallbackEthSend.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/FallbackEthSend/FallbackEthSend.tsx
new file mode 100644
index 00000000000..ac106dc3797
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/FallbackEthSend/FallbackEthSend.tsx
@@ -0,0 +1,118 @@
+import { BigNumber } from 'ethers'
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import { SendTransactionRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { useCopyToClipboard } from 'src/app/hooks/useOnCopyToClipboard'
+import { Anchor, Flex, Text, TouchableArea } from 'ui/src'
+import { AnimatedCopySheets, ExternalLink } from 'ui/src/components/icons'
+import { ellipseMiddle, shortenAddress } from 'utilities/src/addresses'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { ContentRow } from 'wallet/src/features/transactions/TransactionRequest/ContentRow'
+import { SpendingDetails } from 'wallet/src/features/transactions/TransactionRequest/SpendingDetails'
+import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+
+interface FallbackEthSendRequestProps {
+  transactionGasFeeResult: GasFeeResult
+  dappRequest: SendTransactionRequest
+  onCancel: () => Promise<void>
+  onConfirm: () => Promise<void>
+}
+
+export function FallbackEthSendRequestContent({
+  dappRequest,
+  transactionGasFeeResult,
+  onCancel,
+  onConfirm,
+}: FallbackEthSendRequestProps): JSX.Element | null {
+  const { t } = useTranslation()
+  const { dappUrl } = useDappRequestQueueContext()
+  const activeChain = useDappLastChainId(dappUrl)
+
+  const { value: sending, to: toAddress, chainId: transactionChainId } = dappRequest.transaction
+  const chainId = transactionChainId || activeChain
+  const recipientLink = chainId && toAddress ? getExplorerLink(chainId, toAddress, ExplorerDataType.ADDRESS) : ''
+  const contractFunction = dappRequest.transaction.type
+  const calldata = dappRequest.transaction.data
+
+  const copyToClipboard = useCopyToClipboard()
+
+  const copyCalldata = useCallback(
+    () =>
+      copyToClipboard({
+        textToCopy: calldata,
+        copyType: CopyNotificationType.Calldata,
+      }),
+    [calldata, copyToClipboard],
+  )
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('common.button.confirm')}
+      title={t('dapp.request.base.title')}
+      transactionGasFeeResult={transactionGasFeeResult}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+    >
+      <Flex
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        gap="$spacing12"
+        p="$spacing16"
+        width="100%"
+      >
+        {sending && !BigNumber.from(sending).eq(0) && chainId && <SpendingDetails chainId={chainId} value={sending} />}
+        {toAddress && (
+          <ContentRow label={t('common.text.recipient')}>
+            <Anchor href={recipientLink} rel="noopener noreferrer" target="_blank" textDecorationLine="none">
+              <Flex row alignItems="center" gap="$spacing8">
+                <Text color="$neutral1" variant="body4">
+                  {shortenAddress(toAddress)}
+                </Text>
+                <ExternalLink color="$neutral3" size="$icon.16" />
+              </Flex>
+            </Anchor>
+          </ContentRow>
+        )}
+        <ContentRow label={t('dapp.request.fallback.function.label')}>
+          <Text
+            borderColor="$surface3"
+            borderRadius="$rounded8"
+            borderWidth={1}
+            color="$neutral1"
+            // fontFamily="SF Mono"
+            px="$spacing8"
+            py="$spacing2"
+            // variant="monospace"
+            variant="body4"
+          >
+            {contractFunction || t('common.text.unknown')}
+          </Text>
+        </ContentRow>
+        {calldata && (
+          <ContentRow label={t('dapp.request.fallback.calldata.label')}>
+            <TouchableArea
+              alignItems="center"
+              cursor="pointer"
+              display="flex"
+              flexDirection="row"
+              gap="$spacing8"
+              onPress={copyCalldata}
+            >
+              <Text color="$neutral1" variant="body4">
+                {ellipseMiddle(calldata)}
+              </Text>
+              <AnimatedCopySheets color="$neutral3" size="$icon.16" />
+            </TouchableArea>
+          </ContentRow>
+        )}
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/LP/LPRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/LP/LPRequestContent.tsx
new file mode 100644
index 00000000000..ea1615cc2c5
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/LP/LPRequestContent.tsx
@@ -0,0 +1,49 @@
+import { useTranslation } from 'react-i18next'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { LPSendTransactionRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { Flex, Text } from 'ui/src'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+
+interface LPRequestContentProps {
+  transactionGasFeeResult: GasFeeResult
+  dappRequest: LPSendTransactionRequest
+  onCancel: () => Promise<void>
+  onConfirm: () => Promise<void>
+}
+
+export function LPRequestContent({
+  dappRequest,
+  transactionGasFeeResult,
+  onCancel,
+  onConfirm,
+}: LPRequestContentProps): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('common.button.sign')}
+      title={t('dapp.request.base.title')}
+      transactionGasFeeResult={transactionGasFeeResult}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+    >
+      <Flex
+        alignItems="flex-start"
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        flexDirection="row"
+        justifyContent="space-between"
+        p="$spacing16"
+      >
+        {dappRequest.parsedCalldata.commands.map((command) => (
+          <Text color="$neutral2" variant="body4">
+            {command.commandName}
+          </Text>
+        ))}
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/SwapRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/SwapRequestContent.tsx
new file mode 100644
index 00000000000..28bd0f53c19
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/SwapRequestContent.tsx
@@ -0,0 +1,291 @@
+/* eslint-disable complexity */
+import { useTranslation } from 'react-i18next'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import { formatUnits } from 'src/app/features/dappRequests/requestContent/EthSend/Swap/utils'
+import { SwapSendTransactionRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import {
+  AmountInMaxParam,
+  AmountInParam,
+  AmountOutMinParam,
+  AmountOutParam,
+  Param,
+  UniversalRouterCommand,
+  isAmountInMaxParam,
+  isAmountInParam,
+  isAmountOutMinParam,
+  isAmountOutParam,
+  isURCommandASwap,
+} from 'src/app/features/dappRequests/types/UniversalRouterTypes'
+import { Flex, Separator, Text } from 'ui/src'
+import { ArrowDown } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
+import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
+import { assert } from 'utilities/src/errors'
+import { NumberType } from 'utilities/src/format/types'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
+import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
+import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { TransactionType, TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+
+function extractPathValues(commands: UniversalRouterCommand[]): {
+  inputAddress: string | undefined
+  outputAddress: string | undefined
+} {
+  let inputAddress: string | undefined
+  let outputAddress: string | undefined
+  for (const command of commands) {
+    const param: Param | undefined = command.params.find(({ name }) => name === 'path')
+    if (!param) {
+      continue
+    }
+    // matches V2SwapExact[In|Out]
+    if (command.commandName.startsWith('V2SwapExact')) {
+      const path = param.value as string[]
+      const first = path[0]
+      if (first && !inputAddress) {
+        inputAddress = first
+      }
+      const last = path[path.length - 1]
+      if (last) {
+        outputAddress = last
+      }
+    }
+    // matches V3SwapExact[In|Out]
+    if (command.commandName.startsWith('V3SwapExact')) {
+      const path = param.value as { fee: number; tokenIn: string; tokenOut: string }[]
+      const first = path[0]
+      if (first && !inputAddress) {
+        inputAddress = first.tokenIn
+      }
+      const last = path[path.length - 1]
+      if (last) {
+        outputAddress = last.tokenOut
+      }
+    }
+  }
+  return { inputAddress, outputAddress }
+}
+
+function useSwapCurrencyIdentifiers(
+  request: SwapSendTransactionRequest,
+  dappUrl: string,
+): { inputIdentifier: string | undefined; outputIdentifier: string | undefined } {
+  const activeChain = useDappLastChainId(dappUrl)
+  return getSwapCurrencyIdentifiers(request, activeChain)
+}
+
+export function getSwapCurrencyIdentifiers(
+  request: SwapSendTransactionRequest,
+  activeChain: WalletChainId | undefined,
+): { inputIdentifier: string | undefined; outputIdentifier: string | undefined } {
+  const { inputAddress, outputAddress } = extractPathValues(request.parsedCalldata.commands)
+
+  const inputIdentifier = activeChain && inputAddress ? buildCurrencyId(activeChain, inputAddress) : undefined
+  const outputIdentifier = activeChain && outputAddress ? buildCurrencyId(activeChain, outputAddress) : undefined
+
+  return { inputIdentifier, outputIdentifier }
+}
+
+function getTransactionTypeInfo({
+  inputCurrencyInfo,
+  outputCurrencyInfo,
+  inputAmountRaw,
+  outputAmountRaw,
+}: {
+  inputCurrencyInfo: Maybe<CurrencyInfo>
+  outputCurrencyInfo: Maybe<CurrencyInfo>
+  inputAmountRaw: string
+  outputAmountRaw: string
+}): TransactionTypeInfo | undefined {
+  return inputCurrencyInfo?.currencyId && outputCurrencyInfo?.currencyId
+    ? {
+        type: TransactionType.Swap,
+        tradeType: 0, // TradeType.EXACT_INPUT, but TradeType doesn't matter for the UI
+        inputCurrencyId: inputCurrencyInfo?.currencyId,
+        outputCurrencyId: outputCurrencyInfo?.currencyId,
+        inputCurrencyAmountRaw: inputAmountRaw,
+        expectedOutputCurrencyAmountRaw: outputAmountRaw,
+        minimumOutputCurrencyAmountRaw: outputAmountRaw,
+      }
+    : undefined
+}
+
+interface SwapRequestContentProps {
+  transactionGasFeeResult: GasFeeResult
+  dappRequest: SwapSendTransactionRequest
+  onCancel: () => Promise<void>
+  onConfirm: (transactionTypeInfo?: TransactionTypeInfo) => Promise<void>
+}
+
+export function SwapRequestContent({
+  transactionGasFeeResult,
+  dappRequest,
+  onCancel,
+  onConfirm,
+}: SwapRequestContentProps): JSX.Element {
+  const { t } = useTranslation()
+  const { dappUrl } = useDappRequestQueueContext()
+  const { formatCurrencyAmount } = useLocalizationContext()
+  const activeChain = useDappLastChainId(dappUrl)
+
+  const { inputIdentifier, outputIdentifier } = useSwapCurrencyIdentifiers(dappRequest, dappUrl)
+
+  const inputCurrencyInfo = useCurrencyInfo(inputIdentifier)
+  const outputCurrencyInfo = useCurrencyInfo(outputIdentifier)
+
+  const isFirstCommandWrappingEth = dappRequest.parsedCalldata.commands[0]?.commandName === 'WrapEth'
+  const isLastCommandUnwrappingEth =
+    dappRequest.parsedCalldata.commands[dappRequest.parsedCalldata.commands.length - 1]?.commandName === 'UnwrapWeth'
+
+  const nativeCurrency = NativeCurrency.onChain(activeChain || UniverseChainId.Mainnet)
+
+  const nativeInput = isFirstCommandWrappingEth && inputCurrencyInfo?.currency.equals(nativeCurrency.wrapped)
+  const nativeOutput = isLastCommandUnwrappingEth && outputCurrencyInfo?.currency.equals(nativeCurrency.wrapped)
+  const currency0 = nativeInput ? nativeCurrency : inputCurrencyInfo?.currency
+  const currency1 = nativeOutput ? nativeCurrency : outputCurrencyInfo?.currency
+
+  const firstSwapCommand = dappRequest.parsedCalldata.commands.find(isURCommandASwap)
+  const lastSwapCommand = dappRequest.parsedCalldata.commands.findLast(isURCommandASwap)
+
+  assert(
+    firstSwapCommand && lastSwapCommand,
+    'SwapRequestContent: All swaps must have a defined input and output Universal Router command.',
+  )
+
+  function isAmountInOrMaxParam(param: Param): param is AmountInParam | AmountInMaxParam {
+    return isAmountInParam(param) || isAmountInMaxParam(param)
+  }
+
+  function isAmountOutMinOrOutParam(param: Param): param is AmountOutMinParam | AmountOutParam {
+    return isAmountOutMinParam(param) || isAmountOutParam(param)
+  }
+
+  // Ideally we would render some UI that makes it clear when you can expect minAmountOut instead of rendering what might look like a bad deal
+  const firstAmountInParam = firstSwapCommand?.params.find(isAmountInOrMaxParam)
+  const lastAmountOutParam = lastSwapCommand?.params.find(isAmountOutMinOrOutParam)
+
+  assert(
+    firstAmountInParam && lastAmountOutParam,
+    'SwapRequestContent: All swaps must have a defined input and output amount parameter.',
+  )
+
+  const inputAmount = formatUnits(
+    firstAmountInParam?.value || '0', // should always be defined--`assert` above catches this case
+    inputCurrencyInfo?.currency.decimals || 18,
+  )
+  const outputAmount = formatUnits(
+    lastAmountOutParam?.value || '0', // should always be defined--`assert` above catches this case
+    outputCurrencyInfo?.currency.decimals || 18,
+  )
+
+  const inputCurrencyAmount = getCurrencyAmount({
+    value: inputAmount,
+    valueType: ValueType.Exact,
+    currency: inputCurrencyInfo?.currency,
+  })
+  const inputValue = useUSDCValue(inputCurrencyAmount)
+
+  const outputCurrencyAmount = getCurrencyAmount({
+    value: outputAmount,
+    valueType: ValueType.Exact,
+    currency: outputCurrencyInfo?.currency,
+  })
+  const outputValue = useUSDCValue(outputCurrencyAmount)
+
+  const showSwapDetails = Boolean(currency0?.symbol && currency1?.symbol)
+  const showSplitLogo = Boolean(inputCurrencyInfo?.logoUrl && outputCurrencyInfo?.logoUrl)
+
+  // TODO (EXT-1083): add USDC values to SwapTransactionTypeInfo and display on notification toast
+  // Need the raw uint256 amounts, not the exact floating point amounts
+  const inputAmountRaw = formatUnits(
+    firstAmountInParam?.value || '0', // should always be defined--`assert` above catches this case
+    0,
+  )
+  const outputAmountRaw = formatUnits(
+    lastAmountOutParam?.value || '0', // should always be defined--`assert` above catches this case
+    0,
+  )
+  const transactionTypeInfo = getTransactionTypeInfo({
+    inputCurrencyInfo,
+    outputCurrencyInfo,
+    inputAmountRaw,
+    outputAmountRaw,
+  })
+  const onConfirmWithTransactionTypeInfo = (): Promise<void> => onConfirm(transactionTypeInfo)
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('swap.button.swap')}
+      headerIcon={
+        showSplitLogo ? (
+          <SplitLogo
+            chainId={activeChain || UniverseChainId.Mainnet}
+            inputCurrencyInfo={inputCurrencyInfo}
+            outputCurrencyInfo={outputCurrencyInfo}
+            size={iconSizes.icon40}
+          />
+        ) : undefined
+      }
+      title={
+        currency0?.symbol && currency1?.symbol
+          ? t('swap.request.title.full', {
+              inputCurrencySymbol: currency0?.symbol,
+              outputCurrencySymbol: currency1?.symbol,
+            })
+          : t('swap.request.title.short')
+      }
+      transactionGasFeeResult={transactionGasFeeResult}
+      onCancel={onCancel}
+      onConfirm={onConfirmWithTransactionTypeInfo}
+    >
+      {showSwapDetails && (
+        <>
+          <Separator />
+          <Flex
+            alignItems="flex-start"
+            flexDirection="column"
+            flexGrow={1}
+            gap="$spacing12"
+            justifyContent="flex-start"
+            px="$spacing8"
+            py="$spacing16"
+          >
+            <Flex flexDirection="row" justifyContent="space-between" width="100%">
+              <Flex flexDirection="column">
+                <Text color="$neutral1" variant="heading3">
+                  {formatCurrencyAmount({ value: inputCurrencyAmount, type: NumberType.TokenTx })} {currency0?.symbol}
+                </Text>
+                <Text color="$neutral2" variant="body3">
+                  {formatCurrencyAmount({ value: inputValue, type: NumberType.FiatTokenPrice })}
+                </Text>
+              </Flex>
+              <CurrencyLogo currencyInfo={inputCurrencyInfo} />
+            </Flex>
+            <ArrowDown color="$neutral3" size="$icon.24" />
+            <Flex flexDirection="row" justifyContent="space-between" width="100%">
+              <Flex flexDirection="column">
+                <Text color="$neutral1" variant="heading3">
+                  {formatCurrencyAmount({ value: outputCurrencyAmount, type: NumberType.TokenTx })} {currency1?.symbol}
+                </Text>
+                <Text color="$neutral2" variant="body3">
+                  {formatCurrencyAmount({ value: outputValue, type: NumberType.FiatTokenPrice })}
+                </Text>
+              </Flex>
+              <CurrencyLogo currencyInfo={outputCurrencyInfo} />
+            </Flex>
+          </Flex>
+        </>
+      )}
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/constants.ts b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/constants.ts
new file mode 100644
index 00000000000..9b5861bb32e
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/constants.ts
@@ -0,0 +1,13 @@
+import { BigNumber } from 'ethers'
+
+export const CONTRACT_BALANCE = BigNumber.from(2).pow(255)
+export const ETH_ADDRESS = '0x0000000000000000000000000000000000000000'
+export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
+export const MAX_UINT256 = BigNumber.from(2).pow(256).sub(1)
+export const MAX_UINT160 = BigNumber.from(2).pow(160).sub(1)
+
+export const SENDER_AS_RECIPIENT = '0x0000000000000000000000000000000000000001'
+export const ROUTER_AS_RECIPIENT = '0x0000000000000000000000000000000000000002'
+
+export const OPENSEA_CONDUIT_SPENDER_ID = 0
+export const SUDOSWAP_SPENDER_ID = 1
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/universalRouter.ts b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/universalRouter.ts
new file mode 100644
index 00000000000..d1a19f49f3b
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/universalRouter.ts
@@ -0,0 +1,110 @@
+import { SwapRouter } from '@uniswap/universal-router-sdk'
+import { ethers } from 'ethers'
+import {
+  ABI_DEFINITION,
+  CommandName,
+  CommandType,
+  Subparser,
+  UniversalRouterCall,
+  UniversalRouterCommand,
+} from 'src/app/features/dappRequests/types/UniversalRouterTypes'
+
+export function parseCalldata(calldata: string): UniversalRouterCall {
+  const iface = SwapRouter.INTERFACE
+  const txDescription = iface.parseTransaction({ data: calldata })
+  const { commands, inputs } = txDescription.args
+  // map hex string to bytes
+  const commandTypes: CommandType[] = []
+
+  // Start iterating from the third character to skip the "0x" prefix
+  for (let i = 2; i < commands.length; i += 2) {
+    // Get two characters from the hexString
+    const byte = commands.substr(i, 2)
+
+    // Convert it to a number and add it to the values array
+    commandTypes.push(parseInt(byte, 16) as CommandType)
+  }
+
+  const parsedCommands = commandTypes.map((commandType: CommandType, i: number): UniversalRouterCommand => {
+    const abiDef = ABI_DEFINITION[commandType]
+    const rawParams = ethers.utils.defaultAbiCoder.decode(
+      abiDef.map((command) => command.type),
+      inputs[i],
+    )
+    const params = rawParams.map((param, j: number) => {
+      const fragment = abiDef[j]
+      if (fragment && fragment.subparser === Subparser.V3PathExactIn) {
+        return {
+          name: fragment.name,
+          value: parseV3PathExactIn(param),
+        }
+      } else if (fragment && fragment.subparser === Subparser.V3PathExactOut) {
+        return {
+          name: fragment.name,
+          value: parseV3PathExactOut(param),
+        }
+      } else {
+        return {
+          name: fragment?.name || '',
+          value: param,
+        }
+      }
+    })
+    return {
+      commandName: CommandType[commandType] as CommandName,
+      commandType,
+      params,
+    }
+  })
+  return { commands: parsedCommands }
+}
+
+export type V3PathItem = {
+  readonly tokenIn: string
+  readonly tokenOut: string
+  readonly fee: number
+}
+
+export function parseV3PathExactIn(path: string): readonly V3PathItem[] {
+  const strippedPath = path.replace('0x', '')
+  let tokenIn = ethers.utils.getAddress(strippedPath.substr(0, 40))
+  let loc = 40
+  const res = []
+  while (loc < strippedPath.length) {
+    const feeAndTokenOut = strippedPath.substr(loc, 46)
+    const fee = parseInt(feeAndTokenOut.substr(0, 6), 16)
+    const tokenOut = ethers.utils.getAddress(feeAndTokenOut.substr(6, 40))
+
+    res.push({
+      tokenIn,
+      tokenOut,
+      fee,
+    })
+    tokenIn = tokenOut
+    loc += 46
+  }
+
+  return res
+}
+
+export function parseV3PathExactOut(path: string): readonly V3PathItem[] {
+  const strippedPath = path.replace('0x', '')
+  let tokenIn = ethers.utils.getAddress(strippedPath.substr(strippedPath.length - 40, 40))
+  let loc = strippedPath.length - 86 // 86 = (20 addr + 3 fee + 20 addr) * 2 (for hex characters)
+  const res = []
+  while (loc >= 0) {
+    const feeAndTokenOut = strippedPath.substr(loc, 46)
+    const tokenOut = ethers.utils.getAddress(feeAndTokenOut.substr(0, 40))
+    const fee = parseInt(feeAndTokenOut.substr(40, 6), 16)
+
+    res.push({
+      tokenIn,
+      tokenOut,
+      fee,
+    })
+    tokenIn = tokenOut
+    loc -= 46
+  }
+
+  return res
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/utils.ts b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/utils.ts
new file mode 100644
index 00000000000..639f1aba029
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/utils.ts
@@ -0,0 +1,70 @@
+import { BigNumber, BigNumberish } from 'ethers'
+import { formatUnits as formatUnitsEthers } from 'ethers/lib/utils'
+import {
+  CONTRACT_BALANCE,
+  MAX_UINT160,
+  MAX_UINT256,
+} from 'src/app/features/dappRequests/requestContent/EthSend/Swap/constants'
+import { CommandType, UniversalRouterCall } from 'src/app/features/dappRequests/types/UniversalRouterTypes'
+
+export type MinimalToken = {
+  address: string
+  symbol: string
+  decimals: number
+}
+export type TokenDetails = { [address: string]: MinimalToken }
+
+export type V3TokenInPath = {
+  tokenIn: string
+  tokenOut: string
+  fee: number
+}
+
+export function findErc20TokensToPrepare(urCall: UniversalRouterCall): string[] {
+  const tokenAddresses: string[] = []
+  urCall.commands.forEach((command) => {
+    switch (command.commandType) {
+      case CommandType.V2SwapExactIn:
+      case CommandType.V2SwapExactOut: {
+        const tokensInPath: string[] | undefined = command.params.find((param) => param.name === 'path')?.value
+        tokensInPath?.forEach((tokenAddr: string) => tokenAddresses.push(tokenAddr))
+        break
+      }
+      case CommandType.V3SwapExactIn:
+      case CommandType.V3SwapExactOut: {
+        const pools: V3TokenInPath[] | undefined = command.params.find((param) => param.name === 'path')?.value
+        pools?.forEach(({ tokenIn, tokenOut }) => {
+          tokenAddresses.push(tokenIn)
+          tokenAddresses.push(tokenOut)
+        })
+        break
+      }
+      case CommandType.PayPortion:
+      case CommandType.SWEEP:
+      case CommandType.TRANSFER: {
+        const tokenAddr = command.params.find((param) => param.name === 'token')?.value
+        if (tokenAddr) {
+          tokenAddresses.push(tokenAddr)
+        }
+        break
+      }
+    }
+  })
+
+  return Array.from(new Set(tokenAddresses))
+}
+
+// Like ethers.formatUnits except it parses specific constants
+export function formatUnits(amount: BigNumberish, units: number): string {
+  if (BigNumber.from(CONTRACT_BALANCE).eq(amount)) {
+    return 'CONTRACT_BALANCE'
+  }
+  if (BigNumber.from(MAX_UINT256).eq(amount)) {
+    return 'MAX_UINT256'
+  }
+  if (BigNumber.from(MAX_UINT160).eq(amount)) {
+    return 'MAX_UINT160'
+  }
+
+  return formatUnitsEthers(amount, units)
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/NetworkFooter.test.tsx b/apps/extension/src/app/features/dappRequests/requestContent/NetworkFooter.test.tsx
new file mode 100644
index 00000000000..582a57f48e7
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/NetworkFooter.test.tsx
@@ -0,0 +1,11 @@
+import { NetworksFooter } from 'src/app/features/dappRequests/requestContent/NetworksFooter'
+import { cleanup, render } from 'src/test/test-utils'
+
+describe(NetworksFooter, () => {
+  it('renders without error', async () => {
+    const tree = render(<NetworksFooter />)
+
+    expect(tree).toMatchSnapshot()
+    cleanup()
+  })
+})
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/NetworksFooter.tsx b/apps/extension/src/app/features/dappRequests/requestContent/NetworksFooter.tsx
new file mode 100644
index 00000000000..70130bc007f
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/NetworksFooter.tsx
@@ -0,0 +1,20 @@
+import { useTranslation } from 'react-i18next'
+import { Flex, Text } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { NetworksInSeries } from 'uniswap/src/components/network/NetworkFilter'
+import { WALLET_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
+
+export function NetworksFooter(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Flex fill row alignItems="center" borderTopColor="$background" borderTopWidth="$spacing1" px="$spacing8">
+      <Flex grow row alignItems="center" gap="$spacing4" justifyContent="space-between">
+        <Text color="$neutral2" variant="body4">
+          {t('extension.connection.networks')}
+        </Text>
+        <NetworksInSeries networkIconSize={iconSizes.icon16} networks={WALLET_SUPPORTED_CHAIN_IDS} />
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx
new file mode 100644
index 00000000000..5a59a2f7250
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx
@@ -0,0 +1,124 @@
+import { ethers } from 'ethers'
+import { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { SignMessageRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { Button, Flex, Text, Tooltip } from 'ui/src'
+import { AlertTriangle, Code, StickyNoteTextSquare } from 'ui/src/components/icons'
+import { containsNonPrintableChars } from 'utilities/src/primitives/string'
+
+enum ViewEncoding {
+  UTF8,
+  HEX,
+}
+interface PersonalSignRequestProps {
+  dappRequest: SignMessageRequest
+}
+
+export function PersonalSignRequestContent({ dappRequest }: PersonalSignRequestProps): JSX.Element | null {
+  const { t } = useTranslation()
+
+  const [viewEncoding, setViewEncoding] = useState(ViewEncoding.UTF8)
+  const toggleViewEncoding = (): void =>
+    setViewEncoding(viewEncoding === ViewEncoding.UTF8 ? ViewEncoding.HEX : ViewEncoding.UTF8)
+
+  const hexMessage = dappRequest.messageHex
+  const utf8Message = ethers.utils.toUtf8String(hexMessage) // Already validated in schema
+
+  const containsUnrenderableCharacters = containsNonPrintableChars(utf8Message)
+
+  const [isScrollable, setIsScrollable] = useState(false)
+  const messageRef = useRef<HTMLElement>(null)
+  useEffect(() => {
+    const checkScroll = (): void => {
+      if (!messageRef.current) {
+        return
+      }
+      setIsScrollable(messageRef.current.scrollHeight > messageRef.current.clientHeight)
+    }
+
+    checkScroll()
+    window.addEventListener('resize', checkScroll)
+
+    return () => window.removeEventListener('resize', checkScroll)
+  }, [setIsScrollable, viewEncoding])
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('common.button.sign')}
+      title={t('dapp.request.signature.header')}
+    >
+      <Flex
+        ref={messageRef}
+        $platform-web={{ overflowY: 'auto' }}
+        alignItems="flex-start"
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        flexDirection="row"
+        justifyContent="space-between"
+        maxHeight={200}
+        minHeight="$spacing48"
+        p="$spacing16"
+        position="relative"
+      >
+        <Text color="$neutral2" maxWidth="calc(100% - 36px)" variant="body4">
+          {viewEncoding === ViewEncoding.UTF8 ? utf8Message : hexMessage}
+        </Text>
+      </Flex>
+      <Tooltip allowFlip stayInFrame delay={100} placement="left">
+        <Flex
+          alignSelf="flex-end"
+          bottom="$spacing16"
+          position="absolute"
+          right={isScrollable ? '$spacing24' : '$spacing12'}
+        >
+          <Tooltip.Trigger>
+            <Button
+              borderColor="$surface3"
+              borderRadius="$rounded4"
+              icon={
+                viewEncoding === ViewEncoding.UTF8 ? (
+                  <Code color="$neutral2" size="$icon.12" />
+                ) : (
+                  <StickyNoteTextSquare color="$neutral2" size="$icon.12" />
+                )
+              }
+              p="$spacing4"
+              position="relative"
+              theme="secondary"
+              onPress={toggleViewEncoding}
+            />
+          </Tooltip.Trigger>
+        </Flex>
+        <Tooltip.Content>
+          <Tooltip.Arrow />
+          <Text variant="body4">
+            {viewEncoding === ViewEncoding.UTF8
+              ? t('dapp.request.signature.toggleDataView.raw')
+              : t('dapp.request.signature.toggleDataView.readable')}
+          </Text>
+        </Tooltip.Content>
+      </Tooltip>
+      {containsUnrenderableCharacters && (
+        <Flex
+          alignItems="center"
+          backgroundColor="$surface2"
+          borderColor="$surface3"
+          borderRadius="$rounded16"
+          flexDirection="row"
+          gap="$spacing8"
+          justifyContent="flex-start"
+          p="$spacing12"
+        >
+          <AlertTriangle color="$neutral2" minWidth="$spacing20" size="$icon.20" />
+          <Text color="$neutral2" variant="body4">
+            {t('dapp.request.signature.containsUnrenderableCharacters')}
+          </Text>
+        </Flex>
+      )}
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/DomainContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/DomainContent.tsx
new file mode 100644
index 00000000000..4ca76c9f103
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/DomainContent.tsx
@@ -0,0 +1,69 @@
+import { MaybeExplorerLinkedAddress } from 'src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress'
+import { EIP712DomainType } from 'src/app/features/dappRequests/types/EIP712Types'
+import { Flex, Text } from 'ui/src'
+import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+
+export const DomainContent = ({
+  chainId: domainChainId,
+  name,
+  version,
+  verifyingContract,
+  salt,
+}: EIP712DomainType): JSX.Element => {
+  const chainId = toSupportedChainId(domainChainId)
+  const verifyingContractLink =
+    chainId && verifyingContract ? getExplorerLink(chainId, verifyingContract, ExplorerDataType.ADDRESS) : undefined
+  return (
+    <>
+      {name && (
+        <Flex flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" variant="body4">
+            name
+          </Text>
+          <Text color="$neutral1" variant="body4">
+            {name}
+          </Text>
+        </Flex>
+      )}
+      {Boolean(chainId) && (
+        <Flex flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" variant="body4">
+            chainId
+          </Text>
+          <Text color="$neutral1" variant="body4">
+            {chainId}
+          </Text>
+        </Flex>
+      )}
+      {verifyingContract && (
+        <Flex flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" variant="body4">
+            verifying contract
+          </Text>
+          <MaybeExplorerLinkedAddress address={verifyingContract} link={verifyingContractLink} />
+        </Flex>
+      )}
+      {version && (
+        <Flex flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" fontWeight="bold" variant="body4">
+            version
+          </Text>
+          <Text color="$neutral1" variant="body4">
+            {version}
+          </Text>
+        </Flex>
+      )}
+      {salt && (
+        <Flex flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" fontWeight="bold" variant="body4">
+            salt
+          </Text>
+          <Text $platform-web={{ overflowWrap: 'anywhere' }} color="$neutral1" variant="body4">
+            {salt}
+          </Text>
+        </Flex>
+      )}
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress.tsx b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress.tsx
new file mode 100644
index 00000000000..5345bb1544c
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress.tsx
@@ -0,0 +1,35 @@
+import { Anchor, Text } from 'ui/src'
+import { ExternalLink } from 'ui/src/components/icons'
+import { shortenAddress } from 'utilities/src/addresses'
+
+interface MaybeExplorerLinkedAddressProps {
+  address: string
+  link: Maybe<string>
+}
+export const MaybeExplorerLinkedAddress = ({ address, link }: MaybeExplorerLinkedAddressProps): JSX.Element => {
+  if (!link) {
+    return (
+      <Text color="$neutral1" variant="body4">
+        {shortenAddress(address)}
+      </Text>
+    )
+  }
+  return (
+    <Anchor
+      alignItems="center"
+      display="flex"
+      flexDirection="row"
+      gap="$spacing4"
+      href={link}
+      lineHeight={16}
+      rel="noopener noreferrer"
+      target="_blank"
+      textDecorationLine="none"
+    >
+      <Text color="$neutral1" variant="body4">
+        {shortenAddress(address)}
+      </Text>
+      <ExternalLink color="$neutral2" size="$icon.16" />
+    </Anchor>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/Permit2/Permit2RequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/Permit2/Permit2RequestContent.tsx
new file mode 100644
index 00000000000..8b46c046929
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/Permit2/Permit2RequestContent.tsx
@@ -0,0 +1,104 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { DomainContent } from 'src/app/features/dappRequests/requestContent/SignTypeData/DomainContent'
+import { MaybeExplorerLinkedAddress } from 'src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress'
+import { SignTypedDataRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { Flex, Text, TouchableArea } from 'ui/src'
+import { RotatableChevron } from 'ui/src/components/icons'
+import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+
+interface Permit2RequestProps {
+  dappRequest: SignTypedDataRequest
+}
+
+export function Permit2RequestContent({ dappRequest }: Permit2RequestProps): JSX.Element | null {
+  const { t } = useTranslation()
+
+  const parsedTypedData = JSON.parse(dappRequest.typedData)
+  const { name, chainId: domainChainId, verifyingContract } = parsedTypedData?.domain || {}
+  const chainId = toSupportedChainId(domainChainId)
+
+  const { token: address, amount, expiration, nonce } = parsedTypedData?.message?.details || {}
+  const { spender, sigDeadline } = parsedTypedData?.message || {}
+  const [open, setOpen] = useState(false)
+  const toggleOpen = (): void => setOpen(!open)
+
+  const spenderLink = chainId ? getExplorerLink(chainId, spender, ExplorerDataType.ADDRESS) : undefined
+  const tokenLink = chainId ? getExplorerLink(chainId, address, ExplorerDataType.TOKEN) : undefined
+
+  return (
+    <DappRequestContent showNetworkCost confirmText={t('common.button.sign')} title={t('dapp.request.permit2.header')}>
+      <Flex
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        flexDirection="column"
+        gap="$spacing12"
+        p="$spacing16"
+        position="relative"
+        width="100%"
+      >
+        <Flex row alignItems="center">
+          <Text color="$neutral2" variant="body4">
+            {t('dapp.request.permit2.description')}
+          </Text>
+          <TouchableArea onPress={toggleOpen}>
+            <RotatableChevron color="$neutral2" direction={open ? 'up' : 'down'} height={16} width={16} />
+          </TouchableArea>
+        </Flex>
+        {open && (
+          <>
+            <DomainContent chainId={domainChainId} name={name} verifyingContract={verifyingContract} />
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                token
+              </Text>
+              <MaybeExplorerLinkedAddress address={address} link={tokenLink} />
+            </Flex>
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                amount
+              </Text>
+              <Text $platform-web={{ overflowWrap: 'anywhere' }} color="$neutral1" variant="body4">
+                {amount}
+              </Text>
+            </Flex>
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                expiration
+              </Text>
+              <Text color="$neutral1" variant="body4">
+                {expiration}
+              </Text>
+            </Flex>
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                nonce
+              </Text>
+              <Text color="$neutral1" variant="body4">
+                {nonce}
+              </Text>
+            </Flex>
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                spender
+              </Text>
+              <MaybeExplorerLinkedAddress address={spender} link={spenderLink} />
+            </Flex>
+            <Flex flexDirection="row" gap="$spacing8">
+              <Text color="$neutral2" variant="body4">
+                signature deadline
+              </Text>
+              <Text color="$neutral1" variant="body4">
+                {sigDeadline}
+              </Text>
+            </Flex>
+          </>
+        )}
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/SignTypedDataRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/SignTypedDataRequestContent.tsx
new file mode 100644
index 00000000000..3dcd901d15b
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/SignTypedDataRequestContent.tsx
@@ -0,0 +1,115 @@
+import { useTranslation } from 'react-i18next'
+import { DappRequestContent } from 'src/app/features/dappRequests/DappRequestContent'
+import { DomainContent } from 'src/app/features/dappRequests/requestContent/SignTypeData/DomainContent'
+import { MaybeExplorerLinkedAddress } from 'src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress'
+import { Permit2RequestContent } from 'src/app/features/dappRequests/requestContent/SignTypeData/Permit2/Permit2RequestContent'
+import { SignTypedDataRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { EIP712Message, isEIP712TypedData } from 'src/app/features/dappRequests/types/EIP712Types'
+import { isPermit2 } from 'src/app/features/dappRequests/types/Permit2Types'
+import { Flex, Text } from 'ui/src'
+import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { isAddress } from 'utilities/src/addresses'
+import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+
+interface SignTypedDataRequestProps {
+  dappRequest: SignTypedDataRequest
+}
+
+export function SignTypedDataRequestContent({ dappRequest }: SignTypedDataRequestProps): JSX.Element | null {
+  const { t } = useTranslation()
+
+  const parsedTypedData = JSON.parse(dappRequest.typedData)
+
+  if (!isEIP712TypedData(parsedTypedData)) {
+    return (
+      <DappRequestContent
+        showNetworkCost
+        confirmText={t('common.button.sign')}
+        title={t('dapp.request.signature.header')}
+      >
+        <Flex gap="$spacing12" p="$spacing16">
+          <Text>{t('dapp.request.signature.error.712-spec-compliance')}</Text>
+          <Flex
+            $platform-web={{ overflowY: 'auto' }}
+            backgroundColor="$surface2"
+            borderColor="$surface3"
+            borderRadius="$rounded16"
+            borderWidth={1}
+            flexDirection="column"
+            gap="$spacing4"
+            maxHeight={200}
+            p="$spacing12"
+            position="relative"
+          >
+            {dappRequest.typedData}
+          </Flex>
+        </Flex>
+      </DappRequestContent>
+    )
+  }
+
+  if (isPermit2(parsedTypedData)) {
+    return <Permit2RequestContent dappRequest={dappRequest} />
+  }
+
+  const { name, version, chainId: domainChainId, verifyingContract, salt } = parsedTypedData?.domain || {}
+
+  // todo(EXT-883): remove this when we start rejecting unsupported chain signTypedData requests
+  const chainId = toSupportedChainId(domainChainId)
+  const renderMessageContent = (
+    message: EIP712Message | EIP712Message[keyof EIP712Message],
+    i = 1,
+  ): Maybe<JSX.Element | JSX.Element[]> => {
+    if (typeof message === 'string' && isAddress(message) && chainId) {
+      const href = getExplorerLink(chainId, message, ExplorerDataType.ADDRESS)
+      return <MaybeExplorerLinkedAddress address={message} link={href} />
+    }
+    if (typeof message === 'string' || typeof message === 'number' || typeof message === 'boolean') {
+      return (
+        <Text $platform-web={{ overflowWrap: 'anywhere' }} color="$neutral1" variant="body4">
+          {message.toString()}
+        </Text>
+      )
+    } else if (typeof message === 'object') {
+      return Object.entries(message).map(([key, value], index) => (
+        <Flex key={`${key}-${index}`} flexDirection="row" gap="$spacing8">
+          <Text color="$neutral2" flexShrink={0} fontWeight="bold" variant="body4">
+            {key}
+          </Text>
+          <Flex flexBasis="0%" flexDirection="column" flexGrow={1} flexWrap="wrap" gap="$spacing4">
+            {renderMessageContent(value, i + 1)}
+          </Flex>
+        </Flex>
+      ))
+    }
+  }
+
+  return (
+    <DappRequestContent
+      showNetworkCost
+      confirmText={t('common.button.sign')}
+      title={t('dapp.request.signature.header')}
+    >
+      <Flex
+        $platform-web={{ overflowY: 'auto' }}
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        flexDirection="column"
+        gap="$spacing4"
+        maxHeight={200}
+        p="$spacing16"
+      >
+        <DomainContent
+          chainId={domainChainId}
+          name={name}
+          salt={salt}
+          verifyingContract={verifyingContract}
+          version={version}
+        />
+        {renderMessageContent(parsedTypedData.message)}
+      </Flex>
+    </DappRequestContent>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx
new file mode 100644
index 00000000000..96088ec04fa
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx
@@ -0,0 +1,89 @@
+import { useTranslation } from 'react-i18next'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { DappRequestStoreItem } from 'src/app/features/dappRequests/slice'
+import { SendTransactionRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { Flex, Text } from 'ui/src'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { NumberType } from 'utilities/src/format/types'
+import { useTransactionGasFee, useUSDValue } from 'wallet/src/features/gas/hooks'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { useActiveAccountAddressWithThrow, useDisplayName } from 'wallet/src/features/wallet/hooks'
+
+export const WrapTransactionDetails = ({
+  request,
+  dappUrl,
+}: {
+  request: DappRequestStoreItem
+  dappUrl: string
+}): JSX.Element => {
+  const { t } = useTranslation()
+  const { convertFiatAmountFormatted } = useLocalizationContext()
+  const activeAddress = useActiveAccountAddressWithThrow()
+  const displayName = useDisplayName(activeAddress)
+
+  const sendTransactionRequest = request.dappRequest as SendTransactionRequest
+
+  const chainId = useDappLastChainId(dappUrl) || UniverseChainId.Mainnet
+
+  const networkFee = useTransactionGasFee({
+    chainId,
+    ...sendTransactionRequest.transaction,
+  }).value
+  const gasFeeUSD = useUSDValue(chainId, networkFee)
+
+  return (
+    <Flex>
+      <Flex
+        backgroundColor="$surface2"
+        borderTopLeftRadius="$rounded16"
+        borderTopRightRadius="$rounded16"
+        gap="$spacing16"
+        m="$none"
+        px="$spacing16"
+        py="$spacing12"
+      >
+        {/* TODO: MOB-2529: fix string translation */}
+        <Flex row justifyContent="space-between">
+          <Text color="$neutral2" variant="body2">
+            {'<wrapType>'}
+          </Text>
+          <Flex row gap="$spacing4">
+            <Text textAlign="right" variant="subheading2">
+              {/* {paying} */}
+            </Text>
+          </Flex>
+        </Flex>
+        {displayName && (
+          <Flex row justifyContent="space-between">
+            <Text color="$neutral2" variant="body2">
+              {t('dapp.request.approve.label')}
+            </Text>
+            <Flex row gap="$spacing4">
+              <Text textAlign="right" variant="subheading2">
+                {displayName.name}
+              </Text>
+            </Flex>
+          </Flex>
+        )}
+      </Flex>
+      <Flex backgroundColor="$surface2" borderBottomLeftRadius="$rounded16" borderBottomRightRadius="$rounded16">
+        <Flex
+          row
+          borderTopColor="$background"
+          borderTopWidth="$spacing1"
+          justifyContent="space-between"
+          px="$spacing16"
+          py="$spacing12"
+          width="100%"
+        >
+          <Text color="$neutral2" variant="body2">
+            {t('transaction.networkCost.label')}
+          </Text>
+          <Text color="$neutral2" textAlign="right" variant="body2">
+            {convertFiatAmountFormatted(gasFeeUSD, NumberType.FiatGasPrice)}
+          </Text>
+        </Flex>
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/__snapshots__/NetworkFooter.test.tsx.snap b/apps/extension/src/app/features/dappRequests/requestContent/__snapshots__/NetworkFooter.test.tsx.snap
new file mode 100644
index 00000000000..38e7492b0a6
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/requestContent/__snapshots__/NetworkFooter.test.tsx.snap
@@ -0,0 +1,607 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NetworksFooter renders without error 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <span
+        class="t_light is_inversed _dsp_contents"
+      >
+        <span
+          class=" t_light _dsp_contents is_Theme"
+        >
+          <div
+            class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _alignItems-center _borderTopColor-1633501478 _borderTopWidth-1481558369 _pr-1481558276 _pl-1481558276 _borderTopStyle-solid"
+          >
+            <div
+              class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _flexGrow-1 _alignItems-center _gap-1481558307 _justifyContent-441309761"
+            >
+              <span
+                class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400"
+                data-disable-theme="true"
+              >
+                Networks
+              </span>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pl-8px"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                    data-testid="network-logo"
+                    style="border-radius: 6px; overflow: hidden;"
+                  >
+                    <span
+                      class="_dsp_contents"
+                    >
+                      <div
+                        class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                        style="width: 16px; height: 16px;"
+                      >
+                        <div
+                          class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                        />
+                      </div>
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </span>
+      </span>
+    </div>
+  </body>,
+  "container": <div>
+    <span
+      class="t_light is_inversed _dsp_contents"
+    >
+      <span
+        class=" t_light _dsp_contents is_Theme"
+      >
+        <div
+          class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _alignItems-center _borderTopColor-1633501478 _borderTopWidth-1481558369 _pr-1481558276 _pl-1481558276 _borderTopStyle-solid"
+        >
+          <div
+            class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _flexGrow-1 _alignItems-center _gap-1481558307 _justifyContent-441309761"
+          >
+            <span
+              class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400"
+              data-disable-theme="true"
+            >
+              Networks
+            </span>
+            <div
+              class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pl-8px"
+            >
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                  data-testid="network-logo"
+                  style="border-radius: 6px; overflow: hidden;"
+                >
+                  <span
+                    class="_dsp_contents"
+                  >
+                    <div
+                      class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                      style="width: 16px; height: 16px;"
+                    >
+                      <div
+                        class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                      />
+                    </div>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </span>
+    </span>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "store": {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
+  "unmount": [Function],
+}
+`;
diff --git a/apps/extension/src/app/features/dappRequests/saga.ts b/apps/extension/src/app/features/dappRequests/saga.ts
new file mode 100644
index 00000000000..540f9975d45
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/saga.ts
@@ -0,0 +1,398 @@
+import { Provider, TransactionResponse } from '@ethersproject/providers'
+import { providerErrors, rpcErrors, serializeError } from '@metamask/rpc-errors'
+import { createAction } from '@reduxjs/toolkit'
+import { createSearchParams } from 'react-router-dom'
+import { changeChain } from 'src/app/features/dapp/changeChain'
+import { DappInfo, dappStore } from 'src/app/features/dapp/store'
+import { getActiveConnectedAccount } from 'src/app/features/dapp/utils'
+import { DappRequestStoreItem, SenderTabInfo, dappRequestActions } from 'src/app/features/dappRequests/slice'
+import {
+  BaseSendTransactionRequest,
+  ChangeChainRequest,
+  DappRequestType,
+  DappResponseType,
+  ErrorResponse,
+  SendTransactionResponse,
+  SignMessageRequest,
+  SignMessageResponse,
+  SignTypedDataRequest,
+  SignTypedDataResponse,
+  UniswapOpenSidebarRequest,
+  UniswapOpenSidebarResponse,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { HexadecimalNumberSchema } from 'src/app/features/dappRequests/types/utilityTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { isWalletUnlocked } from 'src/app/hooks/useIsWalletUnlocked'
+import { AppRoutes, HomeQueryParams } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { dappResponseMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { appSelect } from 'src/store/store'
+import { call, put, take } from 'typed-redux-saga'
+import { hexadecimalStringToInt, toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { logger } from 'utilities/src/logger/logger'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { SendTransactionParams, sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
+import { TransactionType, TransactionTypeInfo } from 'wallet/src/features/transactions/types'
+import { getProvider, getSignerManager } from 'wallet/src/features/wallet/context'
+import { selectActiveAccount } from 'wallet/src/features/wallet/selectors'
+import { signMessage, signTypedDataMessage } from 'wallet/src/features/wallet/signing/signing'
+
+export interface DappRequestRejectParams {
+  errorResponse: ErrorResponse
+  senderTabInfo: SenderTabInfo
+}
+
+export type OptionalTransactionTypeInfo = {
+  transactionTypeInfo?: TransactionTypeInfo
+}
+export type DappRequestNoDappInfo = Omit<DappRequestStoreItem, 'dappInfo'> & OptionalTransactionTypeInfo
+export type DappRequestWithDappInfo = Required<DappRequestStoreItem> & OptionalTransactionTypeInfo
+export function isDappRequestWithDappInfo(
+  request: DappRequestNoDappInfo | DappRequestWithDappInfo,
+): request is DappRequestWithDappInfo {
+  return 'dappInfo' in request && Boolean(request.dappInfo)
+}
+
+export const addRequest = createAction<DappRequestNoDappInfo>(`dappRequest/handleRequest`)
+
+/** This is for requests where the dapp info is not passed along as part of the request because it
+ * does not exist yet (i.e. GetAccountRequest). In these cases the dappInfo will need to be saved.
+ */
+export const confirmRequestNoDappInfo = createAction<DappRequestNoDappInfo>('dappRequest/confirmSaveConnectionRequest')
+export const confirmRequest = createAction<DappRequestWithDappInfo>(`dappRequest/confirmRequest`)
+export const rejectRequest = createAction<DappRequestRejectParams>(`dappRequest/rejectRequest`)
+export const rejectAllRequests = createAction('dappRequest/rejectAllRequests')
+
+export function* dappRequestWatcher() {
+  while (true) {
+    const { payload, type } = yield* take(addRequest)
+
+    if (type === addRequest.type) {
+      yield* call(handleRequest, payload)
+    }
+  }
+}
+
+const ACCOUNT_REQUEST_TYPES = [DappRequestType.RequestAccount, DappRequestType.RequestPermissions]
+const ACCOUNT_INFO_TYPES = [DappRequestType.GetChainId, DappRequestType.GetAccount]
+
+/**
+ * Handles a request from a dApp.
+ * If it is account-specific, get the active account and add it to the request
+ * @param requestParams DappRequest and senderTabInfo (required for sending response)
+ * i think remove all the checks from here and push to later.
+ */
+// eslint-disable-next-line complexity
+export function* handleRequest(requestParams: DappRequestNoDappInfo) {
+  if (requestParams.dappRequest.type === DappRequestType.UniswapOpenSidebar) {
+    // We can auto-confirm these requests since they are only for navigating to a certain tab
+    // At this point the sidebar is already open
+    yield* put(confirmRequestNoDappInfo(requestParams))
+    return
+  }
+  const activeAccount = yield* appSelect(selectActiveAccount)
+  if (!activeAccount) {
+    const response: DappRequestRejectParams = {
+      errorResponse: {
+        type: DappResponseType.ErrorResponse,
+        error: serializeError(providerErrors.unauthorized()),
+        requestId: requestParams.dappRequest.requestId,
+      },
+      senderTabInfo: requestParams.senderTabInfo,
+    }
+    rejectRequest(response)
+    return
+  }
+
+  const dappUrl = extractBaseUrl(requestParams.senderTabInfo.url)
+  const dappInfo = yield* call(dappStore.getDappInfo, dappUrl)
+
+  const isConnectedToDapp = dappInfo && dappInfo.connectedAccounts?.length > 0
+
+  if (!isConnectedToDapp) {
+    if (requestParams.dappRequest.type === DappRequestType.GetChainId) {
+      // Allows for eth_chainId for unconnected dapps to advance connection steps
+      yield* put(confirmRequestNoDappInfo(requestParams))
+    } else if (!ACCOUNT_REQUEST_TYPES.includes(requestParams.dappRequest.type)) {
+      // Otherwise, only allows for accounts requests to be handled until connection is confirmed
+      // TODO(EXT-359): show a warning when the active account is different.
+      const response: DappRequestRejectParams = {
+        errorResponse: {
+          type: DappResponseType.ErrorResponse,
+          error: serializeError(providerErrors.unauthorized()),
+          requestId: requestParams.dappRequest.requestId,
+        },
+        senderTabInfo: requestParams.senderTabInfo,
+      }
+      yield* put(rejectRequest(response))
+      return
+    }
+  }
+
+  // Automatically confirm change chain requests if supported
+  if (requestParams.dappRequest.type === DappRequestType.ChangeChain) {
+    const chainId = toSupportedChainId(hexadecimalStringToInt(requestParams.dappRequest.chainId))
+    if (chainId) {
+      if (dappInfo) {
+        yield* put(confirmRequest({ ...requestParams, dappInfo }))
+      } else {
+        yield* put(confirmRequestNoDappInfo(requestParams))
+      }
+      if (isWalletUnlocked) {
+        yield* put(
+          pushNotification({
+            type: AppNotificationType.NetworkChanged,
+            chainId,
+          }),
+        )
+      }
+    } else {
+      const response: DappRequestRejectParams = {
+        errorResponse: {
+          type: DappResponseType.ErrorResponse,
+          error: serializeError(
+            providerErrors.custom({
+              code: 4902,
+              message: 'Uniswap Wallet does not support switching to this chain.',
+            }),
+          ),
+          requestId: requestParams.dappRequest.requestId,
+        },
+        senderTabInfo: requestParams.senderTabInfo,
+      }
+      if (isWalletUnlocked) {
+        yield* put(
+          pushNotification({
+            type: AppNotificationType.NotSupportedNetwork,
+          }),
+        )
+      }
+      yield* put(rejectRequest(response))
+      return
+    }
+  }
+
+  if (requestParams.dappRequest.type === DappRequestType.SignTypedData) {
+    try {
+      const typedData = requestParams.dappRequest.typedData
+      const parsedChainId = JSON.parse(typedData)?.domain?.chainId
+      const formattedChainId = HexadecimalNumberSchema.parse(parsedChainId)
+      const chainId = toSupportedChainId(formattedChainId)
+
+      if (dappInfo?.lastChainId !== chainId) {
+        throw new Error('Chain ID on message does not match the chain ID set on the extension.')
+      }
+    } catch (error) {
+      logger.error(error, { tags: { file: 'saga.ts', function: 'handleRequest' } })
+      const response: DappRequestRejectParams = {
+        errorResponse: {
+          type: DappResponseType.ErrorResponse,
+          error: serializeError(
+            providerErrors.custom({
+              code: 4902,
+              message:
+                error instanceof Error
+                  ? error.message
+                  : 'Chain ID on message from dApp is missing or does not match the chain ID set on the extension.',
+            }),
+          ),
+          requestId: requestParams.dappRequest.requestId,
+        },
+        senderTabInfo: requestParams.senderTabInfo,
+      }
+      yield* put(rejectRequest(response))
+    }
+  }
+
+  const shouldAutoConfirmRequest =
+    dappInfo &&
+    isConnectedToDapp &&
+    (ACCOUNT_REQUEST_TYPES.includes(requestParams.dappRequest.type) ||
+      ACCOUNT_INFO_TYPES.includes(requestParams.dappRequest.type) ||
+      requestParams.dappRequest.type === DappRequestType.RevokePermissions)
+
+  if (shouldAutoConfirmRequest) {
+    yield* put(confirmRequest({ ...requestParams, dappInfo }))
+  } else {
+    yield* put(
+      dappRequestActions.add({
+        ...requestParams,
+        dappInfo,
+      }),
+    )
+  }
+}
+
+export function* handleSendTransaction(
+  request: BaseSendTransactionRequest,
+  { id }: SenderTabInfo,
+  dappInfo: DappInfo,
+  transactionTypeInfo?: TransactionTypeInfo,
+) {
+  const transactionRequest = request.transaction
+  const { lastChainId, activeConnectedAddress, connectedAccounts } = dappInfo
+  const account = getActiveConnectedAccount(connectedAccounts, activeConnectedAddress)
+  const chainId = toSupportedChainId(request.transaction.chainId)
+  if (request.transaction.chainId && chainId) {
+    if (lastChainId !== chainId) {
+      throw new Error(`Mismatched chainId - expected active chain: ${lastChainId}, received: ${chainId}`)
+    }
+  }
+
+  const provider = yield* call(getProvider, lastChainId)
+
+  const sendTransactionParams: SendTransactionParams = {
+    chainId: lastChainId,
+    account,
+    options: { request: transactionRequest },
+    typeInfo: transactionTypeInfo ?? { type: TransactionType.Unknown },
+  }
+
+  const { transactionResponse } = yield* call(sendTransaction, sendTransactionParams)
+
+  // Trigger a pending transaction notification after we send the transaction to chain
+  yield* put(
+    pushNotification({
+      type: AppNotificationType.TransactionPending,
+      chainId: lastChainId,
+    }),
+  )
+
+  // do not block on this function call since it should happen in parallel
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  onTransactionSentToChain(transactionResponse, provider)
+
+  const response: SendTransactionResponse = {
+    type: DappResponseType.SendTransactionResponse,
+    transactionResponse,
+    requestId: request.requestId,
+  }
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+// TODO(EXT-976): Fix chrome notifications to work when the sidepanel is asleep.
+async function onTransactionSentToChain(transactionResponse: TransactionResponse, provider: Provider): Promise<void> {
+  // Listen for transaction receipt
+  const receipt = await provider.waitForTransaction(transactionResponse.hash, 1)
+
+  if (receipt.status === 100) {
+    // Send chrome notification that transaction was successful
+    chrome.notifications.create({
+      type: 'basic',
+      iconUrl: '',
+      title: 'Transaction successful',
+      message: `Transaction ${transactionResponse.hash} was successful`,
+    })
+  }
+}
+
+export function* changeChainSaga(request: ChangeChainRequest, { id, url }: SenderTabInfo) {
+  const updatedChainId = toSupportedChainId(hexadecimalStringToInt(request.chainId))
+  const provider = updatedChainId ? yield* call(getProvider, updatedChainId) : undefined
+  const dappUrl = extractBaseUrl(url)
+  const activeAccount = yield* appSelect(selectActiveAccount)
+  const response = changeChain({
+    provider,
+    dappUrl,
+    updatedChainId,
+    requestId: request.requestId,
+    activeConnectedAddress: activeAccount?.address,
+  })
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+export function* handleSignMessage(request: SignMessageRequest, { id }: SenderTabInfo, dappInfo: DappInfo) {
+  const { requestId, messageHex } = request
+  const { connectedAccounts, activeConnectedAddress } = dappInfo
+  const currentAccount = getActiveConnectedAccount(connectedAccounts, activeConnectedAddress)
+
+  const signerManager = yield* call(getSignerManager)
+  const provider = yield* call(getProvider, dappInfo.lastChainId)
+
+  const signature = yield* call(signMessage, messageHex, currentAccount, signerManager, provider)
+
+  const response: SignMessageResponse = {
+    type: DappResponseType.SignMessageResponse,
+    requestId,
+    signature,
+  }
+
+  yield* call(dappResponseMessageChannel.sendMessageToTab, id, response)
+}
+
+export function* handleSignTypedData(
+  dappRequest: SignTypedDataRequest,
+  senderTabInfo: SenderTabInfo,
+  dappInfo: DappInfo,
+) {
+  try {
+    const requestId = dappRequest.requestId
+    const typedData = dappRequest.typedData
+
+    // This should already be handled when request is received, but extra check here
+    const parsedChainId = JSON.parse(typedData)?.domain?.chainId
+    const formattedChainId = HexadecimalNumberSchema.parse(parsedChainId)
+    const chainId = toSupportedChainId(formattedChainId)
+    if (!chainId) {
+      throw new Error(!parsedChainId ? 'Missing domain chainId' : 'Unsupported chainId')
+    }
+
+    const { lastChainId, connectedAccounts, activeConnectedAddress } = dappInfo
+
+    if (lastChainId !== chainId) {
+      throw new Error(`Mismatched chainId - expected active chain: ${lastChainId}, received: ${chainId}`)
+    }
+
+    const currentAccount = getActiveConnectedAccount(connectedAccounts, activeConnectedAddress)
+    const signerManager = yield* call(getSignerManager)
+    const provider = yield* call(getProvider, lastChainId)
+
+    const signature = yield* call(signTypedDataMessage, typedData, currentAccount, signerManager, provider)
+
+    const response: SignTypedDataResponse = {
+      type: DappResponseType.SignTypedDataResponse,
+      requestId,
+      signature,
+    }
+
+    yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, response)
+  } catch (error) {
+    if (error instanceof Error) {
+      const errorParams: DappRequestRejectParams = {
+        errorResponse: {
+          type: DappResponseType.ErrorResponse,
+          error: serializeError(rpcErrors.invalidParams(error.message)),
+          requestId: dappRequest.requestId,
+        },
+        senderTabInfo,
+      }
+      yield* put(rejectRequest(errorParams))
+    }
+    logger.error(error, {
+      tags: {
+        file: 'saga.ts',
+        function: 'handleSignTypedData',
+      },
+      extra: {
+        dappUrl: senderTabInfo.url,
+      },
+    })
+  }
+}
+
+export function* handleUniswapOpenSidebarRequest(request: UniswapOpenSidebarRequest, senderTabInfo: SenderTabInfo) {
+  if (request.tab) {
+    yield* call(navigate, {
+      pathname: AppRoutes.Home,
+      search: createSearchParams({
+        [HomeQueryParams.Tab]: request.tab,
+      }).toString(),
+    })
+  }
+  const response: UniswapOpenSidebarResponse = {
+    type: DappResponseType.UniswapOpenSidebarResponse,
+    requestId: request.requestId,
+  }
+  yield* call(dappResponseMessageChannel.sendMessageToTab, senderTabInfo.id, response)
+}
diff --git a/apps/extension/src/app/features/dappRequests/slice.ts b/apps/extension/src/app/features/dappRequests/slice.ts
new file mode 100644
index 00000000000..f66157b42b5
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/slice.ts
@@ -0,0 +1,44 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { DappInfo } from 'src/app/features/dapp/store'
+import { DappRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
+
+export interface SenderTabInfo {
+  id: number
+  url: string
+  favIconUrl?: string
+}
+
+export interface DappRequestState {
+  pending: DappRequestStoreItem[]
+}
+export const initialDappRequestState: DappRequestState = {
+  pending: [], // ordered array with the most recent request at the end
+}
+
+export interface DappRequestStoreItem {
+  dappRequest: DappRequest
+  senderTabInfo: SenderTabInfo
+  dappInfo?: DappInfo
+  isSidebarClosed: boolean | undefined
+}
+
+const slice = createSlice({
+  name: 'dappRequests',
+  initialState: initialDappRequestState,
+  reducers: {
+    add: (state, action: PayloadAction<DappRequestStoreItem>) => {
+      state.pending.push(action.payload)
+    },
+    remove: (state, action: PayloadAction<string>) => {
+      const requestId = action.payload
+      const newState = state.pending.filter((tx) => tx.dappRequest.requestId !== requestId)
+      state.pending = newState
+    },
+    removeAll: (state) => {
+      state.pending = []
+    },
+  },
+})
+
+export const dappRequestActions = slice.actions
+export const dappRequestReducer = slice.reducer
diff --git a/apps/extension/src/app/features/dappRequests/types/DappRequestTypes.ts b/apps/extension/src/app/features/dappRequests/types/DappRequestTypes.ts
new file mode 100644
index 00000000000..e42f94e71b4
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/DappRequestTypes.ts
@@ -0,0 +1,419 @@
+import { DappRequestStoreItem } from 'src/app/features/dappRequests/slice'
+import { EthereumRpcErrorSchema } from 'src/app/features/dappRequests/types/ErrorTypes'
+import {
+  EthersTransactionRequestSchema,
+  EthersTransactionResponseSchema,
+} from 'src/app/features/dappRequests/types/EthersTypes'
+import { NonfungiblePositionManagerCallSchema } from 'src/app/features/dappRequests/types/NonfungiblePositionManagerTypes'
+import { UniversalRouterCallSchema } from 'src/app/features/dappRequests/types/UniversalRouterTypes'
+import { HomeTabs } from 'src/app/navigation/constants'
+import { MessageSchema } from 'src/background/messagePassing/messageTypes'
+import {
+  PermissionRequestSchema,
+  PermissionSchema,
+} from 'src/contentScript/WindowEthereumRequestTypes'
+import { z } from 'zod'
+
+// ENUMS
+
+export enum DappRequestType {
+  ChangeChain = 'ChangeChain',
+  GetAccount = 'GetAccount',
+  GetChainId = 'GetChainId',
+  GetPermissions = 'GetPermissions',
+  RequestAccount = 'RequestAccount',
+  RequestPermissions = 'RequestPermissions',
+  RevokePermissions = 'RevokePermissions',
+  SendTransaction = 'SendTransaction',
+  SignMessage = 'SignMessage',
+  SignTransaction = 'SignTransaction',
+  SignTypedData = 'SignTypedData',
+  UniswapOpenSidebar = 'UniswapOpenSidebar',
+}
+
+export enum DappResponseType {
+  AccountResponse = 'AccountResponse',
+  ChainIdResponse = 'ChainIdResponse',
+  ChainChangeResponse = 'ChainChangeResponse',
+  ErrorResponse = 'ErrorResponse',
+  GetPermissionsResponse = 'GetPermissions',
+  RequestPermissionsResponse = 'RequestPermissions',
+  RevokePermissionsResponse = 'RevokePermissions',
+  SignTransactionResponse = 'SignTransactionResponse',
+  SendTransactionResponse = 'SendTransactionResponse',
+  SignTypedDataResponse = 'SignTypedDataResponse',
+  SignMessageResponse = 'SignMessageResponse',
+  UniswapOpenSidebarResponse = 'UniswapOpenSidebarResponse',
+}
+
+export enum UniswapOpenSidebarTab {
+  Activity = 'activity',
+  Tokens = 'tokens',
+}
+
+
+// SCHEMAS + TYPES
+
+export const BaseDappRequestSchema = MessageSchema.extend({
+  requestId: z.string(),
+  type: z.nativeEnum(DappRequestType),
+})
+
+export const BaseDappResponseSchema = MessageSchema.extend({
+  requestId: z.string(),
+  type: z.nativeEnum(DappResponseType),
+})
+
+export const SignMessageRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.SignMessage),
+  messageHex: z.string(),
+  address: z.string(),
+})
+export type SignMessageRequest = z.infer<typeof SignMessageRequestSchema>
+
+export const SignTypedDataRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.SignTypedData),
+  typedData: z.string(),
+  address: z.string(),
+})
+export type SignTypedDataRequest = z.infer<typeof SignTypedDataRequestSchema>
+
+export const SignTransactionRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.SignTransaction),
+  transaction: EthersTransactionRequestSchema,
+})
+export type SignTransactionRequest = z.infer<typeof SignTransactionRequestSchema>
+
+export const UniswapOpenSidebarRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.UniswapOpenSidebar),
+  tab: z.nativeEnum(HomeTabs).optional(),
+})
+export type UniswapOpenSidebarRequest = z.infer<typeof UniswapOpenSidebarRequestSchema>
+
+// ENUMS
+export enum EthSendTransactionRPCActions {
+  Approve = 'Approve',
+  ContractInteraction = 'ContractInteraction',
+  Swap = 'Swap',
+  Wrap = 'Wrap',
+  LP = 'LP',
+  Unknown = 'Unknown',
+}
+
+export const BaseSendTransactionRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.SendTransaction),
+  transaction: EthersTransactionRequestSchema,
+  functionSignature: z.string().optional(),
+  contractInteractions: z.nativeEnum(EthSendTransactionRPCActions).optional(),
+})
+export type BaseSendTransactionRequest = z.infer<typeof BaseSendTransactionRequestSchema>
+
+const ApproveSendTransactionRequestSchema = BaseSendTransactionRequestSchema.extend({
+  contractInteractions: z.literal(EthSendTransactionRPCActions.Approve),
+})
+export type ApproveSendTransactionRequest = z.infer<typeof ApproveSendTransactionRequestSchema>
+
+const ContractInteractionSendTransactionRequestSchema = BaseSendTransactionRequestSchema.extend({
+  contractInteractions: z.literal(EthSendTransactionRPCActions.ContractInteraction),
+})
+export type ContractInteractionSendTransactionRequest = z.infer<
+  typeof ContractInteractionSendTransactionRequestSchema
+>
+
+const SwapSendTransactionRequestSchema = BaseSendTransactionRequestSchema.extend({
+  contractInteractions: z.literal(EthSendTransactionRPCActions.Swap),
+  parsedCalldata: UniversalRouterCallSchema,
+})
+export type SwapSendTransactionRequest = z.infer<typeof SwapSendTransactionRequestSchema>
+
+const WrapSendTransactionRequestSchema = BaseSendTransactionRequestSchema.extend({
+  contractInteractions: z.literal(EthSendTransactionRPCActions.Wrap),
+})
+export type WrapSendTransactionRequest = z.infer<typeof WrapSendTransactionRequestSchema>
+
+const LPSendTransactionRequestSchema = BaseSendTransactionRequestSchema.extend({
+  contractInteractions: z.literal(EthSendTransactionRPCActions.LP),
+  parsedCalldata: NonfungiblePositionManagerCallSchema,
+})
+export type LPSendTransactionRequest = z.infer<typeof LPSendTransactionRequestSchema>
+
+const UnknownContractInteractionSendTransactionRequestSchema =
+  BaseSendTransactionRequestSchema.extend({
+    contractInteractions: z.literal(EthSendTransactionRPCActions.Unknown).optional(),
+  })
+export type UnknownContractInteractionSendTransactionRequest = z.infer<
+  typeof UnknownContractInteractionSendTransactionRequestSchema
+>
+
+export const SendTransactionRequestSchema = z.union([
+  ApproveSendTransactionRequestSchema,
+  ContractInteractionSendTransactionRequestSchema,
+  SwapSendTransactionRequestSchema,
+  WrapSendTransactionRequestSchema,
+  LPSendTransactionRequestSchema,
+  UnknownContractInteractionSendTransactionRequestSchema,
+])
+
+export type SendTransactionRequest = z.infer<typeof SendTransactionRequestSchema>
+
+export const ChangeChainRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.ChangeChain),
+  chainId: z.string(),
+})
+export type ChangeChainRequest = z.infer<typeof ChangeChainRequestSchema>
+
+export const GetAccountRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.GetAccount),
+})
+export type GetAccountRequest = z.infer<typeof GetAccountRequestSchema>
+
+export const RequestAccountRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.RequestAccount),
+})
+export type RequestAccountRequest = z.infer<typeof RequestAccountRequestSchema>
+
+export const GetChainIdRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.GetChainId),
+})
+export type GetChainIdRequest = z.infer<typeof GetChainIdRequestSchema>
+
+export const GetPermissionsRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.GetPermissions),
+})
+
+export type GetPermissionsRequest = z.infer<typeof GetPermissionsRequestSchema>
+
+export const RequestPermissionsRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.RequestPermissions),
+  permissions: PermissionRequestSchema,
+})
+
+export type RequestPermissionsRequest = z.infer<typeof RequestPermissionsRequestSchema>
+
+export const RevokePermissionsRequestSchema = BaseDappRequestSchema.extend({
+  type: z.literal(DappRequestType.RevokePermissions),
+  permissions: PermissionRequestSchema,
+})
+
+export type RevokePermissionsRequest = z.infer<typeof RevokePermissionsRequestSchema>
+
+export const SignMessageResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.SignMessageResponse),
+  signature: z.string().optional(),
+})
+export type SignMessageResponse = z.infer<typeof SignMessageResponseSchema>
+
+export const SignTypedDataResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.SignTypedDataResponse),
+  signature: z.string(),
+})
+export type SignTypedDataResponse = z.infer<typeof SignTypedDataResponseSchema>
+
+export const SignTransactionResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.SignTransactionResponse),
+  signedTransactionHash: z.string().optional(),
+})
+export type SignTransactionResponse = z.infer<typeof SignTransactionResponseSchema>
+
+export const SendTransactionResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.SendTransactionResponse),
+  transactionResponse: EthersTransactionResponseSchema,
+})
+export type SendTransactionResponse = z.infer<typeof SendTransactionResponseSchema>
+
+export const ChangeChainResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.ChainChangeResponse),
+  chainId: z.string(),
+  providerUrl: z.string(),
+})
+export type ChangeChainResponse = z.infer<typeof ChangeChainResponseSchema>
+
+export const AccountResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.AccountResponse),
+  connectedAddresses: z.array(z.string()),
+  chainId: z.string(),
+  providerUrl: z.string(),
+})
+export type AccountResponse = z.infer<typeof AccountResponseSchema>
+
+export const ChainIdResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.ChainIdResponse),
+  chainId: z.string(),
+})
+export type ChainIdResponse = z.infer<typeof ChainIdResponseSchema>
+
+export const GetPermissionsResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.GetPermissionsResponse),
+  permissions: z.array(PermissionSchema),
+})
+export type GetPermissionsResponse = z.infer<typeof GetPermissionsResponseSchema>
+
+export const RequestPermissionsResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.RequestPermissionsResponse),
+  permissions: z.array(PermissionSchema),
+  accounts: z.optional(AccountResponseSchema.omit({ requestId: true, type: true })),
+})
+export type RequestPermissionsResponse = z.infer<typeof RequestPermissionsResponseSchema>
+
+export const RevokePermissionsResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.RevokePermissionsResponse),
+})
+export type RevokePermissionsResponse = z.infer<typeof RevokePermissionsResponseSchema>
+
+export const UniswapOpenSidebarResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.UniswapOpenSidebarResponse),
+})
+export type UniswapOpenSidebarResponse = z.infer<typeof UniswapOpenSidebarResponseSchema>
+
+export const ErrorResponseSchema = BaseDappResponseSchema.extend({
+  type: z.literal(DappResponseType.ErrorResponse),
+  error: EthereumRpcErrorSchema,
+})
+export type ErrorResponse = z.infer<typeof ErrorResponseSchema>
+
+export const DappRequestSchema = z.union([
+  ChangeChainRequestSchema,
+  GetAccountRequestSchema,
+  GetChainIdRequestSchema,
+  GetPermissionsRequestSchema,
+  RequestAccountRequestSchema,
+  RequestPermissionsRequestSchema,
+  RevokePermissionsRequestSchema,
+  SendTransactionRequestSchema,
+  SignMessageRequestSchema,
+  SignTypedDataRequestSchema,
+  SignTransactionRequestSchema,
+  UniswapOpenSidebarRequestSchema,
+])
+
+export const DappResponseSchema = z.union([
+  AccountResponseSchema,
+  ChangeChainResponseSchema,
+  ChainIdResponseSchema,
+  ErrorResponseSchema,
+  GetPermissionsResponseSchema,
+  RequestPermissionsResponseSchema,
+  SignMessageResponseSchema,
+  SignTypedDataResponseSchema,
+  SignTransactionResponseSchema,
+  SendTransactionResponseSchema,
+  UniswapOpenSidebarResponseSchema,
+])
+
+export type DappRequest = z.infer<typeof DappRequestSchema>
+export type DappResponse = z.infer<typeof DappResponseSchema>
+
+// Enforces that a request object in state is for an eth send txn request
+export interface DappRequestStoreItemForEthSendTxn extends DappRequestStoreItem {
+  dappRequest: SendTransactionRequest
+}
+
+// VALIDATORS / UTILS
+
+export function isValidDappRequest(message: unknown): message is DappRequest {
+  return DappRequestSchema.safeParse(message).success
+}
+
+export function isValidDappResponse(message: unknown): message is DappResponse {
+  return DappResponseSchema.safeParse(message).success
+}
+
+export function isErrorResponse(response: unknown): response is ErrorResponse {
+  return ErrorResponseSchema.safeParse(response).success
+}
+
+export function isValidSendTransactionResponse(
+  response: unknown
+): response is SendTransactionResponse {
+  return SendTransactionResponseSchema.safeParse(response).success
+}
+
+export function isValidSignTransactionResponse(
+  response: unknown
+): response is SignTransactionResponse {
+  return SignTransactionResponseSchema.safeParse(response).success
+}
+
+export function isValidSignMessageResponse(response: unknown): response is SignMessageResponse {
+  return SignMessageResponseSchema.safeParse(response).success
+}
+
+export function isValidSignTypedDataResponse(response: unknown): response is SignTypedDataResponse {
+  return SignTypedDataResponseSchema.safeParse(response).success
+}
+
+export function isValidChangeChainResponse(response: unknown): response is ChangeChainResponse {
+  return ChangeChainResponseSchema.safeParse(response).success
+}
+
+export function isValidChainIdResponse(response: unknown): response is ChainIdResponse {
+  return ChainIdResponseSchema.safeParse(response).success
+}
+
+export function isValidAccountResponse(response: unknown): response is AccountResponse {
+  return AccountResponseSchema.safeParse(response).success
+}
+
+export function isValidGetPermissionsResponse(
+  response: unknown
+): response is GetPermissionsResponse {
+  return GetPermissionsResponseSchema.safeParse(response).success
+}
+
+export function isValidRequestPermissionsResponse(
+  response: unknown
+): response is RequestPermissionsResponse {
+  return RequestPermissionsResponseSchema.safeParse(response).success
+}
+
+export function isApproveRequest(
+  request: SendTransactionRequest
+): request is ApproveSendTransactionRequest {
+  return ApproveSendTransactionRequestSchema.safeParse(request).success
+}
+
+export function isSwapRequest(
+  request: SendTransactionRequest
+): request is SwapSendTransactionRequest {
+  return SwapSendTransactionRequestSchema.safeParse(request).success
+}
+
+export function isSignTypedDataRequest(request: DappRequest): request is SignTypedDataRequest {
+  return SignTypedDataRequestSchema.safeParse(request).success
+}
+
+export function isChangeChainRequest(request: DappRequest): request is ChangeChainRequest {
+  return ChangeChainRequestSchema.safeParse(request).success
+}
+
+export function isSignMessageRequest(request: DappRequest): request is SignMessageRequest {
+  return SignMessageRequestSchema.safeParse(request).success
+}
+
+export function isLPRequest(request: SendTransactionRequest): request is LPSendTransactionRequest {
+  return LPSendTransactionRequestSchema.safeParse(request).success
+}
+
+export function isSendTransactionRequest(request: DappRequest): request is SendTransactionRequest {
+  return SendTransactionRequestSchema.safeParse(request).success
+}
+
+export function isDappRequestStoreItemForEthSendTxn(
+  request: DappRequestStoreItem
+): request is DappRequestStoreItemForEthSendTxn {
+  return isSendTransactionRequest(request.dappRequest)
+}
+
+export function isGetAccountRequest(request: DappRequest): request is GetAccountRequest {
+  return GetAccountRequestSchema.safeParse(request).success
+}
+
+export function isRequestAccountRequest(request: DappRequest): request is RequestAccountRequest {
+  return RequestAccountRequestSchema.safeParse(request).success
+}
+
+export function isRequestPermissionsRequest(
+  request: DappRequest
+): request is RequestPermissionsRequest {
+  return RequestPermissionsRequestSchema.safeParse(request).success
+}
diff --git a/apps/extension/src/app/features/dappRequests/types/EIP712Types.ts b/apps/extension/src/app/features/dappRequests/types/EIP712Types.ts
new file mode 100644
index 00000000000..0830da92759
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/EIP712Types.ts
@@ -0,0 +1,46 @@
+import { z } from 'zod'
+
+// Dynamic Message Schema Placeholder
+// eslint-disable-next-line no-restricted-syntax
+const DynamicMessageSchema = z.record(z.string(), z.any())
+export type EIP712Message = z.infer<typeof DynamicMessageSchema>
+
+// Dynamic Type Definition Schema
+export const TypeDefinitionSchema = z
+  .object({
+    name: z.string(),
+    type: z.string(),
+  })
+  .strict() // Ensure no additional properties
+
+// Dynamic Types Schema
+const DynamicTypesSchema = z
+  .object({
+    EIP712Domain: z.array(TypeDefinitionSchema), // Explicitly define EIP712Domain
+  })
+  .catchall(z.array(TypeDefinitionSchema)) // Handle additional dynamic types
+
+// EIP-712 Domain Schema
+const EIP712DomainSchema = z.object({
+  name: z.string().optional(),
+  version: z.string().optional(),
+  chainId: z.union([z.number(), z.bigint(), z.string()]).optional(),
+  verifyingContract: z.string().optional(),
+  salt: z.string().length(66).optional(), // Assuming hex string (0x + 32 bytes)
+})
+
+export type EIP712DomainType = z.infer<typeof EIP712DomainSchema>
+
+// EIP-712 Typed Data Schema
+const EIP712TypedDataSchema = z.object({
+  domain: EIP712DomainSchema.optional(),
+  types: DynamicTypesSchema,
+  primaryType: z.string(), // The primary type being used from the types object
+  message: DynamicMessageSchema, // The dynamic message structure
+})
+
+type EIP712TypedData = z.infer<typeof EIP712TypedDataSchema>
+
+export function isEIP712TypedData(data: unknown): data is EIP712TypedData {
+  return EIP712TypedDataSchema.safeParse(data).success
+}
diff --git a/apps/extension/src/app/features/dappRequests/types/ErrorTypes.ts b/apps/extension/src/app/features/dappRequests/types/ErrorTypes.ts
new file mode 100644
index 00000000000..63b56b8eeb3
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/ErrorTypes.ts
@@ -0,0 +1,8 @@
+import { z } from 'zod'
+
+// Simplified version of the original EthereumRpcError class
+export const EthereumRpcErrorSchema = z.object({
+  code: z.number(),
+  message: z.string(),
+})
+export type EthereumRpcError = z.infer<typeof EthereumRpcErrorSchema>
diff --git a/apps/extension/src/app/features/dappRequests/types/EthersTypes.ts b/apps/extension/src/app/features/dappRequests/types/EthersTypes.ts
new file mode 100644
index 00000000000..c7ae15ab5d8
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/EthersTypes.ts
@@ -0,0 +1,90 @@
+import { isBytesLike } from 'ethers/lib/utils'
+import { HexadecimalNumberSchema } from 'src/app/features/dappRequests/types/utilityTypes'
+import { z } from 'zod'
+
+/**
+ * Ethers types copied from `ethers` package
+ */
+
+// eslint-disable-next-line no-restricted-syntax
+export const BigNumberSchema = z.any() // TODO (EXT-831): Add schema once stable
+
+const AccessListEntrySchema = z.object({
+  address: z.string(),
+  storageKeys: z.array(z.string()),
+})
+
+const AccessListSchema = z.array(AccessListEntrySchema)
+
+export const EthersTransactionSchema = z.object({
+  hash: z.string().optional(),
+  to: z.string().optional(),
+  from: z.string().optional(),
+  nonce: z.number(),
+  gasLimit: BigNumberSchema,
+  gasPrice: BigNumberSchema.optional(),
+  data: z.string(),
+  value: BigNumberSchema,
+  chainId: HexadecimalNumberSchema,
+  r: z.string().optional(),
+  s: z.string().optional(),
+  v: z.number().optional(),
+  type: z.union([z.number(), z.null()]).optional(),
+  accessList: AccessListSchema.optional(),
+  maxPriorityFeePerGas: BigNumberSchema.optional(),
+  maxFeePerGas: BigNumberSchema.optional(),
+})
+export type EthersTransaction = z.infer<typeof EthersTransactionSchema>
+
+// https://docs.ethers.org/v5/api/utils/bignumber/#BigNumberish
+const BigNumberishSchema = z.union([
+  z.string(),
+  z.instanceof(Uint8Array), // For Uint8Array, covering part of BytesLike.
+  z.array(z.number().min(0).max(255)), // For byte arrays (part of BytesLike), assuming bytes are represented as numbers 0-255.
+  BigNumberSchema,
+  z.number(),
+  z.bigint(), // For BigInt, in environments that support BigInt.
+])
+
+// eslint-disable-next-line no-restricted-syntax
+const BytesLikeSchema = z.any().refine((data) => isBytesLike(data))
+
+// https://docs.ethers.org/v5/api/providers/types/#types--access-lists
+const AccessListishSchema = z.union([
+  AccessListSchema,
+  z.array(z.tuple([z.string(), z.array(z.string())])), // Array of 2-element Arrays format
+  z.record(z.array(z.string())), // Object with addresses as keys and arrays of storage keys as values
+])
+
+export const EthersTransactionRequestSchema = z.object({
+  to: z.string().optional(),
+  from: z.string().optional(),
+  nonce: BigNumberishSchema.optional(),
+  gasLimit: BigNumberishSchema.optional(),
+  gasPrice: BigNumberishSchema.optional(),
+  data: BytesLikeSchema.optional(),
+  value: BigNumberishSchema.optional(),
+  chainId: HexadecimalNumberSchema.optional(),
+  type: z.number().optional(),
+  accessList: AccessListishSchema.optional(),
+  maxPriorityFeePerGas: BigNumberishSchema.optional(),
+  maxFeePerGas: BigNumberishSchema.optional(),
+  // eslint-disable-next-line no-restricted-syntax
+  customData: z.record(z.any()).optional(),
+  ccipReadEnabled: z.boolean().optional(),
+})
+export type EthersTransactionRequest = z.infer<typeof EthersTransactionRequestSchema>
+
+export const EthersTransactionResponseSchema = EthersTransactionSchema.extend({
+  hash: z.string(),
+  confirmations: z.number(),
+  from: z.string(),
+  blockNumber: z.number().optional(),
+  blockHash: z.string().optional(),
+  timestamp: z.number().optional(),
+  raw: z.string().optional(),
+  // eslint-disable-next-line no-restricted-syntax
+  wait: z.any(), // TODO (EXT-831): Add schema
+})
+
+export type EthersTransactionResponse = z.infer<typeof EthersTransactionResponseSchema>
diff --git a/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManager.ts b/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManager.ts
new file mode 100644
index 00000000000..64c3deab098
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManager.ts
@@ -0,0 +1,28 @@
+import { NonfungiblePositionManager } from '@uniswap/v3-sdk'
+import {
+  NFPMCommand,
+  NfpmCommandSchema,
+  NonfungiblePositionManagerCall,
+  NonfungiblePositionManagerCallSchema,
+} from 'src/app/features/dappRequests/types/NonfungiblePositionManagerTypes'
+
+const NFPMIface = NonfungiblePositionManager.INTERFACE
+
+function parseMulticallCommand(calldata: string): NFPMCommand {
+  const txDescription = NFPMIface.parseTransaction({ data: calldata })
+
+  return NfpmCommandSchema.parse({
+    commandName: txDescription.name,
+    params: txDescription.args.params,
+  })
+}
+
+export function parseCalldata(calldata: string): NonfungiblePositionManagerCall {
+  const txDescription = NFPMIface.parseTransaction({ data: calldata })
+  const { data } = txDescription.args
+  if (txDescription.name === 'multicall') {
+    return NonfungiblePositionManagerCallSchema.parse({ commands: data.map(parseMulticallCommand) })
+  }
+
+  throw new Error('All NFPM calls from the Uniswap Labs interface are multicalls.')
+}
diff --git a/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManagerTypes.ts b/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManagerTypes.ts
new file mode 100644
index 00000000000..b2532a5fb30
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/NonfungiblePositionManagerTypes.ts
@@ -0,0 +1,76 @@
+import { BigNumberSchema } from 'src/app/features/dappRequests/types/EthersTypes'
+import { z } from 'zod'
+
+export const UnwrapNFPMCommandSchema = z.object({
+  commandName: z.literal('unwrapWETH9'),
+  params: z.object({
+    amountMinimum: BigNumberSchema,
+    recipient: z.string(),
+  }),
+})
+export type UnwrapNFPMCommand = z.infer<typeof UnwrapNFPMCommandSchema>
+
+export const SweepNFPMCommandSchema = z.object({
+  commandName: z.literal('sweepToken'),
+  params: z.object({
+    amountMinimum: BigNumberSchema,
+    recipient: z.string(),
+    token: z.string(),
+  }),
+})
+export type SweepNFPMCommand = z.infer<typeof SweepNFPMCommandSchema>
+
+export const CollectNFPMCommandSchema = z.object({
+  commandName: z.literal('collect'),
+  params: z.object({
+    amountMinimum: BigNumberSchema,
+    recipient: z.string(),
+    token: z.string(),
+  }),
+})
+export type CollectNFPMCommand = z.infer<typeof CollectNFPMCommandSchema>
+
+export const DecreaseLiquidityNFPMCommandSchema = z.object({
+  commandName: z.literal('decreaseLiquidity'),
+  params: z.object({
+    amount0Min: BigNumberSchema,
+    amount1Min: BigNumberSchema,
+    deadline: BigNumberSchema,
+    liquidity: BigNumberSchema,
+    tokenId: BigNumberSchema,
+  }),
+})
+export type DecreaseLiquidityNFPMCommand = z.infer<typeof DecreaseLiquidityNFPMCommandSchema>
+
+export const IncreaseLiquidityNFPMCommandSchema = z.object({
+  commandName: z.literal('increaseLiquidity'),
+  params: z.object({
+    amount0Desired: BigNumberSchema,
+    amount0Min: BigNumberSchema,
+    amount1Desired: BigNumberSchema,
+    amount1Min: BigNumberSchema,
+    deadline: BigNumberSchema,
+    tokenId: BigNumberSchema,
+  }),
+})
+export type IncreaseLiquidityNFPMCommand = z.infer<typeof IncreaseLiquidityNFPMCommandSchema>
+
+export const RefundETHNFPMCommandSchema = z.object({
+  commandName: z.literal('refundETH'),
+})
+export type RefundETHNFPMCommand = z.infer<typeof RefundETHNFPMCommandSchema>
+
+export const NfpmCommandSchema = z.union([
+  UnwrapNFPMCommandSchema,
+  SweepNFPMCommandSchema,
+  CollectNFPMCommandSchema,
+  DecreaseLiquidityNFPMCommandSchema,
+  IncreaseLiquidityNFPMCommandSchema,
+  RefundETHNFPMCommandSchema,
+])
+export type NFPMCommand = z.infer<typeof NfpmCommandSchema>
+
+export const NonfungiblePositionManagerCallSchema = z.object({
+  commands: z.array(NfpmCommandSchema),
+})
+export type NonfungiblePositionManagerCall = z.infer<typeof NonfungiblePositionManagerCallSchema>
diff --git a/apps/extension/src/app/features/dappRequests/types/Permit2Types.ts b/apps/extension/src/app/features/dappRequests/types/Permit2Types.ts
new file mode 100644
index 00000000000..76341d49a5f
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/Permit2Types.ts
@@ -0,0 +1,41 @@
+import { TypeDefinitionSchema } from 'src/app/features/dappRequests/types/EIP712Types'
+import { z } from 'zod'
+
+const MessageSchema = z.object({
+  details: z.object({
+    token: z.string(),
+    amount: z.string(),
+    expiration: z.string(),
+    nonce: z.string(),
+  }),
+  spender: z.string(),
+  sigDeadline: z.string(),
+})
+export type Permit2Message = z.infer<typeof MessageSchema>
+
+const TypesSchema = z
+  .object({
+    EIP712Domain: z.array(TypeDefinitionSchema),
+    PermitDetails: z.array(TypeDefinitionSchema),
+    PermitSingle: z.array(TypeDefinitionSchema),
+  })
+  .catchall(z.array(TypeDefinitionSchema))
+
+const DomainSchema = z.object({
+  name: z.literal('Permit2'),
+  chainId: z.union([z.number(), z.bigint(), z.string()]),
+  verifyingContract: z.string(),
+})
+
+const Permit2Schema = z.object({
+  domain: DomainSchema,
+  types: TypesSchema,
+  primaryType: z.literal('PermitSingle'),
+  message: MessageSchema,
+})
+
+type Permit2 = z.infer<typeof Permit2Schema>
+
+export function isPermit2(data: unknown): data is Permit2 {
+  return Permit2Schema.safeParse(data).success
+}
diff --git a/apps/extension/src/app/features/dappRequests/types/UniversalRouterTypes.ts b/apps/extension/src/app/features/dappRequests/types/UniversalRouterTypes.ts
new file mode 100644
index 00000000000..c4a4f67a68c
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/UniversalRouterTypes.ts
@@ -0,0 +1,404 @@
+import { FeeAmount as FeeAmountV3 } from '@uniswap/v3-sdk'
+import { BigNumberSchema } from 'src/app/features/dappRequests/types/EthersTypes'
+import { z } from 'zod'
+
+// ENUMS
+
+// TODO: import from UR-sdk
+export enum CommandType {
+  V3SwapExactIn = 0x00,
+  V3SwapExactOut = 0x01,
+  Permit2TransferFrom = 0x02,
+  Permit2PermitBatch = 0x03,
+  SWEEP = 0x04,
+  TRANSFER = 0x05,
+  PayPortion = 0x06,
+
+  V2SwapExactIn = 0x08,
+  V2SwapExactOut = 0x09,
+  Permit2Permit = 0x0a,
+  WrapEth = 0x0b,
+  UnwrapWeth = 0x0c,
+  Permit2TransferFromBatch = 0x0d,
+  BalanceCheckErc20 = 0x0e,
+
+  // NFT-related command types
+  SEAPORT = 0x10,
+  LooksRare721 = 0x11,
+  NFTX = 0x12,
+  CRYPTOPUNKS = 0x13,
+  LooksRare1155 = 0x14,
+  OwnerCheck721 = 0x15,
+  OwnerCheck1155 = 0x16,
+  SweepErc721 = 0x17,
+
+  X2y2721 = 0x18,
+  SUDOSWAP = 0x19,
+  NFT20 = 0x1a,
+  X2y21155 = 0x1b,
+  FOUNDATION = 0x1c,
+  SweepErc1155 = 0x1d,
+  ElementMarket = 0x1e,
+
+  ExecuteSubPlan = 0x20,
+  Seaportv14 = 0x21,
+  ApproveErc20 = 0x22,
+}
+
+export enum Subparser {
+  V3PathExactIn,
+  V3PathExactOut,
+}
+
+const PERMIT_STRUCT =
+  '((address token,uint160 amount,uint48 expiration,uint48 nonce) details,address spender,uint256 sigDeadline)'
+
+const PERMIT_BATCH_STRUCT =
+  '((address token,uint160 amount,uint48 expiration,uint48 nonce)[] details,address spender,uint256 sigDeadline)'
+
+const PERMIT2_TRANSFER_FROM_STRUCT = '(address from,address to,uint160 amount,address token)'
+const PERMIT2_TRANSFER_FROM_BATCH_STRUCT = PERMIT2_TRANSFER_FROM_STRUCT + '[]'
+
+export const ABI_DEFINITION: { readonly [key in CommandType]: readonly ParamType[] } = {
+  // Batch Reverts
+  [CommandType.ExecuteSubPlan]: [
+    { name: 'commands', type: 'bytes' },
+    { name: 'inputs', type: 'bytes[]' },
+  ],
+
+  // Permit2 Actions
+  [CommandType.Permit2Permit]: [
+    { name: 'permit', type: PERMIT_STRUCT },
+    { name: 'signature', type: 'bytes' },
+  ],
+  [CommandType.Permit2PermitBatch]: [
+    { name: 'permit', type: PERMIT_BATCH_STRUCT },
+    { name: 'signature', type: 'bytes' },
+  ],
+  [CommandType.Permit2TransferFrom]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'amount', type: 'uint160' },
+  ],
+  [CommandType.Permit2TransferFromBatch]: [
+    {
+      name: 'transferFrom',
+      type: PERMIT2_TRANSFER_FROM_BATCH_STRUCT,
+    },
+  ],
+
+  // Uniswap Actions
+  [CommandType.V3SwapExactIn]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountIn', type: 'uint256' },
+    { name: 'amountOutMin', type: 'uint256' },
+    { name: 'path', subparser: Subparser.V3PathExactIn, type: 'bytes' },
+    { name: 'payerIsUser', type: 'bool' },
+  ],
+  [CommandType.V3SwapExactOut]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountOut', type: 'uint256' },
+    { name: 'amountInMax', type: 'uint256' },
+    { name: 'path', subparser: Subparser.V3PathExactOut, type: 'bytes' },
+    { name: 'payerIsUser', type: 'bool' },
+  ],
+  [CommandType.V2SwapExactIn]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountIn', type: 'uint256' },
+    { name: 'amountOutMin', type: 'uint256' },
+    { name: 'path', type: 'address[]' },
+    { name: 'payerIsUser', type: 'bool' },
+  ],
+  [CommandType.V2SwapExactOut]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountOut', type: 'uint256' },
+    { name: 'amountInMax', type: 'uint256' },
+    { name: 'path', type: 'address[]' },
+    { name: 'payerIsUser', type: 'bool' },
+  ],
+
+  // Token Actions and Checks
+  [CommandType.WrapEth]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountMin', type: 'uint256' },
+  ],
+  [CommandType.UnwrapWeth]: [
+    { name: 'recipient', type: 'address' },
+    { name: 'amountMin', type: 'uint256' },
+  ],
+  [CommandType.SWEEP]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'amountMin', type: 'uint256' },
+  ],
+  [CommandType.SweepErc721]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.SweepErc1155]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'id', type: 'uint256' },
+    { name: 'amount', type: 'uint256' },
+  ],
+  [CommandType.TRANSFER]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'value', type: 'uint256' },
+  ],
+  [CommandType.PayPortion]: [
+    { name: 'token', type: 'address' },
+    { name: 'recipient', type: 'address' },
+    { name: 'bips', type: 'uint256' },
+  ],
+  [CommandType.BalanceCheckErc20]: [
+    { name: 'owner', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'minBalance', type: 'uint256' },
+  ],
+  [CommandType.OwnerCheck721]: [
+    { name: 'owner', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.OwnerCheck1155]: [
+    { name: 'owner', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+    { name: 'minBalance', type: 'uint256' },
+  ],
+  [CommandType.ApproveErc20]: [
+    { name: 'token', type: 'address' },
+    { name: 'spenderId', type: 'uint256' },
+  ],
+
+  // NFT Markets
+  [CommandType.SEAPORT]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+  [CommandType.Seaportv14]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+  [CommandType.NFTX]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+  [CommandType.LooksRare721]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+    { name: 'recipient', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.LooksRare1155]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+    { name: 'recipient', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.X2y2721]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+    { name: 'recipient', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.X2y21155]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+    { name: 'recipient', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.FOUNDATION]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+    { name: 'recipient', type: 'address' },
+    { name: 'token', type: 'address' },
+    { name: 'id', type: 'uint256' },
+  ],
+  [CommandType.SUDOSWAP]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+  [CommandType.NFT20]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+  [CommandType.CRYPTOPUNKS]: [
+    { name: 'punkId', type: 'uint256' },
+    { name: 'recipient', type: 'address' },
+    { name: 'value', type: 'uint256' },
+  ],
+  [CommandType.ElementMarket]: [
+    { name: 'value', type: 'uint256' },
+    { name: 'data', type: 'bytes' },
+  ],
+}
+
+// SCHEMAS + TYPES
+export const SubparserSchema = z.nativeEnum(Subparser)
+
+export const ParamTypeSchema = z.object({
+  name: z.string(),
+  type: z.string(),
+  subparser: SubparserSchema.optional(),
+})
+export type ParamType = z.infer<typeof ParamTypeSchema>
+
+export const CommandNameSchema = z.enum(
+  Object.keys(CommandType) as [keyof typeof CommandType, ...Array<keyof typeof CommandType>]
+)
+export type CommandName = z.infer<typeof CommandNameSchema>
+
+// TODO: remove this fallback once params are fully typed or we are able to import them from the universal router sdk
+const FallbackParamSchema = z.object({
+  name: z.string(),
+  // eslint-disable-next-line no-restricted-syntax
+  value: z.any(),
+})
+export type FallbackParam = z.infer<typeof FallbackParamSchema>
+
+const AmountInParamSchema = z.object({
+  name: z.literal('amountIn'),
+  value: BigNumberSchema,
+})
+export type AmountInParam = z.infer<typeof AmountInParamSchema>
+
+const AmountInMaxParamSchema = z.object({
+  name: z.literal('amountInMax'),
+  value: BigNumberSchema,
+})
+export type AmountInMaxParam = z.infer<typeof AmountInMaxParamSchema>
+
+const AmountOutMinParamSchema = z.object({
+  name: z.literal('amountOutMin'),
+  value: BigNumberSchema,
+})
+export type AmountOutMinParam = z.infer<typeof AmountOutMinParamSchema>
+
+const AmountOutParamSchema = z.object({
+  name: z.literal('amountOut'),
+  value: BigNumberSchema,
+})
+export type AmountOutParam = z.infer<typeof AmountOutParamSchema>
+
+const FeeAmountSchema = z.nativeEnum(FeeAmountV3)
+export type FeeAmount = z.infer<typeof FeeAmountSchema>
+
+const V3PathParamSchema = z.object({
+  name: z.literal('path'),
+  value: z.array(
+    z.object({
+      tokenIn: z.string().refine((val) => val.startsWith('0x'), {
+        message: "tokenIn must start with '0x'",
+      }),
+      tokenOut: z.string().refine((val) => val.startsWith('0x'), {
+        message: "tokenOut must start with '0x'",
+      }),
+      fee: FeeAmountSchema,
+    })
+  ),
+})
+export type V3Path = z.infer<typeof V3PathParamSchema>
+
+const PayerIsUserParamSchema = z.object({
+  name: z.literal('payerIsUser'),
+  value: z.boolean(),
+})
+export type PayerIsUserParam = z.infer<typeof PayerIsUserParamSchema>
+
+export const ParamSchema = z.union([
+  AmountInParamSchema,
+  AmountInMaxParamSchema,
+  AmountOutParamSchema,
+  AmountOutMinParamSchema,
+  V3PathParamSchema,
+  PayerIsUserParamSchema,
+  FallbackParamSchema,
+])
+export type Param = z.infer<typeof ParamSchema>
+
+export const FallbackCommandSchema = z.object({
+  commandName: CommandNameSchema,
+  commandType: z.nativeEnum(CommandType),
+  params: z.array(ParamSchema),
+})
+export type FallbackCommand = z.infer<typeof FallbackCommandSchema>
+
+const V2SwapExactInCommandSchema = z.object({
+  commandName: z.literal('V2SwapExactIn'),
+  commandType: z.literal(CommandType.V2SwapExactIn),
+  params: z.array(ParamSchema),
+})
+export type V2SwapExactInCommand = z.infer<typeof V2SwapExactInCommandSchema>
+
+const V2SwapExactOutCommandSchema = z.object({
+  commandName: z.literal('V2SwapExactOut'),
+  commandType: z.literal(CommandType.V2SwapExactOut),
+  params: z.array(ParamSchema),
+})
+export type V2SwapExactOutCommand = z.infer<typeof V2SwapExactOutCommandSchema>
+
+const V3SwapExactInCommandSchema = z.object({
+  commandName: z.literal('V3SwapExactIn'),
+  commandType: z.literal(CommandType.V3SwapExactIn),
+  params: z.array(ParamSchema),
+})
+export type V3SwapExactInCommand = z.infer<typeof V3SwapExactInCommandSchema>
+
+const V3SwapExactOutCommandSchema = z.object({
+  commandName: z.literal('V3SwapExactOut'),
+  commandType: z.literal(CommandType.V3SwapExactOut),
+  params: z.array(ParamSchema),
+})
+export type V3SwapExactOutCommand = z.infer<typeof V3SwapExactOutCommandSchema>
+
+export const UniversalRouterSwapCommandSchema = z.union([
+  V2SwapExactInCommandSchema,
+  V2SwapExactOutCommandSchema,
+  V3SwapExactInCommandSchema,
+  V3SwapExactOutCommandSchema,
+])
+export type UniversalRouterSwapCommand = z.infer<typeof UniversalRouterSwapCommandSchema>
+
+const UniversalRouterCommandSchema = z.union([
+  FallbackCommandSchema,
+  V2SwapExactInCommandSchema,
+  V2SwapExactOutCommandSchema,
+  V3SwapExactInCommandSchema,
+  V3SwapExactOutCommandSchema,
+])
+export type UniversalRouterCommand = z.infer<typeof UniversalRouterCommandSchema>
+
+export const UniversalRouterCallSchema = z.object({
+  commands: z.array(UniversalRouterCommandSchema),
+})
+export type UniversalRouterCall = z.infer<typeof UniversalRouterCallSchema>
+
+// VALIDATORS + UTILS
+export function isURCommandASwap(
+  command: UniversalRouterCommand
+): command is UniversalRouterSwapCommand {
+  return UniversalRouterSwapCommandSchema.safeParse(command).success
+}
+
+export function isAmountInParam(param: Param): param is AmountInParam {
+  return AmountInParamSchema.safeParse(param).success
+}
+
+export function isAmountInMaxParam(param: Param): param is AmountInMaxParam {
+  return AmountInMaxParamSchema.safeParse(param).success
+}
+
+export function isAmountOutMinParam(param: Param): param is AmountOutMinParam {
+  return AmountOutMinParamSchema.safeParse(param).success
+}
+
+export function isAmountOutParam(param: Param): param is AmountOutParam {
+  return AmountOutParamSchema.safeParse(param).success
+}
diff --git a/apps/extension/src/app/features/dappRequests/types/utilityTypes.tsx b/apps/extension/src/app/features/dappRequests/types/utilityTypes.tsx
new file mode 100644
index 00000000000..55b4e5992f3
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/types/utilityTypes.tsx
@@ -0,0 +1,15 @@
+import { z } from 'zod'
+
+export const HexadecimalNumberSchema = z
+  .union([z.number(), z.string()])
+  .transform((value, ctx): number => {
+    if (typeof value === 'number') {
+      return value
+    }
+    const possibleNumber = Number(value)
+    if (!isNaN(possibleNumber)) {
+      return possibleNumber
+    }
+    ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Not a hexadecimal number' })
+    return z.NEVER
+  })
diff --git a/apps/extension/src/app/features/dappRequests/utils.ts b/apps/extension/src/app/features/dappRequests/utils.ts
new file mode 100644
index 00000000000..51e5dc2ba22
--- /dev/null
+++ b/apps/extension/src/app/features/dappRequests/utils.ts
@@ -0,0 +1,26 @@
+import { logger } from 'utilities/src/logger/logger'
+
+function parseUrl(url?: string): URL | undefined {
+  if (!url) {
+    return undefined
+  }
+
+  try {
+    return new URL(url)
+  } catch (error) {
+    logger.error(error, {
+      tags: { file: 'dappRequests/utils', function: 'extractBaseUrl' },
+      extra: { url },
+    })
+  }
+}
+
+/** Returns the url host (doesn't include http or https) */
+export function extractUrlHost(url?: string): string | undefined {
+  return parseUrl(url)?.host
+}
+
+/** Returns the url origin (includes http or https) */
+export function extractBaseUrl(url?: string): string | undefined {
+  return parseUrl(url)?.origin
+}
diff --git a/apps/extension/src/app/features/for/utils.ts b/apps/extension/src/app/features/for/utils.ts
new file mode 100644
index 00000000000..e0e8db58f6b
--- /dev/null
+++ b/apps/extension/src/app/features/for/utils.ts
@@ -0,0 +1,33 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { useDappContext } from 'src/app/features/dapp/DappContext'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { focusOrCreateUniswapInterfaceTab } from 'src/app/navigation/utils'
+import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { ElementNameType } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+
+export function useInterfaceBuyNavigator(element: ElementNameType): () => void {
+  const { dappUrl } = useDappContext()
+  const dappChain = useDappLastChainId(dappUrl)
+
+  return () => {
+    sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+      screen: ExtensionScreens.Home,
+      element,
+    })
+    const chainParam = dappChain ? `?chain=${UNIVERSE_CHAIN_INFO[dappChain].urlParam}` : ''
+    focusOrCreateUniswapInterfaceTab({
+      url: `${uniswapUrls.webInterfaceBuyUrl}${chainParam}`,
+    }).catch((err) =>
+      logger.error(err, {
+        tags: {
+          file: 'PortfolioActionButtons',
+          function: 'onBuyClick',
+        },
+      }),
+    )
+  }
+}
diff --git a/apps/extension/src/app/features/home/HomeScreen.tsx b/apps/extension/src/app/features/home/HomeScreen.tsx
new file mode 100644
index 00000000000..a4bffd60f9a
--- /dev/null
+++ b/apps/extension/src/app/features/home/HomeScreen.tsx
@@ -0,0 +1,248 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { memo, useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ActivityTab } from 'src/app/components/tabs/ActivityTab'
+import { NftsTab } from 'src/app/components/tabs/NftsTab'
+import { PortfolioActionButtons } from 'src/app/features/home/PortfolioActionButtons'
+import { PortfolioHeader } from 'src/app/features/home/PortfolioHeader'
+import { TokenBalanceList } from 'src/app/features/home/TokenBalanceList'
+import { PinReminder } from 'src/app/features/onboarding/PinReminder'
+import { selectAlertsState } from 'src/app/features/onboarding/alerts/selectors'
+import { AlertName, closeAlert } from 'src/app/features/onboarding/alerts/slice'
+import { useOptimizedSearchParams } from 'src/app/hooks/useOptimizedSearchParams'
+import { HomeQueryParams, HomeTabs } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { useAppDispatch, useAppSelector } from 'src/store/store'
+import { Flex, Loader, Text, TouchableArea, styled } from 'ui/src'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { logger } from 'utilities/src/logger/logger'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useTimeout } from 'utilities/src/time/timing'
+import { PendingNotificationBadge } from 'wallet/src/features/notifications/components/PendingNotificationBadge'
+import { useSelectAddressHasNotifications } from 'wallet/src/features/notifications/hooks'
+import { setNotificationStatus } from 'wallet/src/features/notifications/slice'
+import { PortfolioBalance } from 'wallet/src/features/portfolio/PortfolioBalance'
+import { useHeartbeatReporter, useLastBalancesReporter } from 'wallet/src/features/telemetry/hooks'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+
+export const HomeScreen = memo(function _HomeScreen(): JSX.Element {
+  const { t } = useTranslation()
+  const [showTabs, setShowTabs] = useState(false)
+
+  // The tabs are too slow to render on the first load, so we delay them to speed up the perceived loading time.
+  useTimeout(() => setShowTabs(true), 0)
+
+  const address = useActiveAccountAddressWithThrow()
+  const [selectedTab, setSelectedTab] = useSelectedTabState()
+  const dispatch = useAppDispatch()
+
+  // Record a heartbeat for anonymous user DAU
+  useHeartbeatReporter()
+  // Report balances at most every 24 hours, checking every 15 seconds when app is open
+  useLastBalancesReporter()
+
+  useEffect(() => {
+    if (selectedTab) {
+      sendAnalyticsEvent(SharedEventName.PAGE_VIEWED, {
+        screen: selectedTab,
+      })
+    }
+  }, [selectedTab])
+
+  // defaults to true, but store state will persist to future loads once updated
+  const { isOpen: isPinRequestOpen } = useAppSelector(selectAlertsState(AlertName.PinToToolbar))
+  const onClosePinRequest = useCallback(() => dispatch(closeAlert(AlertName.PinToToolbar)), [dispatch])
+
+  useEffect(() => {
+    let intervalId: number
+    const checkExtensionPinnedStatus = async (): Promise<void> => {
+      const settings = await chrome.action.getUserSettings()
+      if (settings.isOnToolbar) {
+        onClosePinRequest()
+        // Clear interval once pinned
+        clearInterval(intervalId)
+      }
+    }
+
+    // Only set up the interval if the pin request is open
+    if (isPinRequestOpen) {
+      // Check immediately on mount
+      checkExtensionPinnedStatus().catch((e) => logger.error('Error checking if extension is pinned in Chrome', e))
+
+      intervalId = window.setInterval(checkExtensionPinnedStatus, ONE_SECOND_MS)
+    }
+    return () => {
+      if (intervalId) {
+        clearInterval(intervalId)
+      }
+    }
+  }, [isPinRequestOpen, onClosePinRequest])
+
+  const hasNotifications = useSelectAddressHasNotifications(address)
+  useEffect(() => {
+    if (selectedTab === HomeTabs.Activity && hasNotifications) {
+      dispatch(setNotificationStatus({ address, hasNotifications: false }))
+    }
+  }, [dispatch, address, hasNotifications, selectedTab])
+
+  return (
+    <Flex fill alignItems="center" backgroundColor="$surface1" p="$spacing12">
+      {address ? (
+        <Flex backgroundColor="$surface1" gap="$spacing12" width="100%">
+          {isPinRequestOpen && (
+            <Flex position="relative" width="100%">
+              <PinReminder style="popup" onClose={onClosePinRequest} />
+            </Flex>
+          )}
+          <Flex grow gap="$spacing8">
+            <Flex pl="$spacing4" position="relative" pt="$spacing4">
+              <PortfolioHeader address={address} />
+            </Flex>
+            <Flex pb="$spacing8" pl="$spacing4">
+              <PortfolioBalance owner={address} />
+            </Flex>
+
+            <PortfolioActionButtons />
+
+            <Flex flex={1} width="100%">
+              <Flex row gap="$spacing16" px="$spacing4" py="$spacing8">
+                <TabButton isActive={selectedTab === HomeTabs.Tokens} onPress={() => setSelectedTab(HomeTabs.Tokens)}>
+                  {t('home.tokens.title')}
+                </TabButton>
+
+                <TabButton isActive={selectedTab === HomeTabs.NFTs} onPress={() => setSelectedTab(HomeTabs.NFTs)}>
+                  {t('home.nfts.title')}
+                </TabButton>
+
+                <TabButton
+                  showPendingNotificationBadge
+                  isActive={selectedTab === HomeTabs.Activity}
+                  onPress={() => setSelectedTab(HomeTabs.Activity)}
+                >
+                  {t('home.activity.title')}
+                </TabButton>
+              </Flex>
+
+              <Flex row height="100%" width="100%">
+                {showTabs ? (
+                  <>
+                    <AnimatedTab hideLeft={selectedTab !== HomeTabs.Tokens} isActive={selectedTab === HomeTabs.Tokens}>
+                      <TokenBalanceList owner={address} />
+                    </AnimatedTab>
+
+                    <AnimatedTab
+                      hideLeft={selectedTab === HomeTabs.Activity}
+                      hideRight={selectedTab === HomeTabs.Tokens}
+                      isActive={selectedTab === HomeTabs.NFTs}
+                    >
+                      <NftsTab owner={address} />
+                    </AnimatedTab>
+
+                    <AnimatedTab
+                      hideRight={selectedTab !== HomeTabs.Activity}
+                      isActive={selectedTab === HomeTabs.Activity}
+                    >
+                      <ActivityTab address={address} />
+                    </AnimatedTab>
+                  </>
+                ) : (
+                  <Flex fill mx="$spacing8">
+                    <Loader.Token withPrice repeat={6} />
+                  </Flex>
+                )}
+              </Flex>
+            </Flex>
+          </Flex>
+        </Flex>
+      ) : (
+        <Text color="$statusCritical" variant="subheading1">
+          {t('home.extension.error')}
+        </Text>
+      )}
+    </Flex>
+  )
+})
+
+const TabButton = ({
+  isActive,
+  onPress,
+  children,
+  showPendingNotificationBadge = false,
+}: {
+  isActive: boolean
+  onPress: () => void
+  children: React.ReactNode
+  showPendingNotificationBadge?: boolean
+}): JSX.Element => {
+  return (
+    <TouchableArea alignItems="center" flexDirection="row" gap="$spacing4" p="$spacing2" onPress={onPress}>
+      <Text color={isActive ? '$neutral1' : '$neutral2'} userSelect="none" variant="subheading2">
+        {children}
+      </Text>
+      {showPendingNotificationBadge && <PendingNotificationBadge />}
+    </TouchableArea>
+  )
+}
+
+const AnimatedTab = styled(Flex, {
+  animation: 'quicker',
+  width: '100%',
+  mr: '-100%',
+  x: 0,
+  opacity: 1,
+
+  variants: {
+    isActive: {
+      true: {},
+      false: {
+        pointerEvents: 'none',
+        maxHeight: 300,
+      },
+    },
+
+    hideLeft: {
+      true: {
+        opacity: 0,
+        // if this number is larger than the horizontal padding of the screen, it
+        // will make a horizontal scroll bar appear when using a mouse on macOS
+        x: -10,
+        pointerEvents: 'none',
+      },
+    },
+    hideRight: {
+      true: {
+        opacity: 0,
+        x: 10,
+        pointerEvents: 'none',
+      },
+    },
+  } as const,
+})
+
+// useNavigate/useSearchParams re-renders on every page change, so we avoid them here:
+// https://github.com/remix-run/react-router/issues/7634#issuecomment-1306650156
+function useSelectedTabState(): [HomeTabs | null, (tab: HomeTabs) => void] {
+  const searchParams = useOptimizedSearchParams()
+  const tab = searchParams.get(HomeQueryParams.Tab)
+
+  const setNewTab = useCallback(async (newTab: HomeTabs) => {
+    navigate(
+      {
+        search: `?${HomeQueryParams.Tab}=${newTab}`,
+      },
+      {
+        replace: true,
+      },
+    )
+  }, [])
+
+  if (isValidHomeTab(tab)) {
+    return [tab, setNewTab]
+  }
+
+  return [HomeTabs.Tokens, setNewTab]
+}
+
+function isValidHomeTab(tab: unknown): tab is HomeTabs {
+  return tab === HomeTabs.Tokens || tab === HomeTabs.NFTs || tab === HomeTabs.Activity
+}
diff --git a/apps/extension/src/app/features/home/PortfolioActionButtons.tsx b/apps/extension/src/app/features/home/PortfolioActionButtons.tsx
new file mode 100644
index 00000000000..bc87b20020b
--- /dev/null
+++ b/apps/extension/src/app/features/home/PortfolioActionButtons.tsx
@@ -0,0 +1,133 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { cloneElement, memo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ComingSoon } from 'src/app/components/ComingSoon'
+import { useInterfaceBuyNavigator } from 'src/app/features/for/utils'
+import { AppRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { Flex, Text, getTokenValue, useMedia } from 'ui/src'
+import { ArrowDownCircle, Buy, CoinConvert, SendAction } from 'ui/src/components/icons'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import { ElementName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+
+const ICON_COLOR = '$accent1'
+
+type ActionButtonCommonProps = {
+  label: string
+  Icon: JSX.Element
+}
+
+// accepts an `onClick` prop or a `url` prop, but not both or neither
+type ActionButtonProps =
+  | (ActionButtonCommonProps & {
+      onClick: () => void
+      url?: never
+    })
+  | (ActionButtonCommonProps & {
+      url: string
+      onClick?: never
+    })
+
+function ActionButton({ label, Icon, onClick, url }: ActionButtonProps): JSX.Element {
+  const actionHandler = url
+    ? // if it has a url prop, open it in a new tab
+      (): void => {
+        // false positive because of .open
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
+        window.open(url, '_blank')
+      }
+    : // otherwise call the onClick function
+      onClick
+
+  return (
+    // TODO(EXT-248): Change to TouchableArea
+    // https://linear.app/uniswap/issue/EXT-248/need-web-equivalent-of-touchablearea
+    <Flex
+      fill
+      alignItems="flex-start"
+      backgroundColor="$accent2"
+      borderRadius="$rounded16"
+      flexBasis={1}
+      gap="$spacing12"
+      hoverStyle={{ cursor: 'pointer', opacity: 0.8 }}
+      justifyContent="space-between"
+      p="$spacing12"
+      pressStyle={{ opacity: 0.5 }}
+      userSelect="none"
+      onPress={actionHandler}
+    >
+      {cloneElement(Icon, { color: ICON_COLOR, size: getTokenValue('$icon.24') })}
+      <Text color="$accent1" fontWeight="600" variant="buttonLabel3">
+        {label}
+      </Text>
+    </Flex>
+  )
+}
+
+export const PortfolioActionButtons = memo(function _PortfolioActionButtons(): JSX.Element {
+  const { t } = useTranslation()
+  const media = useMedia()
+
+  const isExtensionBuyEnabled = useFeatureFlag(FeatureFlags.ExtensionBuyButton)
+
+  const onSendClick = (): void => {
+    sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+      screen: ExtensionScreens.Home,
+      element: ElementName.Send,
+    })
+    navigate(AppRoutes.Transfer)
+  }
+
+  const onSwapClick = (): void => {
+    sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+      screen: ExtensionScreens.Home,
+      element: ElementName.Swap,
+    })
+    navigate(AppRoutes.Swap)
+  }
+
+  const onReceiveClick = (): void => {
+    sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+      screen: ExtensionScreens.Home,
+      element: ElementName.Receive,
+    })
+    navigate(AppRoutes.Receive)
+  }
+
+  const onBuyClick = useInterfaceBuyNavigator(ElementName.Buy)
+
+  const isGrid = media.sm
+
+  const ComingSoonBuyButton = (
+    <Flex fill backgroundColor="$accent2" borderRadius="$rounded16" flexBasis={1} opacity={0.5} p="$spacing12">
+      <ComingSoon placement="bottom">
+        <Flex fill alignItems="flex-start" gap="$spacing12" justifyContent="space-between" userSelect="none">
+          <Buy color={ICON_COLOR} size="$icon.24" />
+          <Text color="$accent1" fontWeight="600" variant="buttonLabel3">
+            {t('home.label.buy')}
+          </Text>
+        </Flex>
+      </ComingSoon>
+    </Flex>
+  )
+
+  return (
+    <Flex flexDirection={isGrid ? 'column' : 'row'} gap="$spacing8">
+      <Flex row shrink gap="$spacing8" width={isGrid ? '100%' : '50%'}>
+        <ActionButton Icon={<CoinConvert />} label={t('home.label.swap')} onClick={onSwapClick} />
+        {isExtensionBuyEnabled ? (
+          <ActionButton Icon={<Buy />} label={t('home.label.buy')} onClick={onBuyClick} />
+        ) : (
+          ComingSoonBuyButton
+        )}
+      </Flex>
+      <Flex row shrink gap="$spacing8" width={isGrid ? '100%' : '50%'}>
+        <ActionButton Icon={<SendAction />} label={t('home.label.send')} onClick={onSendClick} />
+        <ActionButton Icon={<ArrowDownCircle />} label={t('home.label.receive')} onClick={onReceiveClick} />
+      </Flex>
+    </Flex>
+  )
+})
diff --git a/apps/extension/src/app/features/home/PortfolioHeader.tsx b/apps/extension/src/app/features/home/PortfolioHeader.tsx
new file mode 100644
index 00000000000..c9efe806e00
--- /dev/null
+++ b/apps/extension/src/app/features/home/PortfolioHeader.tsx
@@ -0,0 +1,200 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { memo, useEffect, useState } from 'react'
+import { useDappContext } from 'src/app/features/dapp/DappContext'
+import { useDappConnectedAccounts } from 'src/app/features/dapp/hooks'
+import { SwitchNetworksModal } from 'src/app/features/home/SwitchNetworksModal'
+import { ConnectPopupContent } from 'src/app/features/popups/ConnectPopup'
+import { selectPopupState } from 'src/app/features/popups/selectors'
+import { PopupName, closePopup, openPopup } from 'src/app/features/popups/slice'
+import { AppRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { useAppDispatch, useAppSelector } from 'src/store/store'
+import { Circle, Flex, Image, Popover, Text, TouchableArea } from 'ui/src'
+import { animationPresets } from 'ui/src/animations'
+import { CopyAlt, Globe, RotatableChevron, Settings } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { ElementName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
+import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { AnimatedUnitagDisplayName } from 'wallet/src/components/accounts/AnimatedUnitagDisplayName'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
+import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+
+const POPUP_SHADOW_RADIUS = 4
+
+type PortfolioHeaderProps = {
+  address: Address
+}
+
+export const PortfolioHeader = memo(function _PortfolioHeader({ address }: PortfolioHeaderProps): JSX.Element {
+  const dispatch = useAppDispatch()
+
+  const displayName = useDisplayName(address)
+  const { avatar } = useAvatar(address)
+  const walletHasName = displayName && displayName?.type !== DisplayNameType.Address
+  const formattedAddress = sanitizeAddressText(shortenAddress(address))
+  const { isOpen: isPopupOpen } = useAppSelector(selectPopupState(PopupName.Connect))
+
+  // Used to delay popup showing on initial render, which leads to improper anchoring
+  const [initialized, setInitialized] = useState(false)
+  useEffect(() => {
+    setTimeout(() => setInitialized(true), 100)
+  }, [])
+
+  const onPressAccount = async (): Promise<void> => {
+    dispatch(closePopup(PopupName.Connect))
+    navigate(AppRoutes.AccountSwitcher)
+  }
+
+  const { isConnected, lastChainId, dappUrl, dappIconUrl } = useDappContext()
+  const connectedAccounts = useDappConnectedAccounts(dappUrl)
+  const showConnectionStatus = isConnected || dappUrl.startsWith('http://') || dappUrl.startsWith('https://')
+
+  const toggleConnectPopup = (): void => {
+    if (isPopupOpen) {
+      dispatch(closePopup(PopupName.Connect))
+    } else {
+      dispatch(openPopup(PopupName.Connect))
+    }
+  }
+
+  const onClosePopup = (): void => {
+    dispatch(closePopup(PopupName.Connect))
+  }
+
+  const onPressCopyAddress = async (): Promise<void> => {
+    if (address) {
+      await setClipboard(address)
+      dispatch(
+        pushNotification({
+          type: AppNotificationType.Copied,
+          copyType: CopyNotificationType.Address,
+        }),
+      )
+      sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+        element: ElementName.CopyAddress,
+        screen: ExtensionScreens.Home,
+      })
+    }
+  }
+
+  return (
+    <Flex gap="$spacing8">
+      <Flex row justifyContent="space-between">
+        <TouchableArea pressStyle={{ scale: 0.95 }} onPress={onPressAccount}>
+          <Flex group row alignItems="center" gap="$spacing4">
+            <Flex $group-hover={{ opacity: 0.6 }}>
+              <AccountIcon address={address} avatarUri={avatar} size={iconSizes.icon48} />
+            </Flex>
+            <Flex $group-hover={{ opacity: 1 }} opacity={0}>
+              <RotatableChevron color="$neutral3" direction="down" height={iconSizes.icon20} width={iconSizes.icon20} />
+            </Flex>
+          </Flex>
+        </TouchableArea>
+        <Flex row alignItems="center" gap="$spacing4" justifyContent="space-around">
+          {showConnectionStatus && (
+            <Popover
+              offset={10}
+              open={initialized && isPopupOpen}
+              stayInFrame={{ padding: 10 }}
+              onOpenChange={(open) => {
+                if (!open) {
+                  // Used to close the popup when the user clicks outside of it
+                  onClosePopup()
+                }
+              }}
+            >
+              <Popover.Trigger onPress={toggleConnectPopup}>
+                <TouchableArea hoverable borderRadius="$roundedFull" p="$spacing8">
+                  <ConnectionStatusIcon dappIconUrl={dappIconUrl} isConnected={isConnected} lastChainId={lastChainId} />
+                </TouchableArea>
+              </Popover.Trigger>
+              <Popover.Content
+                animation="quicker"
+                borderColor="$surface2"
+                borderRadius="$rounded20"
+                borderWidth={1}
+                disableRemoveScroll={false}
+                zIndex="$default"
+                {...animationPresets.fadeInDownOutUp}
+                shadowColor="$shadowColor"
+                shadowRadius={POPUP_SHADOW_RADIUS}
+              >
+                <Popover.Arrow backgroundColor="transparent" />
+                {isConnected ? (
+                  <SwitchNetworksModal />
+                ) : (
+                  <ConnectPopupContent
+                    asPopover
+                    showConnectButton={connectedAccounts.length > 0 && !isConnected}
+                    onClose={(): void => onClosePopup()}
+                  />
+                )}
+              </Popover.Content>
+            </Popover>
+          )}
+          <TouchableArea
+            hoverable
+            borderRadius="$roundedFull"
+            p="$spacing8"
+            onPress={(): void => navigate('/settings')}
+          >
+            <Settings color="$neutral2" size="$icon.20" />
+          </TouchableArea>
+        </Flex>
+      </Flex>
+      <Flex row alignItems="center">
+        {walletHasName ? (
+          <AnimatedUnitagDisplayName address={address} displayName={displayName} />
+        ) : (
+          <TouchableArea testID="account-header/address-only" onPress={onPressCopyAddress}>
+            <Flex centered row shrink gap="$spacing4">
+              <Text adjustsFontSizeToFit color="$neutral1" numberOfLines={1} variant="subheading1">
+                {formattedAddress}
+              </Text>
+              <CopyAlt color="$neutral3" size="$icon.16" />
+            </Flex>
+          </TouchableArea>
+        )}
+      </Flex>
+    </Flex>
+  )
+})
+
+function ConnectionStatusIcon({
+  isConnected,
+  lastChainId,
+  dappIconUrl,
+}: {
+  isConnected: boolean
+  lastChainId?: WalletChainId
+  dappIconUrl?: string
+}): JSX.Element {
+  const isConnectedToNetwork = isConnected && lastChainId
+  return isConnectedToNetwork ? (
+    <Flex>
+      <Image height={iconSizes.icon20} resizeMode="contain" source={{ uri: dappIconUrl }} width={iconSizes.icon20} />
+
+      <Flex backgroundColor="$surface2" borderRadius="$roundedFull" position="absolute" right={8} top={-3}>
+        <Circle
+          backgroundColor="$statusSuccess"
+          borderColor="$surface1"
+          borderWidth={2}
+          height={iconSizes.icon12}
+          mr="$spacing8"
+          position="absolute"
+          width={iconSizes.icon12}
+          zIndex="$popover"
+        />
+      </Flex>
+    </Flex>
+  ) : (
+    <Globe color="$neutral2" size="$icon.20" />
+  )
+}
diff --git a/apps/extension/src/app/features/home/SwitchNetworksModal.tsx b/apps/extension/src/app/features/home/SwitchNetworksModal.tsx
new file mode 100644
index 00000000000..4a43f48be4f
--- /dev/null
+++ b/apps/extension/src/app/features/home/SwitchNetworksModal.tsx
@@ -0,0 +1,109 @@
+import { useTranslation } from 'react-i18next'
+import { useDappContext } from 'src/app/features/dapp/DappContext'
+import { removeDappConnection, saveDappChain } from 'src/app/features/dapp/actions'
+import { useDappLastChainId } from 'src/app/features/dapp/hooks'
+import { extractUrlHost } from 'src/app/features/dappRequests/utils'
+import { PopupName, closePopup } from 'src/app/features/popups/slice'
+import { useAppDispatch } from 'src/store/store'
+import { Anchor, Button, Flex, Popover, Separator, Text, getTokenValue } from 'ui/src'
+import { Check, Power } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { NetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
+import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { WALLET_SUPPORTED_CHAIN_IDS, WalletChainId } from 'uniswap/src/types/chains'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+
+export function SwitchNetworksModal(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const { dappUrl, dappIconUrl } = useDappContext()
+  const activeWalletAccount = useActiveAccountWithThrow()
+  const activeChain = useDappLastChainId(dappUrl)
+
+  const onNetworkClicked = async (chainId: WalletChainId): Promise<void> => {
+    await saveDappChain(dappUrl, chainId)
+    sendAnalyticsEvent(ExtensionEventName.SidebarSwitchChain, {
+      previousChainId: activeChain,
+      newChainId: chainId,
+    })
+  }
+
+  const onDisconnect = async (): Promise<void> => {
+    await removeDappConnection(dappUrl, activeWalletAccount)
+    dispatch(pushNotification({ type: AppNotificationType.DappDisconnected, dappIconUrl }))
+    dispatch(closePopup(PopupName.Connect))
+    sendAnalyticsEvent(ExtensionEventName.SidebarDisconnect)
+  }
+
+  return (
+    <Flex
+      alignContent="center"
+      // TODO:  update background color to blurry scrim when available
+      backgroundColor="$surface1"
+      borderRadius="$rounded24"
+      pt="$spacing8"
+      width={220}
+    >
+      <Flex px="$spacing8">
+        <Text variant="subheading2">{t('extension.connection.titleConnected')}</Text>
+        {dappUrl ? (
+          <Anchor color="$accent1" href={dappUrl} textDecorationLine="none">
+            <Flex>
+              <Text color="$accent1" numberOfLines={1} variant="buttonLabel4">
+                {extractUrlHost(dappUrl)}
+              </Text>
+            </Flex>
+          </Anchor>
+        ) : null}
+      </Flex>
+
+      <Separator mb="$spacing4" mt="$spacing8" />
+
+      {WALLET_SUPPORTED_CHAIN_IDS.map((chain: WalletChainId) => {
+        return (
+          <Popover.Close asChild>
+            <Button
+              key={chain}
+              borderRadius="$rounded12"
+              justifyContent="space-between"
+              px="$spacing8"
+              py="$spacing8"
+              theme={null}
+              onPress={async (): Promise<void> => onNetworkClicked(chain)}
+            >
+              <Flex grow row alignItems="center" justifyContent="flex-start">
+                <Flex grow row alignItems="center" gap="$spacing8">
+                  <NetworkLogo chainId={chain} size={iconSizes.icon20} />
+                  <Text color="$neutral1" variant="subheading2">
+                    {UNIVERSE_CHAIN_INFO[chain]?.label}
+                  </Text>
+                </Flex>
+                {activeChain === chain ? (
+                  <Flex row>
+                    <Check color="$neutral2" size={iconSizes.icon20} />
+                  </Flex>
+                ) : null}
+              </Flex>
+            </Button>
+          </Popover.Close>
+        )
+      })}
+
+      <Popover.Close asChild>
+        <Button mt="$spacing8" size="small" theme="tertiary" onPress={onDisconnect}>
+          <Flex centered row gap="$spacing8">
+            <Power color="$neutral1" size={getTokenValue('$icon.16')} />
+            {/* TODO(EXT-207 / EXT-208): fix button component styling and derive text color from theme */}{' '}
+            <Text color="$neutral1" variant="buttonLabel3">
+              {t('common.button.disconnect')}
+            </Text>
+          </Flex>
+        </Button>
+      </Popover.Close>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/home/TokenBalanceList.tsx b/apps/extension/src/app/features/home/TokenBalanceList.tsx
new file mode 100644
index 00000000000..5b8f069107f
--- /dev/null
+++ b/apps/extension/src/app/features/home/TokenBalanceList.tsx
@@ -0,0 +1,189 @@
+import { SharedEventName } from '@uniswap/analytics-events'
+import { PropsWithChildren, memo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useInterfaceBuyNavigator } from 'src/app/features/for/utils'
+import { AppRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { AnimatePresence, ContextMenu, Flex, Loader } from 'ui/src'
+import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
+import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
+import { ElementName, SectionName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { HiddenTokensRow } from 'wallet/src/features/portfolio/HiddenTokensRow'
+import { PortfolioEmptyState } from 'wallet/src/features/portfolio/PortfolioEmptyState'
+import { TokenBalanceItem } from 'wallet/src/features/portfolio/TokenBalanceItem'
+import {
+  HIDDEN_TOKEN_BALANCES_ROW,
+  TokenBalanceListContextProvider,
+  TokenBalanceListRow,
+  useTokenBalanceListContext,
+} from 'wallet/src/features/portfolio/TokenBalanceListContext'
+import { useTokenContextMenu } from 'wallet/src/features/portfolio/useTokenContextMenu'
+
+const MIN_CONTEXT_MENU_WIDTH = 200
+
+type TokenBalanceListProps = {
+  owner: Address
+}
+
+export const TokenBalanceList = memo(function _TokenBalanceList({ owner }: TokenBalanceListProps): JSX.Element {
+  const { navigateToTokenDetails } = useWalletNavigation()
+
+  const onPressToken = (currencyId: string): void => {
+    sendAnalyticsEvent(SharedEventName.ELEMENT_CLICKED, {
+      element: ElementName.TokenItem,
+      section: SectionName.HomeTokensTab,
+    })
+    navigateToTokenDetails(currencyId)
+  }
+
+  return (
+    <Flex grow>
+      <TokenBalanceListContextProvider isExternalProfile={false} owner={owner} onPressToken={onPressToken}>
+        <TokenBalanceListInner />
+      </TokenBalanceListContextProvider>
+    </Flex>
+  )
+})
+
+export function TokenBalanceListInner(): JSX.Element {
+  const { t } = useTranslation()
+
+  const { rows, balancesById, networkStatus, refetch, hiddenTokensExpanded } = useTokenBalanceListContext()
+  const onPressBuy = useInterfaceBuyNavigator(ElementName.EmptyStateBuy)
+
+  const visible: string[] = []
+  const hidden: string[] = []
+
+  let isHidden = false
+  for (const row of rows) {
+    const target = isHidden ? hidden : visible
+    target.push(row)
+    // do this after pushing so we keep our Hidden header row in the visible section
+    // so users can see it when closed and re-open it
+    if (row === HIDDEN_TOKEN_BALANCES_ROW) {
+      isHidden = true
+    }
+  }
+
+  const onPressReceive = (): void => {
+    navigate(AppRoutes.Receive)
+  }
+
+  return (
+    <Flex>
+      {!balancesById ? (
+        isNonPollingRequestInFlight(networkStatus) ? (
+          <Flex>
+            <Loader.Token withPrice repeat={6} />
+          </Flex>
+        ) : (
+          <Flex fill grow justifyContent="center" pt="$spacing48" px="$spacing36">
+            <BaseCard.ErrorState
+              retryButtonLabel={t('common.button.retry')}
+              title={t('home.tokens.error.load')}
+              onRetry={(): void | undefined => refetch?.()}
+            />
+          </Flex>
+        )
+      ) : rows.length === 0 ? (
+        <PortfolioEmptyState onPressBuy={onPressBuy} onPressReceive={onPressReceive} />
+      ) : (
+        <>
+          <TokenBalanceItems rows={visible} />
+          <AnimatePresence initial={false}>
+            {hiddenTokensExpanded && <TokenBalanceItems animated rows={hidden} />}
+          </AnimatePresence>
+        </>
+      )}
+    </Flex>
+  )
+}
+
+const TokenBalanceItems = ({ animated, rows }: { animated?: boolean; rows: string[] }): JSX.Element => {
+  return (
+    <Flex
+      {...(animated && {
+        animation: 'quick',
+        enterStyle: { opacity: 0, y: -10 },
+        exitStyle: { opacity: 0, y: -10 },
+      })}
+    >
+      {rows?.map((balance: TokenBalanceListRow) => {
+        return <TokenBalanceItemRow key={balance} item={balance} />
+      })}
+    </Flex>
+  )
+}
+
+const TokenBalanceItemRow = memo(function TokenBalanceItemRow({ item }: { item: TokenBalanceListRow }) {
+  const {
+    balancesById,
+    hiddenTokensCount,
+    hiddenTokensExpanded,
+    isWarmLoading,
+    onPressToken,
+    setHiddenTokensExpanded,
+  } = useTokenBalanceListContext()
+
+  if (item === HIDDEN_TOKEN_BALANCES_ROW) {
+    return (
+      <HiddenTokensRow
+        isExpanded={hiddenTokensExpanded}
+        numHidden={hiddenTokensCount}
+        onPress={(): void => {
+          setHiddenTokensExpanded(!hiddenTokensExpanded)
+        }}
+      />
+    )
+  }
+
+  const portfolioBalance = balancesById?.[item]
+
+  if (!portfolioBalance) {
+    // This can happen when the view is out of focus and the user sells/sends 100% of a token's balance.
+    // In that case, the token is removed from the `balancesById` object, but the FlatList is still using the cached array of IDs until the view comes back into focus.
+    // As soon as the view comes back into focus, the FlatList will re-render with the latest data, so users won't really see this Skeleton for more than a few milliseconds when this happens.
+    return (
+      <Flex px="$spacing8">
+        <Loader.Token />
+      </Flex>
+    )
+  }
+
+  return (
+    <TokenContextMenu portfolioBalance={portfolioBalance}>
+      <TokenBalanceItem isLoading={isWarmLoading} portfolioBalance={portfolioBalance} onPressToken={onPressToken} />
+    </TokenContextMenu>
+  )
+})
+
+function TokenContextMenu({
+  children,
+  portfolioBalance,
+}: PropsWithChildren<{
+  portfolioBalance: PortfolioBalance
+}>): JSX.Element {
+  const contextMenu = useTokenContextMenu({
+    currencyId: portfolioBalance.currencyInfo.currencyId,
+    tokenSymbolForNotification: portfolioBalance?.currencyInfo?.currency?.symbol,
+    portfolioBalance,
+  })
+
+  const menuOptions = contextMenu.menuActions.map((action) => ({
+    label: action.title,
+    onPress: action.onPress,
+    Icon: action.Icon,
+    destructive: action.destructive,
+  }))
+
+  const itemId = `${portfolioBalance.currencyInfo.currencyId}-${portfolioBalance.isHidden}`
+
+  return (
+    <ContextMenu itemId={itemId} menuOptions={menuOptions} menuStyleProps={{ minWidth: MIN_CONTEXT_MENU_WIDTH }}>
+      {children}
+    </ContextMenu>
+  )
+}
diff --git a/apps/extension/src/app/features/lockScreen/Locked.tsx b/apps/extension/src/app/features/lockScreen/Locked.tsx
new file mode 100644
index 00000000000..61ebbe0baa9
--- /dev/null
+++ b/apps/extension/src/app/features/lockScreen/Locked.tsx
@@ -0,0 +1,256 @@
+import { useCallback, useLayoutEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Input } from 'src/app/components/Input'
+import { PasswordInput } from 'src/app/components/PasswordInput'
+import { BottomModalProps, InfoModal } from 'src/app/components/modal/InfoModal'
+import { useSagaStatus } from 'src/app/hooks/useSagaStatus'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { focusOrCreateOnboardingTab } from 'src/app/navigation/utils'
+import { useAppDispatch } from 'src/store/store'
+import { Button, Flex, InputProps, Text, TouchableArea } from 'ui/src'
+import { AlertTriangle, Lock } from 'ui/src/components/icons'
+import { spacing, zIndices } from 'ui/src/theme'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { LandingBackground } from 'wallet/src/components/landing/LandingBackground'
+import { authActions, authSagaName } from 'wallet/src/features/auth/saga'
+import { AuthActionType, AuthSagaError } from 'wallet/src/features/auth/types'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { SagaStatus } from 'wallet/src/utils/saga'
+
+export function usePasswordInput(defaultValue = ''): Pick<InputProps, 'onChangeText' | 'disabled'> & { value: string } {
+  const [value, setValue] = useState(defaultValue)
+
+  const onChangeText: InputProps['onChangeText'] = (newValue): void => {
+    setValue(newValue)
+  }
+
+  return {
+    value,
+    disabled: !value,
+    onChangeText,
+  }
+}
+
+enum ForgotPasswordModalStep {
+  Initial,
+  Speedbump,
+}
+
+const CONTAINER_PADDING_TOP_MIN = 50
+const CONTAINER_PADDING_TOP_MAX = 220
+const BACKGROUND_CIRCLE_INNER_SIZE = 140
+const BACKGROUND_CIRCLE_OUTER_SIZE = 250
+
+export function Locked(): JSX.Element {
+  const dispatch = useAppDispatch()
+  const { t } = useTranslation()
+  const { value: enteredPassword, onChangeText: onChangePasswordText } = usePasswordInput()
+  const associatedAccounts = useSignerAccounts()
+
+  const onChangeText = useCallback(
+    (text: string) => {
+      if (onChangePasswordText) {
+        onChangePasswordText?.(text)
+      }
+    },
+    [onChangePasswordText],
+  )
+
+  const { status, error } = useSagaStatus(authSagaName, undefined, false)
+
+  const onPress = async (): Promise<void> => {
+    await dispatch(
+      authActions.trigger({
+        type: AuthActionType.Unlock,
+        password: enteredPassword,
+      }),
+    )
+  }
+
+  const [forgotPasswordModalOpen, setForgotPasswordModalOpen] = useState(false)
+  const [modalStep, setModalStep] = useState(ForgotPasswordModalStep.Initial)
+  const scantasticOnboardingOnly = useFeatureFlag(FeatureFlags.ScantasticOnboardingOnly)
+
+  const openRecoveryTab = (): Promise<void> =>
+    focusOrCreateOnboardingTab(
+      `${TopLevelRoutes.Onboarding}/${scantasticOnboardingOnly ? OnboardingRoutes.ResetScan : OnboardingRoutes.Reset}`,
+    )
+
+  const onStartResettingWallet = async (): Promise<void> => {
+    const currAccount = associatedAccounts[0]
+
+    if (currAccount?.mnemonicId) {
+      await Keyring.removeMnemonic(currAccount?.mnemonicId)
+    }
+    await Keyring.removePassword()
+
+    // We open the recovery tab before removing the accounts so that the proper reset route is loaded.
+    // Otherwise, the main onboarding route is automatically loaded when accounts are all removed, and then a duplicate recovery tab is opened.
+    // The standard onboarding open logic triggers but doesn't update the path because the generic one doesn't have a path specified.
+    await openRecoveryTab()
+
+    await dispatch(
+      editAccountActions.trigger({
+        type: EditAccountAction.Remove,
+        accounts: associatedAccounts,
+      }),
+    )
+  }
+
+  const isIncorrectPassword = status === SagaStatus.Failure && error === AuthSagaError.InvalidPassword
+
+  const inputRef = useRef<Input>(null)
+  const [hideInput, setHideInput] = useState(true)
+  const toggleHideInput = (): void => setHideInput(!hideInput)
+
+  useLayoutEffect(() => {
+    if (isIncorrectPassword) {
+      inputRef.current?.focus()
+    }
+  }, [isIncorrectPassword])
+
+  const modalProps: Record<ForgotPasswordModalStep, BottomModalProps> = {
+    [ForgotPasswordModalStep.Initial]: {
+      buttonText: t('extension.lock.button.reset'),
+      description: t('extension.lock.password.reset.initial.description'),
+      linkText: t('extension.lock.password.reset.initial.help'),
+      linkUrl: uniswapUrls.helpArticleUrls.recoveryPhraseHowToFind,
+      icon: (
+        <Flex backgroundColor="$surface2" borderRadius="$rounded12" p="$spacing12">
+          <Lock color="$neutral1" size="$icon.24" />
+        </Flex>
+      ),
+      isOpen: forgotPasswordModalOpen,
+      name: ModalName.ForgotPassword,
+      onButtonPress: (): void => setModalStep(ForgotPasswordModalStep.Speedbump),
+      title: t('extension.lock.password.reset.initial.title'),
+    },
+    [ForgotPasswordModalStep.Speedbump]: {
+      buttonText: t('common.button.continue'),
+      description: t('extension.lock.password.reset.speedbump.description'),
+      linkText: t('extension.lock.password.reset.speedbump.help'),
+      linkUrl: uniswapUrls.helpArticleUrls.recoveryPhraseForgotten,
+      icon: (
+        <Flex backgroundColor="$DEP_accentCriticalSoft" borderRadius="$rounded12" p="$spacing12">
+          <AlertTriangle color="$statusCritical" size="$icon.24" />
+        </Flex>
+      ),
+      isOpen: forgotPasswordModalOpen,
+      name: ModalName.ForgotPassword,
+      onButtonPress: onStartResettingWallet,
+      title: t('extension.lock.password.reset.speedbump.title'),
+    },
+  }
+
+  const [inputHeight, setInputHeight] = useState(0)
+  const [containerPaddingTop, setContainerPaddingTop] = useState(CONTAINER_PADDING_TOP_MAX)
+  const [availableHeight, setAvailableHeight] = useState(0)
+
+  useLayoutEffect(() => {
+    if (availableHeight && inputHeight) {
+      const containerHeight = inputHeight + spacing.spacing32
+      const newPaddingTop = Math.min(
+        Math.max(CONTAINER_PADDING_TOP_MIN, availableHeight - containerHeight),
+        CONTAINER_PADDING_TOP_MAX,
+      )
+
+      setContainerPaddingTop(newPaddingTop)
+    }
+  }, [availableHeight, inputHeight])
+
+  return (
+    <>
+      <Flex fill gap="$spacing12" overflow="hidden" p="$spacing24">
+        <Flex fill width="100%" onLayout={(e) => setAvailableHeight(e.nativeEvent.layout.height)}>
+          <Flex pb="$spacing60" pt={containerPaddingTop}>
+            <LandingBackground
+              elementsStyle={{ filter: 'blur(2px)', transform: 'translate(0, 20px)' }}
+              innerCircleSize={BACKGROUND_CIRCLE_INNER_SIZE}
+              outerCircleSize={BACKGROUND_CIRCLE_OUTER_SIZE}
+            />
+          </Flex>
+          <Flex
+            gap="$spacing24"
+            width="100%"
+            zIndex={zIndices.default}
+            onLayout={(e) => setInputHeight(e.nativeEvent.layout.height)}
+          >
+            <Flex>
+              <Text color="$neutral1" textAlign="center" variant="subheading1">
+                {t('extension.lock.title')}
+              </Text>
+
+              <Text color="$neutral2" textAlign="center" variant="subheading2">
+                {t('extension.lock.subtitle')}
+              </Text>
+            </Flex>
+
+            <Flex alignItems="stretch" gap="$spacing12" width="100%">
+              <PasswordInput
+                ref={inputRef}
+                autoFocus
+                hideInput={hideInput}
+                placeholder={t('common.input.password.placeholder')}
+                value={enteredPassword}
+                onChangeText={onChangeText}
+                onSubmitEditing={onPress}
+                onToggleHideInput={toggleHideInput}
+              />
+
+              <Flex
+                style={{
+                  visibility: isIncorrectPassword ? 'visible' : 'hidden',
+                }}
+              >
+                <Text color="$statusCritical" textAlign="center" variant="body3">
+                  {t('extension.lock.password.error')}
+                </Text>
+              </Flex>
+            </Flex>
+          </Flex>
+        </Flex>
+
+        <Flex gap="$spacing12" justifyContent="flex-end" zIndex={zIndices.sticky}>
+          <Button size="large" theme="primary" onPress={onPress}>
+            {t('extension.lock.button.submit')}
+          </Button>
+
+          <TouchableArea>
+            <Text
+              color="$neutral3"
+              hoverStyle={{ color: '$neutral2' }}
+              textAlign="center"
+              variant="body2"
+              onPress={(): void => setForgotPasswordModalOpen(true)}
+            >
+              {t('extension.lock.button.forgot')}
+            </Text>
+          </TouchableArea>
+        </Flex>
+      </Flex>
+
+      <InfoModal
+        showCloseButton
+        buttonText={modalProps[modalStep].buttonText}
+        buttonTheme="tertiary"
+        description={modalProps[modalStep].description}
+        icon={modalProps[modalStep].icon}
+        isOpen={forgotPasswordModalOpen}
+        linkText={modalProps[modalStep].linkText}
+        linkUrl={modalProps[modalStep].linkUrl}
+        name={ModalName.ForgotPassword}
+        title={modalProps[modalStep].title}
+        onButtonPress={modalProps[modalStep].onButtonPress}
+        onDismiss={(): void => {
+          setModalStep(ForgotPasswordModalStep.Initial)
+          setForgotPasswordModalOpen(false)
+        }}
+      />
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/notifications/NotificationToastWrapper.tsx b/apps/extension/src/app/features/notifications/NotificationToastWrapper.tsx
new file mode 100644
index 00000000000..5bfb74defb2
--- /dev/null
+++ b/apps/extension/src/app/features/notifications/NotificationToastWrapper.tsx
@@ -0,0 +1,36 @@
+import { DappConnectedNotification } from 'wallet/src/features/notifications/components/DappConnectedNotification'
+import { DappDisconnectedNotification } from 'wallet/src/features/notifications/components/DappDisconnectedNotification'
+import { NotSupportedNetworkNotification } from 'wallet/src/features/notifications/components/NotSupportedNetworkNotification'
+import { PasswordChangedNotification } from 'wallet/src/features/notifications/components/PasswordChangedNotification'
+import { SharedNotificationToastRouter } from 'wallet/src/features/notifications/components/SharedNotificationToastRouter'
+import { selectActiveAccountNotifications } from 'wallet/src/features/notifications/selectors'
+import { AppNotification, AppNotificationType } from 'wallet/src/features/notifications/types'
+import { useAppSelector } from 'wallet/src/state'
+
+export function NotificationToastWrapper(): JSX.Element | null {
+  const notifications = useAppSelector(selectActiveAccountNotifications)
+  const notification = notifications?.[0]
+
+  if (!notification) {
+    return null
+  }
+
+  return <NotificationToastRouter notification={notification} />
+}
+
+function NotificationToastRouter({ notification }: { notification: AppNotification }): JSX.Element | null {
+  // Insert Extension-only notifications here.
+  // Shared wallet notifications should go in SharedNotificationToastRouter.
+  switch (notification.type) {
+    case AppNotificationType.DappConnected:
+      return <DappConnectedNotification notification={notification} />
+    case AppNotificationType.NotSupportedNetwork:
+      return <NotSupportedNetworkNotification notification={notification} />
+    case AppNotificationType.DappDisconnected:
+      return <DappDisconnectedNotification notification={notification} />
+    case AppNotificationType.PasswordChanged:
+      return <PasswordChangedNotification notification={notification} />
+  }
+
+  return <SharedNotificationToastRouter notification={notification} />
+}
diff --git a/apps/extension/src/app/features/onboarding/Complete.tsx b/apps/extension/src/app/features/onboarding/Complete.tsx
new file mode 100644
index 00000000000..dc13162a5e3
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/Complete.tsx
@@ -0,0 +1,88 @@
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { KeyboardKey } from 'src/app/features/onboarding/KeyboardKey'
+import { MainContentWrapper } from 'src/app/features/onboarding/intro/MainContentWrapper'
+import { useOpeningKeyboardShortCut } from 'src/app/hooks/useOpeningKeyboardShortCut'
+import { getCurrentTabAndWindowId } from 'src/app/navigation/utils'
+import { onboardingMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { OnboardingMessageType } from 'src/background/messagePassing/types/ExtensionMessages'
+import { openSidePanel } from 'src/background/utils/chromeSidePanelUtils'
+import { terminateStoreSynchronization } from 'src/store/storeSynchronization'
+import { Button, Flex, Image, Text } from 'ui/src'
+import { UNISWAP_LOGO } from 'ui/src/assets'
+import { RightArrow } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { ExtensionOnboardingFlow } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+import { useFinishOnboarding } from 'wallet/src/features/onboarding/OnboardingContext'
+
+export function Complete({ flow }: { flow?: ExtensionOnboardingFlow }): JSX.Element {
+  const { t } = useTranslation()
+
+  const [openedSideBar, setOpenedSideBar] = useState(false)
+
+  // Activates onboarding accounts on component mount
+  useFinishOnboarding(terminateStoreSynchronization, flow)
+
+  useEffect(() => {
+    const onSidebarOpenedListener = onboardingMessageChannel.addMessageListener(
+      OnboardingMessageType.SidebarOpened,
+      (_message) => {
+        setOpenedSideBar(true)
+      },
+    )
+    return () => {
+      onboardingMessageChannel.removeMessageListener(OnboardingMessageType.SidebarOpened, onSidebarOpenedListener)
+    }
+  }, [])
+
+  const handleOpenWebApp = async (): Promise<void> => {
+    window.location.href = uniswapUrls.webInterfaceSwapUrl
+  }
+
+  const handleOpenSidebar = async (): Promise<void> => {
+    try {
+      const { tabId, windowId } = await getCurrentTabAndWindowId()
+      await openSidePanel(tabId, windowId)
+    } catch (error) {
+      logger.error(error, {
+        tags: { file: 'onboarding/Complete.tsx', function: 'handleOpenSidebar' },
+      })
+    }
+  }
+
+  const keys = useOpeningKeyboardShortCut(openedSideBar)
+
+  return (
+    <MainContentWrapper>
+      <Flex alignItems="center">
+        <Flex alignItems="center" gap="$spacing24" justifyContent="center">
+          <Flex alignItems="center" gap="$spacing12" justifyContent="center">
+            <Image height={iconSizes.icon64} source={UNISWAP_LOGO} width={iconSizes.icon64} />
+            <Text color="$neutral1" variant="heading3">
+              {t('onboarding.complete.title')}
+            </Text>
+            <Text color="$neutral2" px="$spacing36" textAlign="center" variant="body3">
+              {t('onboarding.complete.description')}
+            </Text>
+          </Flex>
+          <Flex row alignItems="center" gap="$spacing20" justifyContent="space-between" mb="$spacing48" mt="$spacing24">
+            {keys.map((key) => (
+              <KeyboardKey key={key.title} fontSize={key.fontSize} px={key.px} state={key.state} title={key.title} />
+            ))}
+          </Flex>
+          <Button
+            iconAfter={openedSideBar ? <RightArrow /> : undefined}
+            size="large"
+            theme={openedSideBar ? 'primary' : 'secondary'}
+            width="100%"
+            onPress={openedSideBar ? handleOpenWebApp : handleOpenSidebar}
+          >
+            {openedSideBar ? t('onboarding.complete.go_to_uniswap') : t('onboarding.complete.button')}
+          </Button>
+        </Flex>
+      </Flex>
+    </MainContentWrapper>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/KeyboardKey.test.tsx b/apps/extension/src/app/features/onboarding/KeyboardKey.test.tsx
new file mode 100644
index 00000000000..04692bdea3a
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/KeyboardKey.test.tsx
@@ -0,0 +1,33 @@
+import { KeyboardKey } from 'src/app/features/onboarding/KeyboardKey'
+import { State } from 'src/app/hooks/useOpeningKeyboardShortCut'
+import { cleanup, render, screen } from 'src/test/test-utils'
+
+describe('KeyboardKey Component', () => {
+  it('renders correctly with state KeyUp', () => {
+    const { container } = render(<KeyboardKey fontSize={28} px="$spacing28" state={State.KeyUp} title="Shift" />)
+    expect(container).toMatchSnapshot()
+  })
+
+  it('renders correctly with state KeyDown', () => {
+    const { container } = render(<KeyboardKey fontSize={28} px="$spacing28" state={State.KeyDown} title="Shift" />)
+    expect(container).toMatchSnapshot()
+  })
+
+  it('renders correctly with state Highlighted', () => {
+    const { container } = render(<KeyboardKey fontSize={28} px="$spacing28" state={State.Highlighted} title="Shift" />)
+    expect(container).toMatchSnapshot()
+    cleanup()
+  })
+
+  it('displays the command symbol for Meta key on macOS', () => {
+    render(<KeyboardKey fontSize={41} px="$spacing16" state={State.KeyUp} title="Meta" />)
+    expect(screen.getByText('⌘')).toBeDefined()
+    cleanup()
+  })
+
+  it('displays the correct title for other keys', () => {
+    render(<KeyboardKey fontSize={41} px="$spacing20" state={State.KeyUp} title="U" />)
+    expect(screen.getByText('U')).toBeDefined()
+    cleanup()
+  })
+})
diff --git a/apps/extension/src/app/features/onboarding/KeyboardKey.tsx b/apps/extension/src/app/features/onboarding/KeyboardKey.tsx
new file mode 100644
index 00000000000..e77deaba5bf
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/KeyboardKey.tsx
@@ -0,0 +1,40 @@
+import { Flex, Text } from 'ui/src'
+const SHADOW_OFFSET = { width: 0, height: 7 }
+const MAC_OS_COMMAND_SYMBOL = '⌘'
+const KEY_HEIGHT = 70
+
+enum State {
+  KeyUp,
+  KeyDown,
+  Highlighted,
+}
+
+export interface KeyboardKeyProps {
+  title: string
+  px: React.ComponentProps<typeof Flex>['px']
+  fontSize: React.ComponentProps<typeof Text>['fontSize']
+  state: State
+}
+
+export function KeyboardKey({ title, px, fontSize, state }: KeyboardKeyProps): JSX.Element {
+  return (
+    <Flex
+      alignItems="center"
+      backgroundColor="$surface1"
+      borderColor={state === State.KeyUp ? '$surface3' : '$accent2Hovered'}
+      borderRadius="$rounded20"
+      borderWidth="$spacing2"
+      height={KEY_HEIGHT}
+      justifyContent="center"
+      px={px}
+      shadowColor={state === State.KeyUp ? '$neutral3' : '$accent1Hovered'}
+      shadowOffset={state === State.KeyDown ? undefined : SHADOW_OFFSET}
+      shadowRadius={state === State.KeyDown ? '$spacing16' : undefined}
+      top={state === State.KeyDown ? SHADOW_OFFSET.height : undefined}
+    >
+      <Text color={state === State.KeyUp ? '$neutral2' : '$accent1'} fontSize={fontSize}>
+        {title === 'Meta' ? MAC_OS_COMMAND_SYMBOL : title}
+      </Text>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/OnboardingPaneAnimatedContents.tsx b/apps/extension/src/app/features/onboarding/OnboardingPaneAnimatedContents.tsx
new file mode 100644
index 00000000000..3f061c69ef0
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingPaneAnimatedContents.tsx
@@ -0,0 +1,34 @@
+import { Flex, styled } from 'ui/src'
+
+const SINGLE_PANE_DURATION = 200
+
+// TODO: EXT-1164 - Move Keyring methods to workers to not block main thread during onboarding
+// if exitBeforeEnter is set in the <OnboardingSteps /> AnimatePresence we are
+// running two 200ms animations sequentially - first to exit, then enter so we
+// double this constant. if we change that, needs to change here
+export const ONBOARDING_PANE_TRANSITION_DURATION = SINGLE_PANE_DURATION * 2
+export const ONBOARDING_PANE_TRANSITION_DURATION_WITH_LEEWAY = ONBOARDING_PANE_TRANSITION_DURATION + 200
+
+export const OnboardingPaneAnimatedContents = styled(Flex, {
+  animation: `${SINGLE_PANE_DURATION}ms`,
+  width: '100%',
+
+  zIndex: 1,
+  x: 0,
+  opacity: 1,
+  mx: 'auto',
+
+  variants: {
+    // note you can use _towards for implementing animations based on the direction!
+    going: (_towards: 'forward' | 'backward') => ({
+      enterStyle: {
+        opacity: 0,
+        zIndex: 1,
+      },
+      exitStyle: {
+        zIndex: 0,
+        opacity: 0,
+      },
+    }),
+  } as const,
+})
diff --git a/apps/extension/src/app/features/onboarding/OnboardingScreen.tsx b/apps/extension/src/app/features/onboarding/OnboardingScreen.tsx
new file mode 100644
index 00000000000..2f012296425
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingScreen.tsx
@@ -0,0 +1,20 @@
+import { useContext, useLayoutEffect } from 'react'
+import { OnboardingScreenProps } from 'src/app/features/onboarding/OnboardingScreenProps'
+import { OnboardingStepsContext } from 'src/app/features/onboarding/OnboardingStepsContext'
+
+export function OnboardingScreen(props: OnboardingScreenProps): null {
+  const context = useContext(OnboardingStepsContext)
+
+  useLayoutEffect(() => {
+    if (!context) {
+      return
+    }
+    context.setOnboardingScreen(props)
+    return () => {
+      context.clearOnboardingScreen(props)
+    }
+  }, [context, props])
+
+  // we hoist it up, see OnboardingSteps + OnboardingScreenFrame
+  return null
+}
diff --git a/apps/extension/src/app/features/onboarding/OnboardingScreenFrame.tsx b/apps/extension/src/app/features/onboarding/OnboardingScreenFrame.tsx
new file mode 100644
index 00000000000..e8bbd4a98c1
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingScreenFrame.tsx
@@ -0,0 +1,84 @@
+import { OnboardingScreenProps } from 'src/app/features/onboarding/OnboardingScreenProps'
+import { Button, Flex, Text, TouchableArea } from 'ui/src'
+import { BackArrow } from 'ui/src/components/icons'
+import i18n from 'uniswap/src/i18n/i18n'
+
+export function OnboardingScreenFrame({
+  Icon,
+  children,
+  nextButtonEnabled,
+  nextButtonText = i18n.t('common.button.next'),
+  nextButtonTheme = 'primary',
+  onBack,
+  onSubmit,
+  onSkip,
+  subtitle,
+  title,
+  warningSubtitle,
+}: Partial<OnboardingScreenProps>): JSX.Element {
+  if (!title) {
+    return <>{children}</>
+  }
+
+  return (
+    <>
+      <Flex alignItems="center" gap="$spacing16" pt="$spacing24">
+        {onBack && (
+          <TouchableArea
+            hoverable
+            borderRadius="$roundedFull"
+            left="$none"
+            p="$spacing4"
+            position="absolute"
+            top="$none"
+            onPress={onBack}
+          >
+            <BackArrow color="$neutral2" size="$icon.24" />
+          </TouchableArea>
+        )}
+        {onSkip && (
+          <TouchableArea
+            hoverable
+            borderRadius="$rounded8"
+            position="absolute"
+            px="$spacing8"
+            py="$spacing4"
+            right="$none"
+            top="$none"
+            onPress={onSkip}
+          >
+            <Text color="$neutral2" variant="buttonLabel3">
+              Skip
+            </Text>
+          </TouchableArea>
+        )}
+        {Icon}
+        <Flex alignItems="center" gap="$spacing4" px="$spacing24">
+          <Text textAlign="center" variant="subheading1">
+            {title}
+          </Text>
+          <Flex alignItems="center" gap="$spacing4">
+            <Text color="$neutral2" textAlign="center" variant="body3">
+              {subtitle}
+            </Text>
+            {warningSubtitle && (
+              <Text color="$statusCritical" textAlign="center" variant="body3">
+                {warningSubtitle}
+              </Text>
+            )}
+          </Flex>
+        </Flex>
+      </Flex>
+      <Flex alignItems="center" width="100%">
+        {children}
+      </Flex>
+      <Flex row gap="$spacing12" width="100%">
+        {Boolean(onSubmit) && nextButtonText && (
+          <Button disabled={!nextButtonEnabled} flexGrow={1} theme={nextButtonTheme} onPress={onSubmit}>
+            {nextButtonText}
+          </Button>
+        )}
+      </Flex>
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/OnboardingScreenProps.tsx b/apps/extension/src/app/features/onboarding/OnboardingScreenProps.tsx
new file mode 100644
index 00000000000..af3ad90dfb8
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingScreenProps.tsx
@@ -0,0 +1,17 @@
+import { ThemeNames } from 'ui/src/theme'
+
+export type OnboardingScreenProps = {
+  Icon?: JSX.Element
+  children?: JSX.Element
+  nextButtonEnabled?: boolean
+  nextButtonText?: string
+  nextButtonTheme?: ThemeNames
+  onBack?: () => void
+  onSubmit?: () => void
+  onSkip?: () => void
+  subtitle?: string
+  title: string | JSX.Element
+  warningSubtitle?: string
+  outsideContent?: JSX.Element
+  belowFrameContent?: JSX.Element
+}
diff --git a/apps/extension/src/app/features/onboarding/OnboardingSteps.tsx b/apps/extension/src/app/features/onboarding/OnboardingSteps.tsx
new file mode 100644
index 00000000000..8b5548c3482
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingSteps.tsx
@@ -0,0 +1,304 @@
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { OnboardingPaneAnimatedContents } from 'src/app/features/onboarding/OnboardingPaneAnimatedContents'
+import { OnboardingScreenFrame } from 'src/app/features/onboarding/OnboardingScreenFrame'
+import { OnboardingScreenProps } from 'src/app/features/onboarding/OnboardingScreenProps'
+import {
+  OnboardingStepsContext,
+  OnboardingStepsContextState,
+  Step,
+} from 'src/app/features/onboarding/OnboardingStepsContext'
+import { ONBOARDING_CONTENT_WIDTH, ONBOARDING_INITIAL_FRAME_HEIGHT } from 'src/app/features/onboarding/utils'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { isOnboardedSelector } from 'src/app/utils/isOnboardedSelector'
+import { AnimatePresence, Flex, styled, useWindowDimensions } from 'ui/src'
+import { useAppSelector } from 'wallet/src/state'
+
+export * from './OnboardingStepsContext'
+
+type ComponentByStep = { [key in Step]?: JSX.Element }
+type MaybeOnboardingProps = OnboardingScreenProps | null
+
+/**
+ * In this file we're doing some weird stuff because we want to keep a nice API
+ * for onboarding screens but also allow animating them, while still working
+ * with react router.
+ *
+ * AnimatePresence wants to be able to swap out old for new, but react router
+ * wants to handle that as well
+ *
+ * So we have to hoist the props of <OnboardingScreen /> up to here.
+ *
+ * But doing that could cause a re-render loop if the child component isn't
+ * careful to memoize things. So, we've implemented a little pattern here to
+ * avoid that - instead of re-rendering the entire OnboardingStepsProvider
+ * whenever a child re-renders, we instead have a simple emitter/listener we
+ * trigger (onboardingScreenListen) and we the re-render the contents in a
+ * sub-component OnboardingScreenDisplay. This way OnboardingScreenDisplay can
+ * re-render as much as it wants and it doesn't cause the child to re-render,
+ * avoiding loops!
+ */
+
+let currentOnboardingScreen: MaybeOnboardingProps = null
+const onboardingScreenListen = new Set<(step: Step, val: MaybeOnboardingProps) => void>()
+
+let clearScreenTimeout: NodeJS.Timeout
+
+export function OnboardingStepsProvider({
+  steps,
+  isResetting = false,
+  ContainerComponent = React.Fragment,
+}: {
+  steps: ComponentByStep
+  isResetting?: boolean
+  ContainerComponent?: React.ComponentType<React.PropsWithChildren>
+}): JSX.Element {
+  const isOnboarded = useAppSelector(isOnboardedSelector)
+  const wasAlreadyOnboardedWhenPageLoaded = useRef(isOnboarded)
+
+  useEffect(() => {
+    if (!isResetting && wasAlreadyOnboardedWhenPageLoaded.current) {
+      // Redirect to the intro screen screen if user is already onboarded.
+      // We only want to redirect when the page is first loaded but not immediately after the user completes onboarding.
+      navigate(`/${TopLevelRoutes.Onboarding}`, { replace: true })
+    }
+  }, [isOnboarded, isResetting])
+
+  const initialStep = Object.keys(steps)[0] as Step
+
+  if (!initialStep) {
+    throw new Error('`steps` must have at least one `step`')
+  }
+
+  const [{ step, going, onboardingScreen }, setState] = useState<{
+    onboardingScreen?: MaybeOnboardingProps
+    step: Step
+    going: 'forward' | 'backward'
+  }>({
+    step: initialStep,
+    going: 'forward',
+  })
+
+  const getCurrentStep = useRef(step)
+  getCurrentStep.current = step
+
+  const setStep = useCallback((nextStep: Step) => {
+    setState((prev) => ({ ...prev, step: nextStep }))
+  }, [])
+
+  const setOnboardingScreen = useCallback((next: OnboardingScreenProps) => {
+    clearTimeout(clearScreenTimeout)
+    setState((prev) => {
+      // we are only updating onboardingScreen here once per unique title so
+      // the state in this component is accurate, but subsequent updates go
+      // through the emitter
+      if (onboardingScreenKey(prev?.onboardingScreen) !== onboardingScreenKey(next)) {
+        return {
+          ...prev,
+          onboardingScreen: next,
+        }
+      }
+      return prev
+    })
+    onboardingScreenListen.forEach((cb) => cb(getCurrentStep.current, next))
+    currentOnboardingScreen = next
+  }, [])
+
+  const clearOnboardingScreen = useCallback((next: OnboardingScreenProps) => {
+    // delay clear so the next screen can beat clearing the old one to avoid flickering
+    clearScreenTimeout = setTimeout(() => {
+      setState((prev) => {
+        if (prev.onboardingScreen && onboardingScreenKey(prev.onboardingScreen) === onboardingScreenKey(next)) {
+          return {
+            ...prev,
+            onboardingScreen: null,
+          }
+        }
+        return prev
+      })
+    })
+  }, [])
+
+  const onboardingScreenKey = (props?: MaybeOnboardingProps): string => {
+    return `${props?.title}${props?.subtitle}${Object.keys(props || {}).join('')}`
+  }
+
+  const goToNextStep = useCallback(() => {
+    const stepIndex = Object.keys(steps).indexOf(step)
+    const nextStep = Object.keys(steps)[stepIndex + 1] as Step
+
+    if (!nextStep) {
+      throw new Error('No next step')
+    }
+
+    setState((prev) => ({
+      ...prev,
+      step: nextStep,
+      going: 'forward',
+    }))
+  }, [step, steps])
+
+  const goToPreviousStep = useCallback(() => {
+    const stepIndex = Object.keys(steps).indexOf(step)
+    const previousStep = Object.keys(steps)[stepIndex - 1] as Step
+
+    if (!previousStep) {
+      throw new Error('No previous step')
+    }
+
+    setState((prev) => ({
+      ...prev,
+      step: previousStep,
+      going: 'backward',
+    }))
+  }, [step, steps])
+
+  const state = useMemo<OnboardingStepsContextState>((): OnboardingStepsContextState => {
+    return {
+      step,
+      setStep,
+      goToNextStep,
+      setOnboardingScreen,
+      clearOnboardingScreen,
+      goToPreviousStep,
+      isResetting,
+      going,
+    }
+  }, [step, setStep, goToNextStep, setOnboardingScreen, clearOnboardingScreen, goToPreviousStep, isResetting, going])
+
+  const stepContents = steps[step]
+  const [frameHeight, setFrameHeight] = useState(ONBOARDING_INITIAL_FRAME_HEIGHT)
+  const windowDimensions = useWindowDimensions()
+  const modalY = windowDimensions.height / 2 - frameHeight / 2
+  const hasBelowFrameContent = Boolean(onboardingScreen?.belowFrameContent)
+  const [belowFrameHeight, setBelowFrameHeight] = useState(-1)
+  const y =
+    modalY +
+    // ensure vertically centered when belowFrameContent exists
+    (hasBelowFrameContent
+      ? -(belowFrameHeight === -1
+          ? // estimate the content height before measurement
+            63
+          : belowFrameHeight) + 30
+      : 0)
+
+  if (!stepContents) {
+    throw new Error(`Unknown step: ${step}`)
+  }
+
+  return (
+    <OnboardingStepsContext.Provider value={state}>
+      <ContainerComponent>
+        {!onboardingScreen && <>{stepContents}</>}
+
+        {/* render the contents from step here */}
+        {onboardingScreen && (
+          <>
+            {/* render actual screen contents "offscreen", we use context and put it on onboardingScreen */}
+            <div style={{ height: 0, opacity: 0, pointerEvents: 'none' }}>{stepContents}</div>
+            <Frame
+              animation="stiff"
+              y={y}
+              onLayout={(e) => {
+                setFrameHeight(e.nativeEvent.layout.height)
+              }}
+            >
+              <FrameBackground height={frameHeight} />
+
+              {/**
+               * animate the inner contents of the onboarding steps modal
+               * exitBeforeEnter because we are keeping things simpler and having the inner contents
+               * not be absolutely positioned, which would let us do overlapping animations but we'd have
+               * to measure dimensions and do some delicate state management around that.
+               */}
+              <FrameInner>
+                {/* note: the exitBeforeEnter here affects the constant ONBOARDING_PANE_TRANSITION_DURATION in OnboardingPaneAnimatedContents.tsx */}
+                <AnimatePresence exitBeforeEnter custom={{ going }} initial={false}>
+                  <OnboardingPaneAnimatedContents key={step}>
+                    <OnboardingScreenDisplay step={step} />
+                  </OnboardingPaneAnimatedContents>
+                </AnimatePresence>
+              </FrameInner>
+
+              {hasBelowFrameContent && (
+                <Flex
+                  left={0}
+                  position="absolute"
+                  right={0}
+                  top="100%"
+                  y="$spacing16"
+                  onLayout={(e) => setBelowFrameHeight(e.nativeEvent.layout.height)}
+                >
+                  {onboardingScreen?.belowFrameContent}
+                </Flex>
+              )}
+            </Frame>
+          </>
+        )}
+
+        {onboardingScreen?.outsideContent || null}
+      </ContainerComponent>
+    </OnboardingStepsContext.Provider>
+  )
+}
+
+const OnboardingScreenDisplay = memo(function OnboardingScreenDisplay(props: { step: Step }): JSX.Element {
+  const [state, setState] = useState<MaybeOnboardingProps>(currentOnboardingScreen)
+
+  useEffect(() => {
+    const handler = (step: Step, next: MaybeOnboardingProps): void => {
+      if (step === props.step) {
+        setState(next)
+      }
+    }
+
+    onboardingScreenListen.add(handler)
+    return () => {
+      onboardingScreenListen.delete(handler)
+    }
+  }, [props.step])
+
+  return <OnboardingScreenFrame {...state} />
+})
+
+// containing frame just for positioning
+const Frame = styled(Flex, {
+  position: 'absolute',
+  top: 0,
+  left: '50%',
+  x: -ONBOARDING_CONTENT_WIDTH * 0.5,
+  alignItems: 'center',
+  justifyContent: 'center',
+  width: ONBOARDING_CONTENT_WIDTH,
+})
+
+// separate frame background so we can animate
+const FrameBackground = styled(Flex, {
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  backgroundColor: '$surface1',
+  borderColor: '$surface3',
+  borderRadius: '$rounded32',
+  borderWidth: '$spacing1',
+  shadowRadius: 4,
+  shadowColor: '$shadowColor',
+  shadowOffset: {
+    height: 2,
+    width: 0,
+  },
+  shadowOpacity: 0.25,
+})
+
+// inner frame to prevent overflow of outer frame
+const FrameInner = styled(Flex, {
+  height: '100%',
+  overflow: 'hidden',
+  width: '100%',
+  borderRadius: '$rounded32',
+  gap: '$spacing12',
+  pb: '$spacing24',
+  pt: '$spacing24',
+  px: '$spacing24',
+})
diff --git a/apps/extension/src/app/features/onboarding/OnboardingStepsContext.tsx b/apps/extension/src/app/features/onboarding/OnboardingStepsContext.tsx
new file mode 100644
index 00000000000..e1bba51637f
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingStepsContext.tsx
@@ -0,0 +1,58 @@
+import { createContext, useContext } from 'react'
+import { OnboardingScreenProps } from 'src/app/features/onboarding/OnboardingScreenProps'
+
+export enum CreateOnboardingSteps {
+  Password = 'password',
+  ViewMnemonic = 'mnemonic',
+  TestMnemonic = 'testMnemonic',
+  Naming = 'naming',
+  Complete = 'complete',
+}
+
+export enum ImportOnboardingSteps {
+  Mnemonic = 'mnemonic',
+  Password = 'password',
+  Select = 'select',
+  Backup = 'backup',
+  Complete = 'complete',
+}
+
+export enum ResetSteps {
+  Mnemonic = 'mnemonic',
+  Password = 'password',
+  Complete = 'complete',
+  Select = 'select',
+}
+
+export enum ScanOnboardingSteps {
+  Password = 'password',
+  Scan = 'scan',
+  OTP = 'otp',
+  Select = 'select',
+  Complete = 'complete',
+}
+
+export type Step = CreateOnboardingSteps | ImportOnboardingSteps | ResetSteps | ScanOnboardingSteps
+
+export type OnboardingStepsContextState = {
+  step: Step
+  going?: 'forward' | 'backward'
+  setStep: (step: Step) => void
+  setOnboardingScreen: (screen: OnboardingScreenProps) => void
+  clearOnboardingScreen: (screen: OnboardingScreenProps) => void
+  goToNextStep: () => void
+  goToPreviousStep: () => void
+  isResetting: boolean
+}
+
+export const OnboardingStepsContext = createContext<OnboardingStepsContextState | undefined>(undefined)
+
+export function useOnboardingSteps(): OnboardingStepsContextState {
+  const onboardingStepsContext = useContext(OnboardingStepsContext)
+
+  if (onboardingStepsContext === undefined) {
+    throw new Error('`useOnboardingSteps` must be used inside of `OnboardingStepsProvider`')
+  }
+
+  return onboardingStepsContext
+}
diff --git a/apps/extension/src/app/features/onboarding/OnboardingWrapper.tsx b/apps/extension/src/app/features/onboarding/OnboardingWrapper.tsx
new file mode 100644
index 00000000000..7e5c3c5ea6e
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/OnboardingWrapper.tsx
@@ -0,0 +1,54 @@
+import { useEffect, useState } from 'react'
+import { Outlet } from 'react-router-dom'
+import { StorageWarningModal } from 'src/app/features/warnings/StorageWarningModal'
+import { ONBOARDING_BACKGROUND_DARK, ONBOARDING_BACKGROUND_LIGHT } from 'src/assets'
+import { onboardingMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { OnboardingMessageType } from 'src/background/messagePassing/types/ExtensionMessages'
+import { Flex, Image, useIsDarkMode } from 'ui/src'
+import { syncAppWithDeviceLanguage } from 'wallet/src/features/language/slice'
+import { OnboardingContextProvider } from 'wallet/src/features/onboarding/OnboardingContext'
+import { useAppDispatch } from 'wallet/src/state'
+
+export function OnboardingWrapper(): JSX.Element {
+  const isDarkMode = useIsDarkMode()
+  const [isHighlighted, setIsHighlighted] = useState(false)
+  const dispatch = useAppDispatch()
+
+  useEffect(() => {
+    dispatch(syncAppWithDeviceLanguage())
+  }, [dispatch])
+
+  useEffect(() => {
+    return onboardingMessageChannel.addMessageListener(OnboardingMessageType.HighlightOnboardingTab, (_message) => {
+      // When the onboarding tab regains focus, we do a quick background change to bring attention to it.
+      // Otherwise, the user might not notice that the tab is now active, specially if the tab is on a different monitor.
+      setIsHighlighted(true)
+      setTimeout(() => setIsHighlighted(false), 200)
+    })
+  }, [])
+
+  return (
+    <OnboardingContextProvider>
+      <StorageWarningModal isOnboarding={true} />
+      <Flex
+        alignItems="center"
+        backgroundColor={isHighlighted ? '$accentSoft' : '$transparent'}
+        justifyContent="center"
+        minHeight="100vh"
+        width="100%"
+      >
+        {/* TODO: Update this to use the new background asset with varying blur level */}
+        {!isHighlighted && (
+          <Image
+            height="100%"
+            position="absolute"
+            resizeMode="cover"
+            source={isDarkMode ? ONBOARDING_BACKGROUND_DARK : ONBOARDING_BACKGROUND_LIGHT}
+            width="100%"
+          />
+        )}
+        <Outlet />
+      </Flex>
+    </OnboardingContextProvider>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/Password.tsx b/apps/extension/src/app/features/onboarding/Password.tsx
new file mode 100644
index 00000000000..9eee86e24b8
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/Password.tsx
@@ -0,0 +1,110 @@
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { PADDING_STRENGTH_INDICATOR, PasswordInput } from 'src/app/components/PasswordInput'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { Flex, Square, Text } from 'ui/src'
+import { Lock } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { usePasswordForm } from 'wallet/src/utils/password'
+
+export function Password({
+  flow,
+  onComplete,
+  onBack,
+}: {
+  flow: ExtensionOnboardingFlow
+  onComplete: (password: string) => Promise<void>
+  onBack?: () => void
+}): JSX.Element {
+  const { t } = useTranslation()
+  const { isResetting } = useOnboardingSteps()
+  const { resetOnboardingContextData } = useOnboardingContext()
+
+  const {
+    enableNext,
+    hideInput,
+    debouncedPasswordStrength,
+    password,
+    onPasswordBlur,
+    onChangePassword,
+    confirmPassword,
+    onChangeConfirmPassword,
+    setHideInput,
+    errorText,
+    checkSubmit,
+  } = usePasswordForm()
+
+  const onSubmit = useCallback(async () => {
+    if (checkSubmit()) {
+      await onComplete(password)
+    }
+  }, [onComplete, password, checkSubmit])
+
+  const handleBack = useCallback(() => {
+    // reset the pending mnemonic when going back from password screen
+    // to avoid having them in the context when coming back to either screen
+    resetOnboardingContextData()
+    if (onBack) {
+      onBack()
+    } else {
+      navigate(`/${TopLevelRoutes.Onboarding}`, { replace: true })
+    }
+  }, [onBack, resetOnboardingContextData])
+
+  return (
+    <Trace logImpression properties={{ flow }} screen={ExtensionOnboardingScreens.SetPassword}>
+      <OnboardingScreen
+        Icon={
+          <Square backgroundColor="$surface2" borderRadius="$rounded12" size={iconSizes.icon48}>
+            <Lock color="$neutral1" size={iconSizes.icon24} />
+          </Square>
+        }
+        nextButtonEnabled={enableNext}
+        nextButtonText={t('common.button.continue')}
+        subtitle={t('onboarding.extension.password.subtitle')}
+        title={
+          isResetting
+            ? t('onboarding.extension.password.title.reset')
+            : t('onboarding.extension.password.title.default')
+        }
+        onBack={handleBack}
+        onSubmit={onSubmit}
+      >
+        <Flex gap="$spacing16" py="$spacing24" width="100%">
+          <PasswordInput
+            autoFocus
+            large
+            backgroundColor="$surface2"
+            hideInput={hideInput}
+            passwordStrength={debouncedPasswordStrength}
+            placeholder={t('common.input.password.new')}
+            pr={PADDING_STRENGTH_INDICATOR}
+            value={password}
+            onBlur={onPasswordBlur}
+            onChangeText={onChangePassword}
+          />
+          <PasswordInput
+            large
+            backgroundColor="$surface2"
+            hideInput={hideInput}
+            placeholder={t('common.input.password.confirm')}
+            pr="$spacing48"
+            value={confirmPassword}
+            onChangeText={onChangeConfirmPassword}
+            onSubmitEditing={onSubmit}
+            onToggleHideInput={setHideInput}
+          />
+          <Text color="$statusCritical" opacity={errorText ? 1 : 0} textAlign="center" variant="body3">
+            {errorText || 'Placeholder text'}
+          </Text>
+        </Flex>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/PasswordImport.tsx b/apps/extension/src/app/features/onboarding/PasswordImport.tsx
new file mode 100644
index 00000000000..256bd937f57
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/PasswordImport.tsx
@@ -0,0 +1,43 @@
+import { useCallback } from 'react'
+import { ONBOARDING_PANE_TRANSITION_DURATION_WITH_LEEWAY } from 'src/app/features/onboarding/OnboardingPaneAnimatedContents'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Password } from 'src/app/features/onboarding/Password'
+import { ExtensionOnboardingFlow } from 'uniswap/src/types/screens/extension'
+import { sleep } from 'utilities/src/time/timing'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { BackupType } from 'wallet/src/features/wallet/accounts/types'
+import { validateMnemonic } from 'wallet/src/utils/mnemonics'
+
+export function PasswordImport({
+  flow,
+  allowBack = true,
+}: {
+  flow: ExtensionOnboardingFlow
+  allowBack?: boolean
+}): JSX.Element {
+  const { goToNextStep, goToPreviousStep } = useOnboardingSteps()
+
+  const { getOnboardingAccountMnemonicString, generateImportedAccountsByMnemonic } = useOnboardingContext()
+  const mnemonicString = getOnboardingAccountMnemonicString()
+
+  const onSubmit = useCallback(
+    async (password: string) => {
+      const { validMnemonic } = validateMnemonic(mnemonicString)
+
+      if (!validMnemonic) {
+        throw new Error('Mnemonic are invalid on PasswordImport screen')
+      }
+
+      goToNextStep()
+
+      // TODO: EXT-1164 - Move Keyring methods to workers to not block main thread during onboarding
+      // start running the validation after going to next step since they clog the main thread with work
+      // plus just a bit of extra leeway since animations can take just a tad extra to finish
+      await sleep(ONBOARDING_PANE_TRANSITION_DURATION_WITH_LEEWAY)
+      await generateImportedAccountsByMnemonic(validMnemonic, password, BackupType.Manual)
+    },
+    [mnemonicString, goToNextStep, generateImportedAccountsByMnemonic],
+  )
+
+  return <Password flow={flow} onBack={allowBack ? goToPreviousStep : undefined} onComplete={onSubmit} />
+}
diff --git a/apps/extension/src/app/features/onboarding/PinReminder.tsx b/apps/extension/src/app/features/onboarding/PinReminder.tsx
new file mode 100644
index 00000000000..8e54c88d180
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/PinReminder.tsx
@@ -0,0 +1,64 @@
+import { useTranslation } from 'react-i18next'
+import { Flex, Text } from 'ui/src'
+import { Pin, X } from 'ui/src/components/icons'
+import { iconSizes, zIndices } from 'ui/src/theme'
+
+const POPUP_WIDTH = 240
+const POPUP_OFFSET = 4
+const POPUP_SHADOW_RADIUS = 8
+
+export function PinReminder({
+  onClose,
+  style = 'popup',
+}: {
+  onClose?: () => void
+  style?: 'inline' | 'popup'
+}): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Flex
+      row
+      backgroundColor="$surface1"
+      borderColor="$surface3"
+      borderRadius="$rounded16"
+      borderWidth={1}
+      gap="$spacing12"
+      p="$spacing12"
+      shadowColor="$shadowColor"
+      shadowOpacity={0.6}
+      shadowRadius={POPUP_SHADOW_RADIUS}
+      style={{ ...styles[style] }}
+      width={POPUP_WIDTH}
+    >
+      <Flex shrink gap="$spacing4">
+        <Flex row shrink alignItems="center" gap="$spacing4">
+          <Pin color="$accent1" size={iconSizes.icon16} />
+          <Text variant="body3">{t('onboarding.complete.pin.title')}</Text>
+        </Flex>
+        <Text color="$neutral2" variant="body4">
+          {t('onboarding.complete.pin.description')}
+        </Text>
+      </Flex>
+      {onClose && (
+        <Flex cursor="pointer" position="absolute" right="$spacing12" top="$spacing12" onPress={onClose}>
+          <X color="$neutral3" size="$icon.16" />
+        </Flex>
+      )}
+    </Flex>
+  )
+}
+
+const styles = {
+  inline: {
+    position: 'relative' as const,
+    width: '100%',
+  },
+  popup: {
+    position: 'absolute' as const,
+    right: POPUP_OFFSET,
+    top: POPUP_OFFSET,
+    width: POPUP_WIDTH,
+    zIndex: zIndices.popover,
+  },
+}
diff --git a/apps/extension/src/app/features/onboarding/SyncFromPhoneButton.tsx b/apps/extension/src/app/features/onboarding/SyncFromPhoneButton.tsx
new file mode 100644
index 00000000000..a3bdb179fb1
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/SyncFromPhoneButton.tsx
@@ -0,0 +1,32 @@
+import { useTranslation } from 'react-i18next'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { Flex, Text, TouchableArea } from 'ui/src'
+import { ScanQr } from 'ui/src/components/icons'
+
+export function SyncFromPhoneButton({
+  isResetting,
+  fill,
+}: {
+  isResetting?: boolean
+  fill?: boolean
+}): JSX.Element | null {
+  const { t } = useTranslation()
+
+  return (
+    <TouchableArea
+      px="$spacing12"
+      py="$spacing8"
+      onPress={(): void =>
+        navigate(`/${TopLevelRoutes.Onboarding}/${isResetting ? OnboardingRoutes.ResetScan : OnboardingRoutes.Scan}`)
+      }
+    >
+      <Flex centered row fill={fill} gap="$spacing8">
+        <ScanQr color="$accent1" size="$icon.24" />
+        <Text color="$accent1" variant="buttonLabel2">
+          {t('onboarding.intro.mobileScan.button')}
+        </Text>
+      </Flex>
+    </TouchableArea>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/Terms.tsx b/apps/extension/src/app/features/onboarding/Terms.tsx
new file mode 100644
index 00000000000..67c1eb12749
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/Terms.tsx
@@ -0,0 +1,30 @@
+import { PropsWithChildren } from 'react'
+import { Trans } from 'react-i18next'
+import { Link, LinkProps } from 'react-router-dom'
+import { Text } from 'ui/src'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+
+export function Terms(): JSX.Element {
+  return (
+    <Text color="$neutral3" textAlign="center" variant="body4">
+      <Trans
+        components={{
+          highlightTerms: <LinkWrapper to={uniswapUrls.termsOfServiceUrl} />,
+          highlightPrivacy: <LinkWrapper to={uniswapUrls.privacyPolicyUrl} />,
+        }}
+        i18nKey="onboarding.termsOfService"
+      />
+    </Text>
+  )
+}
+
+function LinkWrapper(props: PropsWithChildren<LinkProps>): JSX.Element {
+  const { children, ...rest } = props
+  return (
+    <Link {...rest} style={{ textDecoration: 'none' }} target="_blank">
+      <Text color="$neutral2" variant="body4">
+        {children}
+      </Text>
+    </Link>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/UniconWithLockIcon.tsx b/apps/extension/src/app/features/onboarding/UniconWithLockIcon.tsx
new file mode 100644
index 00000000000..b5784b9f26e
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/UniconWithLockIcon.tsx
@@ -0,0 +1,21 @@
+import { Flex, Unicon } from 'ui/src'
+import { FileListLock } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+
+export function UniconWithLockIcon({ address }: { address: Address }): JSX.Element {
+  return (
+    <Flex>
+      <Unicon address={address} size={iconSizes.icon64} />
+      <Flex
+        backgroundColor="$surface2"
+        borderRadius="$roundedFull"
+        bottom={-4}
+        p="$spacing8"
+        position="absolute"
+        right={-4}
+      >
+        <FileListLock color="$accent1" size={iconSizes.icon16} />
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/__snapshots__/KeyboardKey.test.tsx.snap b/apps/extension/src/app/features/onboarding/__snapshots__/KeyboardKey.test.tsx.snap
new file mode 100644
index 00000000000..bf552b6a263
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/__snapshots__/KeyboardKey.test.tsx.snap
@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`KeyboardKey Component renders correctly with state Highlighted 1`] = `
+<div>
+  <span
+    class=" _dsp_contents"
+  >
+    <span
+      class=" t_light _dsp_contents is_Theme"
+    >
+      <div
+        class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-568007324 _borderTopColor-170210283 _borderRightColor-170210283 _borderBottomColor-170210283 _borderLeftColor-170210283 _borderTopLeftRadius-1307610029 _borderTopRightRadius-1307610029 _borderBottomRightRadius-1307610029 _borderBottomLeftRadius-1307610029 _borderTopWidth-1481558338 _borderRightWidth-1481558338 _borderBottomWidth-1481558338 _borderLeftWidth-1481558338 _height-70px _justifyContent-center _pr-1316330114 _pl-1316330114 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-1750371555"
+      >
+        <span
+          class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1380577629 _fontSize-28px _lineHeight-24px _fontWeight-400"
+          data-disable-theme="true"
+        >
+          Shift
+        </span>
+      </div>
+    </span>
+  </span>
+</div>
+`;
+
+exports[`KeyboardKey Component renders correctly with state KeyDown 1`] = `
+<div>
+  <span
+    class=" _dsp_contents"
+  >
+    <span
+      class=" t_light _dsp_contents is_Theme"
+    >
+      <div
+        class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-568007324 _borderTopColor-170210283 _borderRightColor-170210283 _borderBottomColor-170210283 _borderLeftColor-170210283 _borderTopLeftRadius-1307610029 _borderTopRightRadius-1307610029 _borderBottomRightRadius-1307610029 _borderBottomLeftRadius-1307610029 _borderTopWidth-1481558338 _borderRightWidth-1481558338 _borderBottomWidth-1481558338 _borderLeftWidth-1481558338 _height-70px _justifyContent-center _pr-1316330114 _pl-1316330114 _top-7px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-1150291582"
+      >
+        <span
+          class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1380577629 _fontSize-28px _lineHeight-24px _fontWeight-400"
+          data-disable-theme="true"
+        >
+          Shift
+        </span>
+      </div>
+    </span>
+  </span>
+</div>
+`;
+
+exports[`KeyboardKey Component renders correctly with state KeyUp 1`] = `
+<div>
+  <span
+    class="t_light is_inversed _dsp_contents"
+  >
+    <span
+      class=" t_light _dsp_contents is_Theme"
+    >
+      <div
+        class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-568007324 _borderTopColor-568007262 _borderRightColor-568007262 _borderBottomColor-568007262 _borderLeftColor-568007262 _borderTopLeftRadius-1307610029 _borderTopRightRadius-1307610029 _borderBottomRightRadius-1307610029 _borderBottomLeftRadius-1307610029 _borderTopWidth-1481558338 _borderRightWidth-1481558338 _borderBottomWidth-1481558338 _borderLeftWidth-1481558338 _height-70px _justifyContent-center _pr-1316330114 _pl-1316330114 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-1880567627"
+      >
+        <span
+          class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-28px _lineHeight-24px _fontWeight-400"
+          data-disable-theme="true"
+        >
+          Shift
+        </span>
+      </div>
+    </span>
+  </span>
+</div>
+`;
diff --git a/apps/extension/src/app/features/onboarding/alerts/selectors.ts b/apps/extension/src/app/features/onboarding/alerts/selectors.ts
new file mode 100644
index 00000000000..69e886629ac
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/alerts/selectors.ts
@@ -0,0 +1,6 @@
+import { AlertsState } from 'src/app/features/onboarding/alerts/slice'
+import { WebState } from 'src/store/webReducer'
+
+export function selectAlertsState<T extends keyof AlertsState>(name: T): (state: WebState) => AlertsState[T] {
+  return (state) => state.alerts[name]
+}
diff --git a/apps/extension/src/app/features/onboarding/alerts/slice.ts b/apps/extension/src/app/features/onboarding/alerts/slice.ts
new file mode 100644
index 00000000000..7c65df953eb
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/alerts/slice.ts
@@ -0,0 +1,33 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+export enum AlertName {
+  PinToToolbar = 'PinToToolbar',
+}
+
+export interface AlertsState {
+  [AlertName.PinToToolbar]: {
+    isOpen: boolean
+  }
+}
+
+const initialState: AlertsState = {
+  [AlertName.PinToToolbar]: {
+    isOpen: true,
+  },
+}
+
+const slice = createSlice({
+  name: 'alerts',
+  initialState,
+  reducers: {
+    openAlert: (state, action: PayloadAction<AlertName>) => {
+      state[action.payload].isOpen = true
+    },
+    closeAlert: (state, action: PayloadAction<AlertName>) => {
+      state[action.payload].isOpen = false
+    },
+  },
+})
+
+export const { openAlert, closeAlert } = slice.actions
+export const { reducer: alertsReducer } = slice
diff --git a/apps/extension/src/app/features/onboarding/create/NameWallet.tsx b/apps/extension/src/app/features/onboarding/create/NameWallet.tsx
new file mode 100644
index 00000000000..8fd4496fb18
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/create/NameWallet.tsx
@@ -0,0 +1,72 @@
+import { useState } from 'react'
+import { Input } from 'src/app/components/Input'
+import { saveDappConnection } from 'src/app/features/dapp/actions'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Flex, Text, Unicon } from 'ui/src'
+import { fonts, iconSizes } from 'ui/src/theme'
+import { UNISWAP_WEB_URL } from 'uniswap/src/constants/urls'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { shortenAddress } from 'uniswap/src/utils/addresses'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+
+export function NameWallet(): JSX.Element {
+  const { getOnboardingAccount, setPendingWalletName } = useOnboardingContext()
+  const onboardingAccount = getOnboardingAccount()
+
+  const { goToNextStep, goToPreviousStep } = useOnboardingSteps()
+  const [walletName, setWalletName] = useState('')
+
+  const onboardingAccountAddress = onboardingAccount?.address
+
+  const onSubmit = async (): Promise<void> => {
+    if (walletName) {
+      setPendingWalletName(walletName)
+    }
+
+    if (onboardingAccount) {
+      await saveDappConnection(UNISWAP_WEB_URL, onboardingAccount)
+    }
+
+    goToNextStep()
+  }
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.New }}
+      screen={ExtensionOnboardingScreens.NameWallet}
+    >
+      <OnboardingScreen
+        Icon={
+          onboardingAccountAddress ? <Unicon address={onboardingAccountAddress} size={iconSizes.icon64} /> : undefined
+        }
+        nextButtonEnabled={true}
+        nextButtonText="Finish"
+        subtitle="This nickname is only visible to you"
+        title="Give your wallet a name"
+        onBack={goToPreviousStep}
+        onSubmit={onSubmit}
+      >
+        <Flex gap="$spacing24" py="$spacing24" width="100%">
+          <Input
+            autoFocus
+            large
+            backgroundColor="$surface1"
+            borderRadius="$rounded20"
+            fontSize={fonts.heading3.fontSize}
+            placeholder={onboardingAccount?.name}
+            py="$spacing32"
+            textAlign="center"
+            onChangeText={setWalletName}
+            onSubmitEditing={onSubmit}
+          />
+          <Text color="$neutral3" textAlign="center" variant="subheading2">
+            {onboardingAccountAddress && shortenAddress(onboardingAccountAddress)}
+          </Text>
+        </Flex>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/create/PasswordCreate.tsx b/apps/extension/src/app/features/onboarding/create/PasswordCreate.tsx
new file mode 100644
index 00000000000..3114e7ed10e
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/create/PasswordCreate.tsx
@@ -0,0 +1,23 @@
+import { ONBOARDING_PANE_TRANSITION_DURATION_WITH_LEEWAY } from 'src/app/features/onboarding/OnboardingPaneAnimatedContents'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Password } from 'src/app/features/onboarding/Password'
+import { ExtensionOnboardingFlow } from 'uniswap/src/types/screens/extension'
+import { sleep } from 'utilities/src/time/timing'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+
+export function PasswordCreate(): JSX.Element {
+  const { goToNextStep } = useOnboardingSteps()
+  const { generateOnboardingAccount } = useOnboardingContext()
+
+  const onComplete = async (password: string): Promise<void> => {
+    goToNextStep()
+
+    // TODO: EXT-1164 - Move Keyring methods to workers to not block main thread during onboarding
+    // start running the validation after going to next step since they clog the main thread with work
+    // plus just a bit of extra leeway since animations can take just a tad extra to finish
+    await sleep(ONBOARDING_PANE_TRANSITION_DURATION_WITH_LEEWAY)
+    await generateOnboardingAccount(password)
+  }
+
+  return <Password flow={ExtensionOnboardingFlow.New} onComplete={onComplete} />
+}
diff --git a/apps/extension/src/app/features/onboarding/create/TestMnemonic.tsx b/apps/extension/src/app/features/onboarding/create/TestMnemonic.tsx
new file mode 100644
index 00000000000..3762ba728a6
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/create/TestMnemonic.tsx
@@ -0,0 +1,261 @@
+import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { TextInput } from 'react-native'
+import { Input } from 'src/app/components/Input'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Flex, Square, Text } from 'ui/src'
+import { Check, FileListCheck } from 'ui/src/components/icons'
+import { iconSizes, zIndices } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { useDebounce } from 'utilities/src/time/timing'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { PASSWORD_VALIDATION_DEBOUNCE_MS } from 'wallet/src/utils/password'
+
+export function TestMnemonic({ numberOfTests = 3 }: { numberOfTests?: number }): JSX.Element {
+  const { t } = useTranslation()
+
+  const { getOnboardingAccountAddress, getOnboardingAccountMnemonic } = useOnboardingContext()
+  const onboardingAccountAddress = getOnboardingAccountAddress()
+  const onboardingAccountMnemonic = getOnboardingAccountMnemonic()
+
+  const { goToNextStep, goToPreviousStep } = useOnboardingSteps()
+
+  const [completedTests, markTestCompleted] = useReducer((v: number) => v + 1, 0)
+  const [userWordInput, setUserWordInput] = useState<string>('')
+  const [hasError, setHasError] = useState(false)
+
+  const isLastTest = completedTests === numberOfTests - 1
+
+  // Pick NUMBER_OF_TESTS random words
+  const testingWordIndexes = useMemo(
+    () =>
+      onboardingAccountMnemonic ? selectRandomNumbers(onboardingAccountMnemonic.length, numberOfTests) : undefined,
+    [onboardingAccountMnemonic, numberOfTests],
+  )
+
+  // Save the next word index for reuse, ensuring it's not undefined
+  const nextWordIndex = useMemo(() => testingWordIndexes?.[completedTests] ?? 0, [completedTests, testingWordIndexes])
+  const nextWordNumber = nextWordIndex + 1
+  const validWord = userWordInput === onboardingAccountMnemonic?.[nextWordIndex]
+  const isComplete = validWord && isLastTest
+
+  useEffect(() => {
+    if (validWord) {
+      setTimeout(() => {
+        if (!isLastTest) {
+          markTestCompleted()
+          setUserWordInput('')
+        } else {
+          goToNextStep()
+        }
+      }, 200)
+    }
+  }, [validWord, goToNextStep, isLastTest])
+
+  const debouncedWord = useDebounce(userWordInput, PASSWORD_VALIDATION_DEBOUNCE_MS)
+  useEffect(() => {
+    setHasError(!!debouncedWord && debouncedWord !== onboardingAccountMnemonic?.[nextWordIndex])
+  }, [debouncedWord, onboardingAccountMnemonic, nextWordIndex])
+
+  const onNext = useCallback((): void => {
+    if (!onboardingAccountMnemonic || !onboardingAccountAddress) {
+      return
+    }
+
+    goToNextStep()
+  }, [onboardingAccountMnemonic, goToNextStep, onboardingAccountAddress])
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.New }}
+      screen={ExtensionOnboardingScreens.ConfirmSeedPhrase}
+    >
+      <OnboardingScreen
+        Icon={
+          <Square alignSelf="center" backgroundColor="$surface2" borderRadius="$rounded12" size={iconSizes.icon48}>
+            <FileListCheck color="$neutral1" size={iconSizes.icon24} />
+          </Square>
+        }
+        nextButtonEnabled={false}
+        nextButtonText={t('onboarding.backup.manual.progress', {
+          completedStepsCount: isComplete ? numberOfTests : completedTests,
+          totalStepsCount: numberOfTests,
+        })}
+        nextButtonTheme="secondary"
+        subtitle={t('onboarding.backup.manual.subtitle', { count: nextWordNumber, ordinal: true })}
+        title={t('onboarding.backup.manual.title')}
+        onBack={goToPreviousStep}
+        onSkip={onNext}
+        onSubmit={onNext}
+      >
+        <Flex fill gap="$spacing24" mb="$spacing24" width="100%">
+          <RecoveryPhraseInputStack
+            isInputValid={validWord}
+            nextWordNumber={nextWordNumber}
+            numInputsBelow={numberOfTests - completedTests}
+            numTotalSteps={numberOfTests}
+            value={userWordInput}
+            onChangeText={(value) => {
+              setUserWordInput(value)
+              if (hasError) {
+                setHasError(false)
+              }
+            }}
+          />
+          <Text color="$statusCritical" style={{ opacity: hasError ? 1 : 0 }} textAlign="center" variant="body3">
+            {t('onboarding.backup.manual.error')}
+          </Text>
+        </Flex>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
+
+type InputStackBaseProps = {
+  value?: string
+  onChangeText: (word: string) => void
+}
+
+function RecoveryPhraseInputStack({
+  nextWordNumber,
+  numInputsBelow,
+  numTotalSteps,
+  isInputValid,
+  value,
+  onChangeText,
+}: InputStackBaseProps & {
+  numInputsBelow: number
+  numTotalSteps: number
+  nextWordNumber: number
+  isInputValid: boolean
+}): JSX.Element {
+  return (
+    <Flex gap="$spacing12">
+      <Flex row position="relative" width="100%">
+        {isInputValid ? (
+          <Flex
+            fill
+            row
+            bottom="$spacing16"
+            justifyContent="flex-end"
+            position="absolute"
+            right="$spacing24"
+            width="100%"
+            zIndex={zIndices.fixed}
+          >
+            <Check color="$statusSuccess" size={iconSizes.icon24} />
+          </Flex>
+        ) : null}
+        <InputStack
+          current={numTotalSteps - numInputsBelow}
+          prefixText={String(nextWordNumber).padStart(2, '0')}
+          total={numTotalSteps}
+          value={value}
+          onChangeText={onChangeText}
+        />
+      </Flex>
+    </Flex>
+  )
+}
+
+type InputStackProps = InputStackBaseProps & {
+  total: number
+  current: number
+  prefixText: string
+}
+
+export function InputStack({ onChangeText, total, value, current, prefixText }: InputStackProps): JSX.Element {
+  const { t } = useTranslation()
+  const refs = useRef<TextInput[]>([])
+  const prefixTexts = useRef<string[]>([])
+
+  // this is weird because we only get the new word as it renders
+  // but avoiding a bit of a refactor before beta release, should be safe:
+  prefixTexts.current[current] ||= prefixText
+
+  useEffect(() => {
+    // Wait until the next tick to focus the input, otherwise the state update interferes with the focus event.
+    setTimeout(() => {
+      refs.current?.[current]?.focus()
+    }, 1)
+  }, [current])
+
+  return (
+    <Flex height={60} mt={20 + total * 10} width="100%">
+      {new Array(total).fill(0).map((_, i) => {
+        const isHidden = i < current
+        const isCurrentlyActive = i === current
+        const isBelow = i > current
+        const belowOffset = i - current
+
+        return (
+          <Flex
+            key={i}
+            animation={isHidden ? 'stiff' : 'quickishDelayed'}
+            bottom={0}
+            left={0}
+            opacity={1}
+            pointerEvents={isCurrentlyActive ? 'auto' : 'none'}
+            position="absolute"
+            right={0}
+            scale={1}
+            top={0}
+            y={0}
+            {...(isBelow && {
+              zIndex: -belowOffset,
+              y: belowOffset * -12,
+              opacity: 1,
+            })}
+            {...(isHidden && {
+              y: 12,
+              opacity: 0,
+              scale: 0.97,
+              zIndex: 100,
+            })}
+          >
+            <Text
+              color="$neutral2"
+              mt={20}
+              position="absolute"
+              px="$spacing24"
+              variant="subheading1"
+              zIndex={zIndices.fixed}
+            >
+              {prefixTexts.current[i] || ''}
+            </Text>
+            <Input
+              ref={(inputNode) => {
+                if (inputNode) {
+                  refs.current[i] = inputNode
+                }
+              }}
+              centered
+              large
+              borderColor="$surface3"
+              borderRadius="$rounded20"
+              flex={1}
+              placeholder={t('onboarding.backup.manual.placeholder')}
+              shadowColor="$shadowColor"
+              shadowOffset={{ width: 0, height: 4 }}
+              shadowOpacity={0.4}
+              shadowRadius={10}
+              value={value}
+              zIndex={zIndices.sticky}
+              onChangeText={onChangeText}
+            />
+          </Flex>
+        )
+      })}
+    </Flex>
+  )
+}
+
+function selectRandomNumbers(maxNumber: number, numberOfNumbers: number): number[] {
+  const shuffledIndexes = [...Array(maxNumber).keys()].sort(() => 0.5 - Math.random())
+  const selectedIndexes = shuffledIndexes.slice(0, numberOfNumbers)
+  selectedIndexes.sort((a, b) => a - b)
+  return selectedIndexes
+}
diff --git a/apps/extension/src/app/features/onboarding/create/ViewMnemonic.tsx b/apps/extension/src/app/features/onboarding/create/ViewMnemonic.tsx
new file mode 100644
index 00000000000..dc1a48af1a8
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/create/ViewMnemonic.tsx
@@ -0,0 +1,148 @@
+import { FunctionComponent, useEffect, useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { MnemonicViewer } from 'src/app/components/MnemonicViewer'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { CheckBox, Circle, Flex, IconProps, Square, Text } from 'ui/src'
+import { AlertTriangle, EyeOff, FileListLock, Key, PencilDetailed } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+
+enum ViewStep {
+  Info,
+  View,
+}
+
+export function ViewMnemonic(): JSX.Element {
+  const { t } = useTranslation()
+
+  const [viewStep, setViewStep] = useState<ViewStep>(ViewStep.Info)
+
+  const { goToNextStep } = useOnboardingSteps()
+
+  const [disclaimerChecked, setDisclaimerChecked] = useState(false)
+
+  const { getOnboardingAccountAddress, getOnboardingAccountMnemonic, retrieveOnboardingAccountMnemonic } =
+    useOnboardingContext()
+  const onboardingAccountAddress = getOnboardingAccountAddress()
+  const onboardingAccountMnemonic = getOnboardingAccountMnemonic()
+
+  useEffect(() => {
+    if (!onboardingAccountMnemonic) {
+      retrieveOnboardingAccountMnemonic().catch((e) => {
+        logger.error(e, {
+          tags: { file: 'ViewMnemonic', function: 'retrieveOnboardingAccountMnemonic' },
+        })
+      })
+    }
+  }, [onboardingAccountMnemonic, retrieveOnboardingAccountMnemonic])
+
+  const onSubmit = (): void => {
+    if (viewStep === ViewStep.Info) {
+      setViewStep(ViewStep.View)
+      return
+    }
+
+    if (onboardingAccountAddress && disclaimerChecked) {
+      goToNextStep()
+    }
+  }
+
+  // On view step, next button should be enabled if mnemonic has been created.
+  // On disclaimer step, next button should be enabled if disclaimer is checked and mnemonic has been created.
+  const shouldEnableNextButton =
+    viewStep === ViewStep.View ? !!onboardingAccountAddress && disclaimerChecked : !!onboardingAccountAddress
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.New }}
+      screen={ExtensionOnboardingScreens.ViewSeedPhrase}
+    >
+      <OnboardingScreen
+        Icon={
+          <Square
+            alignContent="center"
+            backgroundColor={viewStep === ViewStep.View ? '$surface2' : '$DEP_accentCriticalSoft'}
+            borderRadius="$rounded12"
+            size={iconSizes.icon48}
+          >
+            {viewStep === ViewStep.View ? (
+              <FileListLock color="$neutral1" size={iconSizes.icon24} />
+            ) : (
+              <AlertTriangle color="$statusCritical" size={iconSizes.icon24} />
+            )}
+          </Square>
+        }
+        nextButtonEnabled={shouldEnableNextButton}
+        nextButtonText={t('common.button.continue')}
+        subtitle={
+          viewStep === ViewStep.View
+            ? t('onboarding.backup.view.subtitle.message2')
+            : t('onboarding.backup.view.subtitle.message1')
+        }
+        title={t('onboarding.backup.view.title')}
+        onBack={(): void =>
+          navigate(`/${TopLevelRoutes.Onboarding}`, {
+            replace: true,
+          })
+        }
+        onSubmit={onSubmit}
+      >
+        {viewStep === ViewStep.Info ? (
+          <Flex
+            alignItems="flex-start"
+            borderColor="$surface3"
+            borderRadius="$rounded20"
+            borderWidth="$spacing1"
+            gap="$spacing24"
+            my="$spacing24"
+            p="$spacing24"
+          >
+            <Flex row alignItems="center" gap="$spacing16">
+              <WarningIcon Icon={Key} />
+              <Text variant="body2">{t('onboarding.backup.view.warning.message1')}</Text>
+            </Flex>
+            <Flex row alignItems="center" gap="$spacing16">
+              <WarningIcon Icon={PencilDetailed} />
+              <Text variant="body2">{t('onboarding.backup.view.warning.message2')}</Text>
+            </Flex>
+            <Flex row alignItems="center" gap="$spacing16">
+              <WarningIcon Icon={EyeOff} />
+              <Text textAlign="left" variant="body2">
+                <Trans
+                  components={{ u: <Text textDecorationLine="underline" variant="body2" /> }}
+                  i18nKey="onboarding.backup.view.warning.message3"
+                />
+              </Text>
+            </Flex>
+          </Flex>
+        ) : (
+          <Flex gap="$spacing16" my="$spacing24" pt="$spacing8" width="100%">
+            <MnemonicViewer mnemonic={onboardingAccountMnemonic} />
+            <Flex backgroundColor="$surface2" borderRadius="$rounded16" p="$spacing12">
+              <CheckBox
+                checked={disclaimerChecked}
+                text={<Text variant="body3">{t('onboarding.backup.view.disclaimer')}</Text>}
+                onCheckPressed={(currentValue: boolean): void => setDisclaimerChecked(!currentValue)}
+              />
+            </Flex>
+          </Flex>
+        )}
+      </OnboardingScreen>
+    </Trace>
+  )
+}
+
+function WarningIcon({ Icon }: { Icon: FunctionComponent<IconProps> }): JSX.Element {
+  return (
+    <Circle backgroundColor="$DEP_accentCriticalSoft" size={iconSizes.icon36}>
+      <Icon color="$statusCritical" size={iconSizes.icon24} />
+    </Circle>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/import/ImportMnemonic.tsx b/apps/extension/src/app/features/onboarding/import/ImportMnemonic.tsx
new file mode 100644
index 00000000000..05814e7aec7
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/import/ImportMnemonic.tsx
@@ -0,0 +1,336 @@
+import { wordlists } from 'ethers'
+import { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  NativeSyntheticEvent,
+  TextInputChangeEventData,
+  TextInputFocusEventData,
+  TextInputKeyPressEventData,
+} from 'react-native'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { SyncFromPhoneButton } from 'src/app/features/onboarding/SyncFromPhoneButton'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { useAppDispatch } from 'src/store/store'
+import { Button, Flex, FlexProps, Input, Square, Text, inputStyles } from 'ui/src'
+import { FileListLock, RotatableChevron } from 'ui/src/components/icons'
+import { fonts, iconSizes } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { useDebounce } from 'utilities/src/time/timing'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { isValidMnemonicWord, validateMnemonic } from 'wallet/src/utils/mnemonics'
+
+export function ImportMnemonic(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const [mnemonic, setMnemonic] = useState<string[]>(new Array(24).fill(''))
+  const { addOnboardingAccountMnemonic } = useOnboardingContext()
+  const [expanded, setExpanded] = useState(false)
+  const [errors, setErrors] = useState<Record<number, boolean | undefined>>({})
+  const isEmptyMnemonic = useMemo(() => !mnemonic.join(' ').toLocaleLowerCase().trim(), [mnemonic])
+
+  const inputRefs = useRef<Array<Input | null>>(Array(24).fill(null))
+
+  const accounts = useSignerAccounts()
+
+  const { isResetting, goToNextStep } = useOnboardingSteps()
+
+  useEffect(() => {
+    const handlePaste = (event: ClipboardEvent): void | (() => void) => {
+      if (!event.clipboardData) {
+        return
+      }
+      const pastedText = event.clipboardData.getData('text').toLowerCase().trim()
+      if (!pastedText) {
+        return
+      }
+      const { validMnemonic, error } = validateMnemonic(pastedText)
+      if (error || !validMnemonic) {
+        return
+      }
+      // We conditionally prevent default here because we want paste to work as expected in all other cases.
+      event.preventDefault()
+      const words = validMnemonic.replaceAll(/\s+/g, ' ').split(' ')
+      setExpanded(words.length > 12)
+
+      const newMnemonic = Array(24)
+        .fill('')
+        .map((_, i) => words[i] || '')
+
+      setMnemonic(newMnemonic)
+      setErrors({})
+
+      // We focus the last input on the next tick after the state has been updated.
+      setTimeout(() => inputRefs.current[words.length - 1]?.focus(), 0)
+
+      // Clear clipboard after paste
+      navigator.clipboard.writeText('').catch(() => {})
+    }
+
+    window.document.addEventListener('paste', handlePaste)
+
+    return () => {
+      window.document.removeEventListener('paste', handlePaste)
+    }
+  }, [setMnemonic])
+
+  const handleChange = useCallback(
+    (index: number) =>
+      (event: NativeSyntheticEvent<TextInputChangeEventData>): void => {
+        const newMnemonic = [...mnemonic]
+        const word = event.nativeEvent.text
+
+        // Focus next input when the space key is pressed.
+        if (word.length > 1 && word.endsWith(' ')) {
+          inputRefs.current[index + 1]?.focus()
+        }
+
+        newMnemonic[index] = word.trim()
+        setMnemonic(newMnemonic)
+      },
+    [mnemonic, setMnemonic],
+  )
+
+  const handleKeyPress = useCallback(
+    (index: number) =>
+      (event: NativeSyntheticEvent<TextInputKeyPressEventData>): void => {
+        // Focus previous input when the backspace key is pressed.
+        if (event.nativeEvent.key === 'Backspace' && !mnemonic[index] && index > 0) {
+          inputRefs.current[index - 1]?.focus()
+        }
+      },
+    [mnemonic],
+  )
+
+  const handleBlur = useCallback(
+    (index: number) =>
+      (event: NativeSyntheticEvent<TextInputFocusEventData>): void => {
+        const word = event.nativeEvent.text
+
+        if (!word && errors[index] !== undefined) {
+          setErrors({ ...errors, [index]: undefined })
+        }
+        if (!word) {
+          return
+        }
+        const wordInList = wordlists.en?.getWordIndex(word) !== -1
+        setErrors({ ...errors, [index]: !wordInList })
+      },
+    [errors],
+  )
+
+  const onSubmit = useCallback(async () => {
+    if (isEmptyMnemonic) {
+      return
+    }
+
+    if (isResetting) {
+      // Remove all accounts before importing mnemonic.
+      await dispatch(
+        editAccountActions.trigger({
+          type: EditAccountAction.Remove,
+          accounts,
+        }),
+      )
+    }
+
+    addOnboardingAccountMnemonic(mnemonic)
+    goToNextStep()
+  }, [accounts, dispatch, goToNextStep, isResetting, mnemonic, addOnboardingAccountMnemonic, isEmptyMnemonic])
+
+  const debouncedMnemonic = useDebounce(mnemonic, 500)
+
+  const { error: mnemonicValidationError, invalidWordCount } = useMemo(() => {
+    const mnemonicString = debouncedMnemonic.join(' ').toLowerCase()
+
+    if (!mnemonicString.trim()) {
+      return { error: undefined, invalidWordCount: undefined }
+    }
+
+    return validateMnemonic(mnemonicString)
+  }, [debouncedMnemonic])
+
+  const errorMessageToDisplay = useMemo(() => {
+    // If all cells are filled, but there is an error, display the invalid phrase error
+    const trimmedMnemonic = expanded ? mnemonic : mnemonic.slice(0, 12)
+    const allCellsFilled = trimmedMnemonic.every((word) => word.length > 0)
+
+    if (allCellsFilled && mnemonicValidationError) {
+      return t('onboarding.importMnemonic.error.invalidPhrase')
+    }
+
+    if (mnemonicValidationError && invalidWordCount && invalidWordCount >= 1) {
+      return t('onboarding.import.error.invalidWords', { count: invalidWordCount })
+    }
+
+    return undefined
+  }, [expanded, mnemonic, mnemonicValidationError, t, invalidWordCount])
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.Import }}
+      screen={ExtensionOnboardingScreens.SeedPhraseInput}
+    >
+      <Flex gap="$spacing16">
+        <OnboardingScreen
+          Icon={
+            <Square
+              backgroundColor="$surface2"
+              borderRadius="$rounded12"
+              height={iconSizes.icon48}
+              width={iconSizes.icon48}
+            >
+              <FileListLock color="$neutral1" size={iconSizes.icon24} />
+            </Square>
+          }
+          belowFrameContent={
+            isResetting ? (
+              <Flex
+                centered
+                row
+                backgroundColor="$surface1"
+                borderColor="$surface3"
+                borderRadius={100}
+                borderWidth={1}
+                mt="$spacing8"
+                px="$spacing12"
+                py="$spacing8"
+                shadowColor="$surface3"
+                shadowRadius={10}
+                style={{ margin: 'auto' }}
+              >
+                <SyncFromPhoneButton isResetting={isResetting} />
+              </Flex>
+            ) : undefined
+          }
+          nextButtonEnabled={!isEmptyMnemonic && !mnemonicValidationError && !errorMessageToDisplay}
+          nextButtonText={t('common.button.continue')}
+          subtitle={t('onboarding.importMnemonic.subtitle')}
+          title={t('onboarding.importMnemonic.title')}
+          onBack={isResetting ? undefined : (): void => navigate(`/${TopLevelRoutes.Onboarding}`, { replace: true })}
+          onSubmit={onSubmit}
+        >
+          <>
+            <Text
+              color="$statusCritical"
+              opacity={errorMessageToDisplay ? 1 : 0}
+              py="$spacing8"
+              textAlign="center"
+              variant="body3"
+            >
+              {errorMessageToDisplay ?? DUMMY_TEXT} {/* To prevent layout shift */}
+            </Text>
+            <Flex>
+              <Flex row flexWrap="wrap" gap="$spacing16">
+                {mnemonic.map(
+                  (word, index) =>
+                    Boolean(expanded || (!expanded && index < 12)) && (
+                      <Flex key={index} position="relative" style={styles.recoveryPhraseWord}>
+                        <RecoveryPhraseWord
+                          key={index + 'input'}
+                          ref={(ref) => (inputRefs.current[index] = ref)}
+                          handleBlur={handleBlur}
+                          handleChange={handleChange}
+                          handleKeyPress={handleKeyPress}
+                          index={index}
+                          word={word}
+                        />
+                      </Flex>
+                    ),
+                )}
+              </Flex>
+              <Button
+                backgroundColor="$transparent"
+                gap="$spacing4"
+                hoverStyle={{ backgroundColor: 'transparent' } as FlexProps}
+                mt="$spacing16"
+                mx="auto"
+                pressStyle={{ backgroundColor: 'transparent' } as FlexProps}
+                onPress={(): void => setExpanded(!expanded)}
+              >
+                <Text color="$neutral2" variant="body3">
+                  {expanded
+                    ? t('onboarding.importMnemonic.button.default')
+                    : t('onboarding.importMnemonic.button.longPhrase')}
+                </Text>
+                <RotatableChevron color="$neutral3" direction={expanded ? 'up' : 'down'} width={iconSizes.icon20} />
+              </Button>
+            </Flex>
+          </>
+        </OnboardingScreen>
+      </Flex>
+    </Trace>
+  )
+}
+
+const RecoveryPhraseWord = forwardRef<
+  Input,
+  {
+    word: string
+    index: number
+    handleBlur: (index: number) => (event: NativeSyntheticEvent<TextInputFocusEventData>) => void
+    handleChange: (index: number) => (event: NativeSyntheticEvent<TextInputChangeEventData>) => void
+    handleKeyPress: (index: number) => (e: NativeSyntheticEvent<TextInputKeyPressEventData>) => void
+  }
+>(function _RecoveryPhraseWord({ word, index, handleBlur, handleChange, handleKeyPress }, ref): JSX.Element {
+  const debouncedWord = useDebounce(word, 500)
+  const showError = isValidMnemonicWord(debouncedWord)
+
+  return (
+    <Flex key={index} position="relative" width={130}>
+      <Text
+        color="$neutral2"
+        fontSize={fonts.body3.fontSize}
+        left="$spacing16"
+        pointerEvents="none"
+        position="absolute"
+        top={11}
+      >
+        {(index + 1).toString()}
+      </Text>
+
+      <Input
+        ref={ref}
+        autoFocus={index === 0}
+        backgroundColor="$surface2"
+        borderColor="$surface3"
+        borderRadius="$rounded16"
+        borderWidth={1}
+        focusStyle={styles.inputFocus}
+        fontSize={fonts.body3.fontSize}
+        height={44}
+        hoverStyle={inputStyles.inputHover}
+        pl={40}
+        placeholderTextColor="$neutral1"
+        py="$spacing12"
+        value={word}
+        onBlur={handleBlur(index)}
+        onChange={handleChange(index)}
+        onKeyPress={handleKeyPress(index)}
+        {...(showError && {
+          backgroundColor: '$DEP_accentCriticalSoft',
+          color: '$statusCritical',
+        })}
+      />
+    </Flex>
+  )
+})
+
+const styles = {
+  inputFocus: {
+    backgroundColor: '$surface1',
+    borderWidth: 1,
+    borderColor: '$surface3',
+    outlineWidth: 0,
+  },
+  recoveryPhraseWord: {
+    width: 'calc(calc(100% - 32px) / 3)', // 3 columns with 16px gap
+  },
+} as const
+
+const DUMMY_TEXT = 'DUMMY TEXT'
diff --git a/apps/extension/src/app/features/onboarding/import/SelectWallets.tsx b/apps/extension/src/app/features/onboarding/import/SelectWallets.tsx
new file mode 100644
index 00000000000..d0c1ae89847
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/import/SelectWallets.tsx
@@ -0,0 +1,208 @@
+import { useApolloClient } from '@apollo/client'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { SelectWalletsSkeleton } from 'src/app/components/loading/SelectWalletSkeleton'
+import { saveDappConnection } from 'src/app/features/dapp/actions'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Flex, ScrollView, Square, Text } from 'ui/src'
+import { WalletFilled } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { UNISWAP_WEB_URL } from 'uniswap/src/constants/urls'
+import {
+  SelectWalletScreenDocument,
+  SelectWalletScreenQuery,
+} from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { useAsyncData } from 'utilities/src/react/hooks'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useTimeout } from 'utilities/src/time/timing'
+import WalletPreviewCard from 'wallet/src/components/WalletPreviewCard/WalletPreviewCard'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { NUMBER_OF_WALLETS_TO_IMPORT } from 'wallet/src/features/onboarding/createImportedAccounts'
+import { useSelectAccounts } from 'wallet/src/features/onboarding/hooks/useSelectAccounts'
+import { fetchUnitagByAddresses } from 'wallet/src/features/unitags/api'
+
+const FORCED_LOADING_DURATION = 3 * ONE_SECOND_MS // 3s
+
+interface ImportableAccount {
+  ownerAddress: string
+  balance: number | undefined
+}
+
+function isImportableAccount(account: {
+  ownerAddress: string | undefined
+  balance: Maybe<number>
+}): account is ImportableAccount {
+  return (account as ImportableAccount).ownerAddress !== undefined
+}
+
+export function SelectWallets({ flow }: { flow: ExtensionOnboardingFlow }): JSX.Element {
+  const { t } = useTranslation()
+  const shouldAutoConnect = useFeatureFlag(FeatureFlags.ExtensionAutoConnect)
+
+  const { goToNextStep, goToPreviousStep } = useOnboardingSteps()
+
+  const { getImportedAccountsAddresses, selectImportedAccounts } = useOnboardingContext()
+  const importedAccountsAddresses = getImportedAccountsAddresses()
+
+  const isImportedAccountsReady = importedAccountsAddresses?.length === NUMBER_OF_WALLETS_TO_IMPORT
+
+  const {
+    data: initialShownAccounts,
+    isLoading: loading,
+    error,
+    refetch,
+  } = useImportableAccounts(isImportedAccountsReady ? importedAccountsAddresses : undefined)
+
+  const onRetry = useCallback(async () => {
+    setIsForcedLoading(true)
+    refetch()
+  }, [refetch])
+
+  const showError = error && !initialShownAccounts?.length
+
+  const { selectedAddresses, toggleAddressSelection } = useSelectAccounts(initialShownAccounts)
+
+  const onSubmit = useCallback(async () => {
+    const importedAccounts = await selectImportedAccounts(selectedAddresses)
+
+    // TODO(EXT-1375): figure out how to better auto connect existing wallets that may have connected via WC or some other method.
+    // Once that's solved the feature flag can be turned on/removed.
+    if (shouldAutoConnect && importedAccounts[0]) {
+      await saveDappConnection(UNISWAP_WEB_URL, importedAccounts[0])
+    }
+
+    goToNextStep()
+  }, [selectImportedAccounts, selectedAddresses, goToNextStep, shouldAutoConnect])
+
+  // Force a fixed duration loading state for smoother transition (as we show different UI for 1 vs multiple wallets)
+  const [isForcedLoading, setIsForcedLoading] = useState(true)
+  useTimeout(() => setIsForcedLoading(false), FORCED_LOADING_DURATION)
+
+  const isLoading = loading || isForcedLoading || !isImportedAccountsReady
+
+  const title = showError ? t('onboarding.selectWallets.title.error') : t('onboarding.selectWallets.title.default')
+
+  return (
+    <Trace logImpression properties={{ flow }} screen={ExtensionOnboardingScreens.SelectWallet}>
+      <OnboardingScreen
+        Icon={
+          <Square backgroundColor="$surface2" borderRadius="$rounded12" size={iconSizes.icon48}>
+            <WalletFilled color="$neutral1" size={iconSizes.icon24} />
+          </Square>
+        }
+        nextButtonEnabled={showError || (isImportedAccountsReady && selectedAddresses.length > 0 && !isLoading)}
+        nextButtonText={showError ? t('common.button.retry') : t('common.button.continue')}
+        nextButtonTheme={showError ? 'secondary' : 'primary'}
+        title={title}
+        onBack={goToPreviousStep}
+        onSubmit={showError ? onRetry : onSubmit}
+      >
+        <ScrollView maxHeight="55vh" my="$spacing32" showsVerticalScrollIndicator={false} width="100%">
+          <Flex gap="$spacing12" position="relative" py="$spacing4" width="100%">
+            {showError ? (
+              <Text color="$statusCritical" textAlign="center" variant="buttonLabel2">
+                {t('onboarding.selectWallets.error')}
+              </Text>
+            ) : isLoading ? (
+              <Flex>
+                <SelectWalletsSkeleton repeat={3} />
+              </Flex>
+            ) : (
+              initialShownAccounts?.map((account) => {
+                const { ownerAddress, balance } = account
+                return (
+                  <WalletPreviewCard
+                    key={ownerAddress}
+                    address={ownerAddress}
+                    balance={balance}
+                    selected={selectedAddresses.includes(ownerAddress)}
+                    onSelect={toggleAddressSelection}
+                  />
+                )
+              })
+            )}
+          </Flex>
+        </ScrollView>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
+
+function useImportableAccounts(addresses?: string[]): {
+  isLoading: boolean
+  data?: ImportableAccount[]
+  error?: Error
+  refetch: () => void
+} {
+  const [refetchCount, setRefetchCount] = useState(0)
+  const apolloClient = useApolloClient()
+
+  const refetch = useCallback(() => setRefetchCount((count) => count + 1), [])
+
+  const fetch = useCallback(async (): Promise<ImportableAccount[] | undefined> => {
+    if (!addresses) {
+      return
+    }
+
+    const fetchBalances = apolloClient.query<SelectWalletScreenQuery>({
+      query: SelectWalletScreenDocument,
+      variables: { ownerAddresses: addresses },
+    })
+
+    const fetchUnitags = fetchUnitagByAddresses(addresses)
+
+    const [balancesResponse, unitagsResponse] = await Promise.all([fetchBalances, fetchUnitags])
+
+    const unitagsByAddress = unitagsResponse?.data
+
+    const allAddressBalances = balancesResponse.data.portfolios
+
+    const importableAccounts = allAddressBalances
+      ?.map((address) => ({
+        ownerAddress: address?.ownerAddress,
+        balance: address?.tokensTotalDenominatedValue?.value,
+      }))
+      .filter(isImportableAccount)
+
+    const accountsWithBalanceOrUnitag: ImportableAccount[] | undefined = importableAccounts?.filter((address) => {
+      const hasBalance = Boolean(address.balance && address.balance > 0)
+      const hasUnitag = unitagsByAddress?.[address.ownerAddress] !== undefined
+      return hasBalance || hasUnitag
+    })
+
+    if (accountsWithBalanceOrUnitag?.length) {
+      return accountsWithBalanceOrUnitag
+    }
+
+    // If all addresses have 0 total token value and no unitags are associated with any of them, show the first address.
+    const firstImportableAccount: ImportableAccount | undefined = importableAccounts?.[0]
+    if (firstImportableAccount) {
+      return [firstImportableAccount]
+    }
+
+    // If query for address balances returned no results, show the first address.
+    const firstPendingAddress = addresses[0]
+    if (firstPendingAddress) {
+      return [{ ownerAddress: firstPendingAddress, balance: undefined }]
+    }
+
+    throw new Error('No importable accounts found')
+    // We use `refetchCount` as a dependency to manually trigger a refetch when calling the `refetch` function.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [addresses, apolloClient, refetchCount])
+
+  const response = useAsyncData(fetch)
+
+  return useMemo(
+    () => ({
+      ...response,
+      refetch,
+    }),
+    [refetch, response],
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/GetOnTheBetaWaitlistBanner.tsx b/apps/extension/src/app/features/onboarding/intro/GetOnTheBetaWaitlistBanner.tsx
new file mode 100644
index 00000000000..ce5fee91068
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/GetOnTheBetaWaitlistBanner.tsx
@@ -0,0 +1,43 @@
+import { useTranslation } from 'react-i18next'
+import { Button, Flex, FlexProps, Image, Text, useIsDarkMode } from 'ui/src'
+import { APP_SCREENSHOT_DARK, APP_SCREENSHOT_LIGHT } from 'ui/src/assets'
+import { RotatableChevron } from 'ui/src/components/icons'
+
+export function GetOnTheBetaWaitlistBanner(): JSX.Element {
+  const { t } = useTranslation()
+  const isDarkMode = useIsDarkMode()
+
+  return (
+    <Button
+      alignItems="center"
+      backgroundColor="$surface1"
+      borderColor="$surface3"
+      borderRadius="$rounded20"
+      borderWidth="$spacing1"
+      display="flex"
+      hoverStyle={{ backgroundColor: '$surface2' } as FlexProps}
+      justifyContent="space-between"
+      p="$spacing16"
+      pl="$spacing24"
+      pressStyle={{ backgroundColor: '$surface3' } as FlexProps}
+      width="100%"
+      onPress={() => {
+        window.open('https://wallet.uniswap.org/')
+      }}
+    >
+      <Flex alignItems="center" flexDirection="row" gap="$spacing16" justifyContent="center">
+        <Image height="52px" source={isDarkMode ? APP_SCREENSHOT_DARK : APP_SCREENSHOT_LIGHT} width="52px" />
+        <Flex alignItems="flex-start" flexDirection="column" gap="$spacing4">
+          <Text color="$accent1" fontSize="$small" variant="buttonLabel2">
+            {t('onboarding.extension.getOnTheBetaWaitlist.title')}
+          </Text>
+
+          <Text color="$neutral2" fontSize="$small" variant="body3">
+            {t('onboarding.extension.getOnTheBetaWaitlist.subtitle')}
+          </Text>
+        </Flex>
+      </Flex>
+      <RotatableChevron color="$neutral3" direction="right" />
+    </Button>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/IntroScreen.tsx b/apps/extension/src/app/features/onboarding/intro/IntroScreen.tsx
new file mode 100644
index 00000000000..8e795dbf317
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/IntroScreen.tsx
@@ -0,0 +1,72 @@
+import { useTranslation } from 'react-i18next'
+import { Complete } from 'src/app/features/onboarding/Complete'
+import { SyncFromPhoneButton } from 'src/app/features/onboarding/SyncFromPhoneButton'
+import { Terms } from 'src/app/features/onboarding/Terms'
+import { MainIntroWrapper } from 'src/app/features/onboarding/intro/MainIntroWrapper'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { checksIfSupportsSidePanel } from 'src/app/utils/chrome'
+import { isOnboardedSelector } from 'src/app/utils/isOnboardedSelector'
+import { useAppSelector } from 'src/store/store'
+import { Button, Flex, Text } from 'ui/src'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { useTimeout } from 'utilities/src/time/timing'
+
+export function IntroScreen(): JSX.Element {
+  const { t } = useTranslation()
+
+  const isOnboarded = useAppSelector(isOnboardedSelector)
+
+  // Detections for some unsupported browsers may not work until stylesheet is loaded
+  useTimeout(() => {
+    if (!checksIfSupportsSidePanel()) {
+      navigate(`/${TopLevelRoutes.Onboarding}/${OnboardingRoutes.UnsupportedBrowser}`)
+    }
+  }, 0)
+
+  if (isOnboarded) {
+    return <Complete />
+  }
+
+  return (
+    <Trace logImpression screen={ExtensionOnboardingScreens.Landing}>
+      <Flex centered grow justifyContent="center">
+        <MainIntroWrapper
+          belowFrameContent={
+            <Flex px={80}>
+              <Terms />
+            </Flex>
+          }
+        >
+          <Flex gap="$spacing12" pb="$spacing16" pt="$spacing32">
+            <Flex backgroundColor="$surface1" borderRadius="$rounded16">
+              <Button
+                flexGrow={1}
+                theme="primary"
+                onPress={(): void => navigate(`/${TopLevelRoutes.Onboarding}/${OnboardingRoutes.Create}`)}
+              >
+                {t('onboarding.landing.button.create')}
+              </Button>
+            </Flex>
+            <Button
+              flexGrow={1}
+              theme="secondary"
+              onPress={(): void => navigate(`/${TopLevelRoutes.Onboarding}/${OnboardingRoutes.Import}`)}
+            >
+              {t('onboarding.intro.button.alreadyHave')}
+            </Button>
+          </Flex>
+          <Flex row alignItems="center" gap="$spacing16" py="$spacing4">
+            <Flex fill backgroundColor="$surface3" height={1} />
+            <Text color="$neutral3" variant="body3">
+              {t('onboarding.intro.mobileScan.title')}
+            </Text>
+            <Flex fill backgroundColor="$surface3" height={1} />
+          </Flex>
+          <SyncFromPhoneButton fill />
+        </MainIntroWrapper>
+      </Flex>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/IntroScreenBetaWaitlist.tsx b/apps/extension/src/app/features/onboarding/intro/IntroScreenBetaWaitlist.tsx
new file mode 100644
index 00000000000..d6bbb23be7b
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/IntroScreenBetaWaitlist.tsx
@@ -0,0 +1,246 @@
+import { useCallback, useEffect, useReducer, useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { Complete } from 'src/app/features/onboarding/Complete'
+import { GetOnTheBetaWaitlistBanner } from 'src/app/features/onboarding/intro/GetOnTheBetaWaitlistBanner'
+import { MainContentWrapper } from 'src/app/features/onboarding/intro/MainContentWrapper'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { checksIfSupportsSidePanel } from 'src/app/utils/chrome'
+import { isOnboardedSelector } from 'src/app/utils/isOnboardedSelector'
+import { UNISWAP_BETA_LOGO } from 'src/assets'
+import { useAppSelector } from 'src/store/store'
+import { Button, Flex, Image, Input, SpinningLoader, Text, useSporeColors } from 'ui/src'
+import { ApproveFilled, FileListLock, Unitag } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { UnitagWaitlistPositionResponse } from 'uniswap/src/features/unitags/types'
+import { shortenAddress } from 'uniswap/src/utils/addresses'
+import { useTimeout } from 'utilities/src/time/timing'
+import { fetchExtensionWaitlistEligibity } from 'wallet/src/features/unitags/api'
+
+const UNISWAP_BETA_LOGO_SIZE = 68
+
+export function IntroScreenBetaWaitlist(): JSX.Element {
+  const { t, i18n } = useTranslation()
+  const colors = useSporeColors()
+
+  const [username, setUsername] = useState('')
+  const [eligibility, setEligibility] = useState<UnitagWaitlistPositionResponse | undefined>()
+  const [checkingEligibility, setCheckingEligibility] = useState(false)
+
+  const [_, forceUpdate] = useReducer((x: number): number => x + 1, 0)
+
+  useEffect(() => {
+    // Initial language change not lead to a rerender for onboarding app
+    forceUpdate()
+  }, [i18n.language])
+
+  // Detections for some unsupported browsers may not work until stylesheet is loaded
+  useTimeout(() => {
+    if (!checksIfSupportsSidePanel()) {
+      navigate(`/${TopLevelRoutes.Onboarding}/${OnboardingRoutes.UnsupportedBrowser}`)
+    }
+  }, 0)
+
+  const isSubmitDisabled = (eligibility && !eligibility.isAccepted) || checkingEligibility || !username
+
+  const onCheckEligibility = async (): Promise<void> => {
+    if (isSubmitDisabled) {
+      return
+    }
+
+    setCheckingEligibility(true)
+
+    const { data } = await fetchExtensionWaitlistEligibity(username)
+
+    setCheckingEligibility(false)
+    setEligibility(data)
+  }
+
+  const onChangeText = (text: string): void => {
+    setUsername(text.trim())
+    setEligibility(undefined)
+  }
+
+  const isOnboarded = useAppSelector(isOnboardedSelector)
+
+  if (isOnboarded) {
+    return <Complete />
+  }
+
+  if (eligibility && eligibility.isAccepted) {
+    return <EligibleUnitag address={eligibility.address} username={username} />
+  }
+
+  return (
+    <Flex centered grow gap="$spacing24" justifyContent="center">
+      <MainContentWrapper>
+        <Flex centered backgroundColor="$surface1" borderRadius="$rounded24" flexGrow={0}>
+          <Image
+            height={UNISWAP_BETA_LOGO_SIZE}
+            source={UNISWAP_BETA_LOGO}
+            theme="primary"
+            width={UNISWAP_BETA_LOGO_SIZE}
+          />
+        </Flex>
+
+        <Flex position="relative" pt="$spacing16">
+          <Text textAlign="center" variant="heading2">
+            Uniswap Wallet
+          </Text>
+
+          <Text
+            borderRadius="$rounded8"
+            borderWidth={2}
+            color="$accent1"
+            pb={1}
+            position="absolute"
+            pt={2}
+            px={4}
+            right={28}
+            textAlign="center"
+            top={14}
+            variant="buttonLabel4"
+            // eslint-disable-next-line react/jsx-sort-props
+            fontWeight="500"
+          >
+            BETA
+          </Text>
+        </Flex>
+
+        <Text color="$neutral2" mt="$spacing8" px="$spacing24" textAlign="center" variant="body2">
+          <Trans
+            components={{ highlight: <Text color="$accent1" variant="body2" /> }}
+            i18nKey="onboarding.introBetaWaitlist.checkEligibilityInstructions"
+            t={t}
+          />
+        </Text>
+
+        <Flex
+          borderColor={colors.surface3.val}
+          borderRadius="$rounded20"
+          borderWidth={1}
+          flexDirection="row"
+          mt="$spacing32"
+          p="$spacing20"
+        >
+          <Flex fill>
+            <Input
+              autoFocus
+              autoCapitalize="none"
+              autoComplete="off"
+              backgroundColor="$surface1"
+              borderRadius="$rounded12"
+              color="$neutral1"
+              fontFamily="$body"
+              fontSize={24}
+              height="100%"
+              placeholder={t('onboarding.introBetaWaitlist.unitagPlaceholder')}
+              placeholderTextColor="$neutral3"
+              value={username}
+              width="100%"
+              onChangeText={onChangeText}
+              onSubmitEditing={onCheckEligibility}
+            />
+          </Flex>
+
+          <Text color="$neutral2" variant="heading3">
+            .uni.eth
+          </Text>
+        </Flex>
+
+        {eligibility && !eligibility.isAccepted && (
+          <Flex
+            row
+            backgroundColor="$surface2"
+            borderRadius="$rounded16"
+            gap="$spacing12"
+            mt="$spacing12"
+            px="$spacing16"
+            py="$spacing12"
+          >
+            <Flex centered>
+              <FileListLock color="$neutral2" size={iconSizes.icon16} />
+            </Flex>
+
+            <Flex fill>
+              <Text color="$neutral2" variant="body3">
+                {t('onboarding.introBetaWaitlist.ineligibleExplanation')}
+              </Text>
+            </Flex>
+          </Flex>
+        )}
+
+        <Button disabled={isSubmitDisabled} height={50} mt="$spacing24" onPress={onCheckEligibility}>
+          {checkingEligibility ? <SpinningLoader /> : t('onboarding.introBetaWaitlist.button.checkEligibility')}
+        </Button>
+      </MainContentWrapper>
+
+      <GetOnTheBetaWaitlistBanner />
+    </Flex>
+  )
+}
+
+function EligibleUnitag({ address, username }: { address: string; username: string }): JSX.Element {
+  const { t } = useTranslation()
+  const colors = useSporeColors()
+
+  const onContinue = useCallback(() => {
+    navigate(`/${TopLevelRoutes.Onboarding}/${OnboardingRoutes.Scan}`)
+  }, [])
+
+  useEffect(() => {
+    const handleKeyPress = (event: KeyboardEvent): void => {
+      if (event.key === 'Enter') {
+        onContinue()
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyPress)
+
+    return () => {
+      window.removeEventListener('keydown', handleKeyPress)
+    }
+  }, [onContinue])
+
+  return (
+    <Flex centered grow gap="$spacing16" justifyContent="center">
+      <MainContentWrapper>
+        <Flex centered backgroundColor="$surface1" borderRadius="$rounded24" flexGrow={0}>
+          <Flex backgroundColor={colors.statusSuccess2.val} borderRadius="$rounded16" p="$spacing12">
+            <ApproveFilled color={colors.statusSuccess.val} size={iconSizes.icon40} />
+          </Flex>
+        </Flex>
+
+        <Flex pt="$spacing16">
+          <Text textAlign="center" variant="heading3">
+            {t('onboarding.introBetaWaitlist.eligible.title')}
+          </Text>
+        </Flex>
+
+        <Text color="$neutral2" mt="$spacing8" mx="$spacing24" textAlign="center" variant="body2">
+          {t('onboarding.introBetaWaitlist.eligible.tagline')}
+        </Text>
+
+        <Flex centered gap="$spacing12" my="$spacing32">
+          <Flex centered row gap="$spacing8">
+            <Text color="$neutral1" variant="heading2">
+              {username}
+            </Text>
+
+            <Flex mt="$spacing4">
+              <Unitag color={colors.accent1.val} size={iconSizes.icon36} />
+            </Flex>
+          </Flex>
+
+          <Text color="$neutral3" variant="body2">
+            {shortenAddress(address)}
+          </Text>
+        </Flex>
+
+        <Button mt="$spacing24" onPress={onContinue}>
+          {t('onboarding.introBetaWaitlist.button.letsGo')}
+        </Button>
+      </MainContentWrapper>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/MainContentWrapper.tsx b/apps/extension/src/app/features/onboarding/intro/MainContentWrapper.tsx
new file mode 100644
index 00000000000..e6109e1f6b3
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/MainContentWrapper.tsx
@@ -0,0 +1,23 @@
+import { PropsWithChildren } from 'react'
+import { ONBOARDING_CONTENT_WIDTH } from 'src/app/features/onboarding/utils'
+import { Flex } from 'ui/src'
+
+export function MainContentWrapper({ children }: PropsWithChildren): JSX.Element {
+  return (
+    <Flex
+      backgroundColor="$surface1"
+      borderColor="$surface3"
+      borderRadius="$rounded32"
+      borderWidth={1}
+      pb="$spacing24"
+      pt="$spacing48"
+      px="$spacing24"
+      shadowColor="$shadowColor"
+      shadowOpacity={0.1}
+      shadowRadius={16}
+      width={ONBOARDING_CONTENT_WIDTH}
+    >
+      {children}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/MainIntroWrapper.tsx b/apps/extension/src/app/features/onboarding/intro/MainIntroWrapper.tsx
new file mode 100644
index 00000000000..c76615a7a06
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/MainIntroWrapper.tsx
@@ -0,0 +1,42 @@
+import { PropsWithChildren, ReactNode } from 'react'
+import { ONBOARDING_CONTENT_WIDTH } from 'src/app/features/onboarding/utils'
+import { Flex } from 'ui/src'
+import { LandingBackground } from 'wallet/src/components/landing/LandingBackground'
+
+// Fixed padding value to align content with a certain point on the background
+const CONTAINER_PADDING_TOP = 340
+const LANDING_BACKGROUND_SIZE = 400
+
+export function MainIntroWrapper({
+  children,
+  belowFrameContent,
+}: PropsWithChildren<{ belowFrameContent?: ReactNode }>): JSX.Element {
+  return (
+    <Flex width={ONBOARDING_CONTENT_WIDTH}>
+      <Flex
+        backgroundColor="$surface1"
+        borderColor="$surface3"
+        borderRadius="$rounded32"
+        borderWidth={1}
+        overflow="hidden"
+        shadowColor="$shadowColor"
+        shadowOpacity={0.1}
+        shadowRadius={16}
+      >
+        <Flex alignItems="center" position="absolute" width="100%">
+          <Flex height={LANDING_BACKGROUND_SIZE} width={LANDING_BACKGROUND_SIZE}>
+            <LandingBackground />
+          </Flex>
+        </Flex>
+        <Flex fill pb="$spacing24" pt={CONTAINER_PADDING_TOP} px="$spacing24">
+          {children}
+        </Flex>
+      </Flex>
+      {belowFrameContent && (
+        <Flex fill pt="$spacing32">
+          {belowFrameContent}
+        </Flex>
+      )}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/intro/UnsupportedBrowserScreen.tsx b/apps/extension/src/app/features/onboarding/intro/UnsupportedBrowserScreen.tsx
new file mode 100644
index 00000000000..9336a2764a5
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/intro/UnsupportedBrowserScreen.tsx
@@ -0,0 +1,41 @@
+import { useTranslation } from 'react-i18next'
+import { MainIntroWrapper } from 'src/app/features/onboarding/intro/MainIntroWrapper'
+import { Flex, Text } from 'ui/src'
+import { AlertTriangle } from 'ui/src/components/icons'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+
+export function UnsupportedBrowserScreen(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Trace logImpression screen={ExtensionScreens.UnsupportedBrowserScreen}>
+      <Flex centered grow gap="$spacing16" justifyContent="center">
+        <MainIntroWrapper>
+          <Flex fill justifyContent="flex-end">
+            <Flex
+              row
+              alignItems="flex-start"
+              backgroundColor="$surface2"
+              borderRadius="$rounded16"
+              gap="$spacing12"
+              p="$spacing12"
+            >
+              <Flex backgroundColor="$surface3" borderRadius="$rounded12" p={10}>
+                <AlertTriangle size="$icon.20" />
+              </Flex>
+              <Flex fill gap="$spacing2">
+                <Text color="$neutral1" variant="body3">
+                  {t('onboarding.extension.unsupported.title')}
+                </Text>
+                <Text color="$neutral2" variant="body3">
+                  {t('onboarding.extension.unsupported.description')}
+                </Text>
+              </Flex>
+            </Flex>
+          </Flex>
+        </MainIntroWrapper>
+      </Flex>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/reset/ResetComplete.tsx b/apps/extension/src/app/features/onboarding/reset/ResetComplete.tsx
new file mode 100644
index 00000000000..0e64b2b9976
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/reset/ResetComplete.tsx
@@ -0,0 +1,34 @@
+import { useTranslation } from 'react-i18next'
+import { terminateStoreSynchronization } from 'src/store/storeSynchronization'
+import { Flex, Text } from 'ui/src'
+import { Check, GraduationCap } from 'ui/src/components/icons'
+import { useFinishOnboarding } from 'wallet/src/features/onboarding/OnboardingContext'
+
+export function ResetComplete(): JSX.Element {
+  const { t } = useTranslation()
+
+  // Activates onboarding accounts on component mount
+  useFinishOnboarding(terminateStoreSynchronization)
+
+  return (
+    <>
+      <Flex centered gap="$spacing24">
+        <Flex backgroundColor="$DEP_accentSuccessSoft" borderRadius="$roundedFull" p="$spacing16">
+          <Check color="$statusSuccess" size="$icon.36" />
+        </Flex>
+        <Flex alignItems="center" gap="$spacing4">
+          <Text variant="heading3">{t('onboarding.resetPassword.complete.title')}</Text>
+          <Text color="$neutral2" variant="body2">
+            {t('onboarding.resetPassword.complete.subtitle')}
+          </Text>
+        </Flex>
+        <Flex row alignItems="center" gap="$spacing8">
+          <GraduationCap color="$neutral3" size="$icon.20" />
+          <Text color="$neutral3" variant="buttonLabel3">
+            {t('onboarding.resetPassword.complete.safety')}
+          </Text>
+        </Flex>
+      </Flex>
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/scan/OTPInput.tsx b/apps/extension/src/app/features/onboarding/scan/OTPInput.tsx
new file mode 100644
index 00000000000..f835447c708
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/scan/OTPInput.tsx
@@ -0,0 +1,232 @@
+import { createRef, RefObject, useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { NativeSyntheticEvent, TextInput, TextInputChangeEventData, TextInputKeyPressEventData } from 'react-native'
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { useScantasticContext } from 'src/app/features/onboarding/scan/ScantasticContextProvider'
+import { decryptMessage } from 'src/app/features/onboarding/scan/utils'
+import { Flex, Input, inputStyles, Square, Text } from 'ui/src'
+import { Mobile } from 'ui/src/components/icons'
+import { fonts, iconSizes } from 'ui/src/theme'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+import { arraysAreEqual } from 'utilities/src/primitives/array'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useInterval, useTimeout } from 'utilities/src/time/timing'
+import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
+import { getOtpDurationString } from 'wallet/src/utils/duration'
+
+const MAX_FAILED_OTP_ATTEMPTS = 3
+
+type CharacterSequence = [string, string, string, string, string, string]
+const INITIAL_CHARACTER_SEQUENCE: CharacterSequence = ['', '', '', '', '', '']
+
+export function OTPInput(): JSX.Element {
+  const { t } = useTranslation()
+  const { goToNextStep, goToPreviousStep } = useOnboardingSteps()
+
+  const { addOnboardingAccountMnemonic } = useOnboardingContext()
+  const { privateKey, resetScantastic, sessionUUID, expirationTimestamp } = useScantasticContext()
+  const resetFlowAndNavBack = useCallback((): void => {
+    resetScantastic()
+    goToPreviousStep()
+  }, [goToPreviousStep, resetScantastic])
+
+  const [expiryText, setExpiryText] = useState(getOtpDurationString(expirationTimestamp))
+
+  const setExpirationText = useCallback(() => {
+    const expirationString = getOtpDurationString(expirationTimestamp)
+    setExpiryText(expirationString)
+  }, [expirationTimestamp])
+  useInterval(setExpirationText, ONE_SECOND_MS)
+
+  if (!sessionUUID || !privateKey) {
+    resetFlowAndNavBack()
+  }
+
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState(false)
+  const [failedAttemptCount, setFailedAttemptCount] = useState<number>(0)
+  const [characterSequence, setCharacterSequence] = useState<CharacterSequence>(INITIAL_CHARACTER_SEQUENCE)
+
+  const inputRefs = useRef<RefObject<TextInput>[]>([])
+  inputRefs.current = new Array(6).fill(null).map((_, i) => inputRefs.current[i] || createRef<TextInput>())
+
+  // Add all accounts from mnemonic.
+  const onSubmit = useCallback(
+    async (mnemonic: string[]) => {
+      addOnboardingAccountMnemonic(mnemonic)
+      goToNextStep()
+    },
+    [goToNextStep, addOnboardingAccountMnemonic],
+  )
+
+  useEffect(() => {
+    if (error && !arraysAreEqual(characterSequence, INITIAL_CHARACTER_SEQUENCE)) {
+      setCharacterSequence(INITIAL_CHARACTER_SEQUENCE)
+    }
+  }, [error, characterSequence])
+
+  const submitOTP = useCallback(async (): Promise<void> => {
+    if (!privateKey || !sessionUUID) {
+      return
+    }
+    setError(false)
+    setLoading(true)
+    // submit OTP to receive blob
+    const response = await fetch(`${uniswapUrls.scantasticApiUrl}/otp`, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        uuid: sessionUUID,
+        otp: characterSequence.join(''),
+      }),
+    })
+
+    if (!response.ok) {
+      setCharacterSequence(INITIAL_CHARACTER_SEQUENCE)
+      throw new Error(`Failed to submit OTP: ${await response.text()}`)
+    }
+
+    const data = (await response.json()) as { encryptedSeed?: string; OTPFailedAttempts?: number }
+    if (!data.encryptedSeed) {
+      if (data.OTPFailedAttempts) {
+        if (Number(data.OTPFailedAttempts) === MAX_FAILED_OTP_ATTEMPTS) {
+          resetFlowAndNavBack()
+          return
+        } else {
+          setFailedAttemptCount(data.OTPFailedAttempts)
+          return
+        }
+      }
+      throw new Error(`fetch(${uniswapUrls.scantasticApiUrl}/otp failed to include an encrypted seed`)
+    }
+    const preImage = await decryptMessage(privateKey, data.encryptedSeed)
+    const words = preImage.split(' ')
+
+    const newMnemonic = Array(24)
+      .fill('')
+      .map((_, i) => (words[i] || '') as string)
+      .filter((word) => !!word)
+
+    await onSubmit(newMnemonic)
+  }, [privateKey, sessionUUID, characterSequence, onSubmit, resetFlowAndNavBack])
+
+  const handleChange = useCallback(
+    (index: number) =>
+      (event: NativeSyntheticEvent<TextInputChangeEventData>): void => {
+        setError(false)
+        const newCharacters: CharacterSequence = [...characterSequence]
+        newCharacters[index] = event.nativeEvent.text
+        setCharacterSequence(newCharacters)
+
+        if (newCharacters[index]?.length === 1 && inputRefs.current[index + 1]?.current) {
+          inputRefs.current[index + 1]?.current?.focus()
+        }
+      },
+    [characterSequence, setCharacterSequence],
+  )
+
+  const handleKeyPress = useCallback(
+    (index: number) =>
+      (event: NativeSyntheticEvent<TextInputKeyPressEventData>): void => {
+        if (index !== 0 && event.nativeEvent.key === 'Backspace') {
+          inputRefs.current[index - 1]?.current?.focus()
+        }
+      },
+    [],
+  )
+
+  useEffect(() => {
+    const allCharactersFilled = characterSequence.every((element) => element !== '')
+    if (allCharactersFilled && !loading && !error) {
+      submitOTP()
+        .catch((e) => {
+          inputRefs.current[0]?.current?.focus()
+          logger.error(e, {
+            tags: { file: 'OTPInput.tsx', function: 'submitOTP' },
+            extra: { uuid: sessionUUID },
+          })
+          setError(true)
+        })
+        .finally(() => {
+          setLoading(false)
+        })
+    }
+  }, [characterSequence, loading, error, sessionUUID, submitOTP])
+
+  useTimeout(resetFlowAndNavBack, expirationTimestamp - Date.now())
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.Scantastic }}
+      screen={ExtensionOnboardingScreens.EnterOTP}
+    >
+      <OnboardingScreen
+        Icon={
+          <Square
+            backgroundColor="$surface2"
+            borderRadius="$rounded12"
+            height={iconSizes.icon48}
+            width={iconSizes.icon48}
+          >
+            <Mobile color="$neutral1" size={iconSizes.icon24} />
+          </Square>
+        }
+        nextButtonEnabled={false}
+        nextButtonText={expiryText}
+        nextButtonTheme="secondary"
+        subtitle={t('onboarding.scan.otp.subtitle')}
+        title={t('onboarding.scan.otp.title')}
+        onBack={resetFlowAndNavBack}
+        onSubmit={(): void => undefined}
+      >
+        <Flex gap="$spacing16" mb="$spacing60" mt="$spacing48">
+          <Flex alignContent="center" alignItems="center" flexDirection="row" gap="$spacing8" position="relative">
+            {characterSequence.map((character, index) => (
+              <Input
+                key={index}
+                ref={inputRefs.current[index]}
+                autoFocus={index === 0}
+                backgroundColor={character ? '$surface1' : '$surface2'}
+                borderColor="$surface3"
+                borderRadius="$rounded16"
+                borderWidth={1}
+                disabled={loading}
+                focusStyle={inputStyles.inputFocus}
+                fontSize={fonts.heading3.fontSize}
+                height="$spacing60"
+                hoverStyle={inputStyles.inputHover}
+                maxLength={1}
+                p="$spacing20"
+                placeholderTextColor="$neutral3"
+                textAlign="center"
+                value={character}
+                width="$spacing60"
+                onChange={handleChange(index)}
+                onKeyPress={handleKeyPress(index)}
+              />
+            ))}
+          </Flex>
+
+          {error && (
+            <Text color="$statusCritical" textAlign="center" variant="body2">
+              {t('onboarding.scan.otp.error')}
+            </Text>
+          )}
+          {failedAttemptCount > 0 && (
+            <Text color="$statusCritical" textAlign="center" variant="body2">
+              {t('onboarding.scan.otp.failed', { number: failedAttemptCount })}
+            </Text>
+          )}
+        </Flex>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/scan/ScanToOnboard.tsx b/apps/extension/src/app/features/onboarding/scan/ScanToOnboard.tsx
new file mode 100644
index 00000000000..e7915bca2fc
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/scan/ScanToOnboard.tsx
@@ -0,0 +1,311 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  cancelAnimation,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withSequence,
+  withSpring,
+} from 'react-native-reanimated'
+import { SpringConfig } from 'react-native-reanimated/lib/typescript/reanimated2/animation/springUtils'
+import QRCode from 'react-qr-code' //TODO(EXT-476): Replace with custom QR code designs
+import { OnboardingScreen } from 'src/app/features/onboarding/OnboardingScreen'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { Terms } from 'src/app/features/onboarding/Terms'
+import { useScantasticContext } from 'src/app/features/onboarding/scan/ScantasticContextProvider'
+import { getScantasticUrl } from 'src/app/features/onboarding/scan/utils'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import UAParser from 'ua-parser-js'
+import { Flex, Image, Square, Text, useSporeColors } from 'ui/src'
+import { DOT_GRID, UNISWAP_LOGO } from 'ui/src/assets'
+import { Mobile, Wifi } from 'ui/src/components/icons'
+import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
+import { iconSizes, zIndices } from 'ui/src/theme'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ExtensionOnboardingFlow, ExtensionOnboardingScreens } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useTimeout } from 'utilities/src/time/timing'
+import { ScantasticParamsSchema } from 'wallet/src/features/scantastic/types'
+
+const UNISWAP_LOGO_SIZE = 52
+const UNISWAP_LOGO_SCALE_LOADING = 1.2
+const UNISWAP_LOGO_SCALE_DEFAULT = 1
+const QR_CODE_SIZE = 212
+
+function useDocumentVisibility(): boolean {
+  const [isDocumentVisible, setIsDocumentVisible] = useState(!document.hidden)
+
+  const handleVisibilityChange = (): void => {
+    setIsDocumentVisible(!document.hidden)
+  }
+
+  useEffect(() => {
+    document.addEventListener('visibilitychange', handleVisibilityChange)
+
+    return () => {
+      document.removeEventListener('visibilitychange', handleVisibilityChange)
+    }
+  }, [])
+
+  return isDocumentVisible
+}
+
+export function ScanToOnboard(): JSX.Element {
+  const colors = useSporeColors()
+  const { t } = useTranslation()
+
+  const { goToNextStep } = useOnboardingSteps()
+  const isDocumentVisible = useDocumentVisibility()
+
+  const { sessionUUID, isLoadingUUID, publicKey, resetScantastic, expirationTimestamp, setExpirationTimestamp } =
+    useScantasticContext()
+
+  const scantasticValue = useMemo(() => {
+    const parser = new UAParser(window.navigator.userAgent)
+    const {
+      device: { vendor, model },
+      browser: { name: browser },
+    } = parser.getResult()
+
+    if (!publicKey || !sessionUUID) {
+      return ''
+    }
+
+    try {
+      const params = ScantasticParamsSchema.parse({
+        uuid: sessionUUID,
+        publicKey,
+        vendor,
+        browser,
+        model,
+      })
+
+      return getScantasticUrl(params)
+    } catch (e) {
+      const wrappedError = new Error('Failed to build scantastic params', { cause: e })
+      logger.error(wrappedError, {
+        tags: {
+          file: 'ScanToOnboard.tsx',
+          function: 'useMemo',
+        },
+      })
+      return ''
+    }
+  }, [publicKey, sessionUUID])
+
+  const errorDerivingQR = Boolean(!isLoadingUUID && !scantasticValue)
+
+  const checkOTPState = useCallback(async (): Promise<void> => {
+    if (!sessionUUID) {
+      return
+    }
+    try {
+      // poll OTP state
+      const response = await fetch(`${uniswapUrls.scantasticApiUrl}/otp-state/${sessionUUID}`, {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+        },
+      })
+
+      if (!response.ok) {
+        throw new Error(`Failed to check OTP state: ${await response.text()}`)
+      }
+      const data = (await response.json()) as { otp: string; expiresAtInSeconds: number }
+      const otpState = data.otp
+      if (!otpState) {
+        throw new Error(`Scantastic OTP check response did not include the requested OTP state`)
+      }
+
+      setExpirationTimestamp((current) => data?.expiresAtInSeconds * ONE_SECOND_MS ?? current)
+
+      // mobile app has received the OTP and the user should input it into this UI
+      if (otpState === 'ready') {
+        goToNextStep()
+      }
+      if (otpState === 'expired') {
+        resetScantastic()
+      }
+    } catch (e) {
+      logger.error(e, {
+        tags: {
+          file: 'ScanToOnboard.tsx',
+          function: 'checkOTPState',
+        },
+        extra: { uuid: sessionUUID },
+      })
+    }
+  }, [sessionUUID, setExpirationTimestamp, goToNextStep, resetScantastic])
+
+  useEffect(() => {
+    let interval: NodeJS.Timeout | undefined
+
+    if (isDocumentVisible) {
+      interval = setInterval(checkOTPState, ONE_SECOND_MS)
+    }
+
+    return () => clearInterval(interval)
+  }, [checkOTPState, isDocumentVisible])
+
+  useTimeout(resetScantastic, expirationTimestamp - Date.now())
+
+  const qrScale = useSharedValue(UNISWAP_LOGO_SCALE_DEFAULT)
+  useEffect(() => {
+    if (!isLoadingUUID) {
+      qrScale.value = UNISWAP_LOGO_SCALE_DEFAULT
+      return
+    }
+
+    const springConfig: SpringConfig = {
+      mass: 1,
+      stiffness: 80,
+      damping: 20,
+    }
+    qrScale.value = withRepeat(
+      withSequence(
+        withSpring(UNISWAP_LOGO_SCALE_LOADING, springConfig),
+        withSpring(UNISWAP_LOGO_SCALE_DEFAULT, springConfig),
+      ),
+      0,
+      true,
+    )
+
+    return () => cancelAnimation(qrScale)
+  }, [isLoadingUUID, qrScale])
+  // Using useAnimatedStyle and AnimatedFlex because tamagui scale animation not working
+  const qrAnimatedStyle = useAnimatedStyle(() => {
+    return {
+      transform: `scale(${qrScale.value})`,
+    }
+  }, [qrScale])
+
+  const scantasticOnboardingOnly = useFeatureFlag(FeatureFlags.ScantasticOnboardingOnly)
+
+  return (
+    <Trace
+      logImpression
+      properties={{ flow: ExtensionOnboardingFlow.Scantastic }}
+      screen={ExtensionOnboardingScreens.OnboardingQRCode}
+    >
+      <OnboardingScreen
+        Icon={
+          <Square
+            backgroundColor="$surface2"
+            borderRadius="$rounded12"
+            height={iconSizes.icon48}
+            width={iconSizes.icon48}
+          >
+            <Mobile color="$neutral1" size={iconSizes.icon24} />
+          </Square>
+        }
+        nextButtonEnabled={false}
+        nextButtonText={
+          scantasticOnboardingOnly
+            ? undefined
+            : errorDerivingQR
+              ? t('common.button.retry')
+              : t('onboarding.scan.button')
+        }
+        nextButtonTheme="secondary"
+        subtitle={t('onboarding.scan.subtitle')}
+        title={t('onboarding.scan.title')}
+        onBack={
+          scantasticOnboardingOnly
+            ? undefined
+            : (): void => navigate(`/${TopLevelRoutes.Onboarding}`, { replace: true })
+        }
+      >
+        <Flex alignItems="center" width="100%">
+          <Flex
+            alignContent="center"
+            alignItems="center"
+            backgroundColor={colors.sporeWhite.val}
+            borderColor="$surface3"
+            borderRadius="$rounded16"
+            borderWidth="$spacing1"
+            flexDirection="column"
+            my="$spacing24"
+            p="$spacing16"
+            position="relative"
+            shadowColor="$shadowColor"
+            shadowOpacity={0.4}
+            shadowRadius="$spacing4"
+          >
+            {errorDerivingQR ? (
+              <Flex height={QR_CODE_SIZE} width={QR_CODE_SIZE}>
+                <Text color="$statusCritical" m="auto" textAlign="center" variant="body2">
+                  {t('onboarding.scan.error')}
+                </Text>
+              </Flex>
+            ) : (
+              <>
+                {/*
+                NOTE: if you modify the style or colors of the QR code, make sure to thoroughly test how they perform when scanning them both on light and dark modes.
+               */}
+                <AnimatedFlex
+                  alignItems="center"
+                  backgroundColor={isLoadingUUID ? '$transparent' : '$surface1'}
+                  borderRadius="$rounded12"
+                  height={UNISWAP_LOGO_SIZE}
+                  justifyContent="center"
+                  position="absolute"
+                  style={qrAnimatedStyle}
+                  top={`calc(50% - ${UNISWAP_LOGO_SIZE / 2}px)`}
+                  width={UNISWAP_LOGO_SIZE}
+                  zIndex={zIndices.default}
+                >
+                  <Image height={iconSizes.icon40} source={UNISWAP_LOGO} width={iconSizes.icon40} />
+                </AnimatedFlex>
+                {isLoadingUUID ? (
+                  <Image height={QR_CODE_SIZE} source={DOT_GRID} width={QR_CODE_SIZE} />
+                ) : (
+                  <Flex
+                    animateOnly={['opacity']}
+                    animation="lazy"
+                    enterStyle={{
+                      opacity: 0,
+                    }}
+                  >
+                    <QRCode
+                      bgColor="transparent"
+                      fgColor={colors.sporeBlack.val}
+                      size={QR_CODE_SIZE}
+                      value={scantasticValue}
+                    />
+                  </Flex>
+                )}
+              </>
+            )}
+          </Flex>
+          <Flex
+            fill
+            row
+            alignItems="center"
+            backgroundColor="$surface2"
+            borderRadius="$rounded12"
+            gap="$spacing8"
+            p="$spacing12"
+            width="100%"
+          >
+            <Wifi size={iconSizes.icon20} />
+            <Text color="$neutral2" variant="body4">
+              {t('onboarding.scan.wifi')}
+            </Text>
+          </Flex>
+
+          {scantasticOnboardingOnly && (
+            <Flex px="$spacing60">
+              <Terms />
+            </Flex>
+          )}
+        </Flex>
+      </OnboardingScreen>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/onboarding/scan/ScantasticContextProvider.tsx b/apps/extension/src/app/features/onboarding/scan/ScantasticContextProvider.tsx
new file mode 100644
index 00000000000..84dd33c8b54
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/scan/ScantasticContextProvider.tsx
@@ -0,0 +1,142 @@
+import {
+  createContext,
+  Dispatch,
+  PropsWithChildren,
+  SetStateAction,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from 'react'
+import { useOnboardingSteps } from 'src/app/features/onboarding/OnboardingSteps'
+import { cryptoKeyToJWK, KEY_PARAMS } from 'src/app/features/onboarding/scan/utils'
+import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { logger } from 'utilities/src/logger/logger'
+import { ONE_DAY_MS, ONE_MINUTE_MS, ONE_SECOND_MS } from 'utilities/src/time/time'
+import { ScantasticParamsSchema } from 'wallet/src/features/scantastic/types'
+
+type ScantasticContextState = {
+  isLoadingUUID: boolean
+  privateKey: CryptoKey | null
+  publicKey: JsonWebKey | null
+  sessionUUID: string | null
+  resetScantastic: () => void
+  expirationTimestamp: number
+  setExpirationTimestamp: Dispatch<SetStateAction<number>>
+}
+
+const uuidSchema = ScantasticParamsSchema.shape.uuid
+
+export const ScantasticContext = createContext<ScantasticContextState | undefined>(undefined)
+
+export function ScantasticContextProvider({ children }: PropsWithChildren): JSX.Element {
+  const { isResetting } = useOnboardingSteps()
+
+  const [isLoadingUUID, setIsLoadingUUID] = useState(true)
+  const [publicKey, setPublicKey] = useState<null | JsonWebKey>(null)
+  const [privateKey, setPrivateKey] = useState<null | CryptoKey>(null)
+  const [sessionUUID, setSessionUUID] = useState<null | string>(null)
+  // Users have 20 minutes to scan the QR code. This is reduced to 6 minutes for OTP input once the scan is completed.
+  const [expirationTimestamp, setExpirationTimestamp] = useState<number>(Date.now() + 20 * ONE_MINUTE_MS)
+
+  const reset = useCallback(() => {
+    setPublicKey(null)
+    setPrivateKey(null)
+    setSessionUUID(null)
+    setExpirationTimestamp(Date.now() + ONE_DAY_MS)
+    navigate(`/${TopLevelRoutes.Onboarding}/${isResetting ? OnboardingRoutes.ResetScan : OnboardingRoutes.Scan}`, {
+      replace: true,
+    })
+  }, [isResetting])
+
+  useEffect(() => {
+    async function getSessionUUID(): Promise<void> {
+      if (sessionUUID) {
+        return
+      }
+
+      try {
+        const { publicKey: pub, privateKey: priv } = await window.crypto.subtle.generateKey(KEY_PARAMS, true, [
+          'encrypt',
+          'decrypt',
+        ])
+        const jwk = await cryptoKeyToJWK(pub)
+        setPublicKey(jwk)
+        setPrivateKey(priv)
+      } catch (e) {
+        logger.error(e, {
+          tags: {
+            file: 'OnboardingContextProvider.tsx',
+            function: 'getSessionUUID->generateKeyPair',
+          },
+        })
+      }
+
+      // Initiate scantastic onboarding session
+      const response = await fetch(`${uniswapUrls.scantasticApiUrl}/uuid`, {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+        },
+      })
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch uuid for mobile->ext onboarding: ${await response.text()}`)
+      }
+
+      const data = await response.json()
+
+      if (!data.uuid) {
+        throw new Error('Missing uuid from onboarding session initiation request.')
+      }
+
+      try {
+        const uuid = uuidSchema.parse(data.uuid)
+        setSessionUUID(uuid)
+      } catch {
+        throw new Error('Invalid uuid from onboarding session initiation request.')
+      }
+
+      if (data.expiresAtInSeconds) {
+        setExpirationTimestamp(data.expiresAtInSeconds * ONE_SECOND_MS)
+      }
+    }
+
+    setIsLoadingUUID(true)
+    getSessionUUID()
+      .catch((e) => {
+        logger.error(e, {
+          tags: { file: 'OnboardingContextProvider.tsx', function: 'getSessionUUID' },
+        })
+      })
+      .finally(() => {
+        setIsLoadingUUID(false)
+      })
+  }, [sessionUUID])
+
+  return (
+    <ScantasticContext.Provider
+      value={{
+        isLoadingUUID,
+        privateKey,
+        publicKey,
+        sessionUUID,
+        resetScantastic: reset,
+        expirationTimestamp,
+        setExpirationTimestamp,
+      }}
+    >
+      {children}
+    </ScantasticContext.Provider>
+  )
+}
+
+export const useScantasticContext = (): ScantasticContextState => {
+  const scantasticContext = useContext(ScantasticContext)
+  if (scantasticContext === undefined) {
+    throw new Error('useScantasticContext must be inside a ScantasticContextProvider')
+  }
+  return scantasticContext
+}
diff --git a/apps/extension/src/app/features/onboarding/scan/utils.ts b/apps/extension/src/app/features/onboarding/scan/utils.ts
new file mode 100644
index 00000000000..e08cdb84be0
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/scan/utils.ts
@@ -0,0 +1,52 @@
+import { logger } from 'utilities/src/logger/logger'
+import { ScantasticParams } from 'wallet/src/features/scantastic/types'
+
+export const KEY_PARAMS = {
+  name: 'RSA-OAEP',
+  modulusLength: 4096,
+  publicExponent: new Uint8Array([1, 0, 1]),
+  hash: 'SHA-256',
+}
+
+export async function cryptoKeyToJWK(key: CryptoKey): Promise<JsonWebKey> {
+  const exportedKeyData = await window.crypto.subtle.exportKey('jwk', key)
+  return exportedKeyData
+}
+
+export function getScantasticUrl({ uuid, publicKey, vendor, model, browser }: ScantasticParams): string {
+  let qrURI = `uniswap://scantastic?pubKey=${JSON.stringify(publicKey)}&uuid=${encodeURIComponent(uuid)}`
+  if (vendor) {
+    qrURI = qrURI.concat(`&vendor=${encodeURIComponent(vendor)}`)
+  }
+  if (model) {
+    qrURI = qrURI.concat(`&model=${encodeURIComponent(model)}`)
+  }
+  if (browser) {
+    qrURI = qrURI.concat(`&browser=${encodeURIComponent(browser)}`)
+  }
+  return qrURI
+}
+
+function base64ToArrayBuffer(base64Data: string): ArrayBuffer {
+  const binaryString = window.atob(base64Data)
+  const len = binaryString.length
+  const bytes = new Uint8Array(len)
+  for (let i = 0; i < len; i++) {
+    bytes[i] = binaryString.charCodeAt(i)
+  }
+  return bytes.buffer
+}
+
+export async function decryptMessage(privateKey: CryptoKey, ciphertext: string): Promise<string> {
+  const cipherTextBuffer = base64ToArrayBuffer(ciphertext)
+
+  try {
+    const decryptedArrayBuffer = await window.crypto.subtle.decrypt({ name: 'RSA-OAEP' }, privateKey, cipherTextBuffer)
+
+    const textDecoder = new TextDecoder()
+    return textDecoder.decode(decryptedArrayBuffer)
+  } catch (e) {
+    logger.error(e, { tags: { file: 'scan/utils.ts', function: 'decryptMessage' } })
+    return ''
+  }
+}
diff --git a/apps/extension/src/app/features/onboarding/utils.ts b/apps/extension/src/app/features/onboarding/utils.ts
new file mode 100644
index 00000000000..7e0c93ddb42
--- /dev/null
+++ b/apps/extension/src/app/features/onboarding/utils.ts
@@ -0,0 +1,2 @@
+export const ONBOARDING_CONTENT_WIDTH = 460
+export const ONBOARDING_INITIAL_FRAME_HEIGHT = 636
diff --git a/apps/extension/src/app/features/popups/ConnectPopup.tsx b/apps/extension/src/app/features/popups/ConnectPopup.tsx
new file mode 100644
index 00000000000..f6c9df13cc4
--- /dev/null
+++ b/apps/extension/src/app/features/popups/ConnectPopup.tsx
@@ -0,0 +1,87 @@
+import { useTranslation } from 'react-i18next'
+import { Link } from 'react-router-dom'
+import { saveDappConnection } from 'src/app/features/dapp/actions'
+import { useDappContext } from 'src/app/features/dapp/DappContext'
+import { extractUrlHost } from 'src/app/features/dappRequests/utils'
+import { Anchor, Button, Flex, Popover, Separator, Text, TouchableArea } from 'ui/src'
+import { X } from 'ui/src/components/icons'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+
+export function ConnectPopupContent({
+  onClose,
+  asPopover = false,
+  showConnectButton = false,
+}: {
+  onClose?: () => void
+  asPopover?: boolean
+  showConnectButton?: boolean
+}): JSX.Element {
+  const { t } = useTranslation()
+
+  const { dappUrl } = useDappContext()
+  const activeAccount = useActiveAccountWithThrow()
+
+  const onConnect = async (): Promise<void> => {
+    await saveDappConnection(dappUrl, activeAccount)
+    onClose?.()
+  }
+
+  return (
+    <Flex px="$spacing8" py="$spacing4" width={220}>
+      <Flex row gap="$spacing16">
+        <Flex fill>
+          <Text variant="subheading2">{t('extension.connection.titleNotConnected')}</Text>
+          <Anchor href={dappUrl} textDecorationLine="none">
+            <Flex>
+              <Text color="$neutral2" numberOfLines={1} variant="buttonLabel4">
+                {extractUrlHost(dappUrl)}
+              </Text>
+            </Flex>
+          </Anchor>
+        </Flex>
+        {!asPopover && (
+          <TouchableArea onPress={onClose}>
+            <X color="$neutral3" size="$icon.20" />
+          </TouchableArea>
+        )}
+      </Flex>
+      <Separator my="$spacing8" />
+      <Flex gap="$spacing8">
+        <Text color="$neutral2" variant="body4">
+          {showConnectButton ? t('extension.connection.popupWithButton') : t('extension.connection.popup')}
+        </Text>
+        {showConnectButton ? (
+          asPopover ? (
+            <Popover.Close onPress={onConnect}>
+              <Button mt="$spacing8" size="small" theme="tertiary">
+                {t('common.button.connect')}
+              </Button>
+            </Popover.Close>
+          ) : (
+            <Button mt="$spacing8" size="small" theme="tertiary" onPress={onConnect}>
+              {t('common.button.connect')}
+            </Button>
+          )
+        ) : (
+          <Link
+            style={{ textDecoration: 'none' }}
+            target="_blank"
+            to={uniswapUrls.helpArticleUrls.extensionDappTroubleshooting}
+            onClick={() =>
+              sendAnalyticsEvent(ExtensionEventName.DappTroubleConnecting, {
+                dappUrl,
+              })
+            }
+          >
+            <Text color="$accent1" variant="buttonLabel4">
+              {t('extension.connection.popup.trouble')}
+            </Text>
+          </Link>
+        )}
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/popups/selectors.ts b/apps/extension/src/app/features/popups/selectors.ts
new file mode 100644
index 00000000000..6c8c7d3193d
--- /dev/null
+++ b/apps/extension/src/app/features/popups/selectors.ts
@@ -0,0 +1,6 @@
+import { PopupsState } from 'src/app/features/popups/slice'
+import { WebState } from 'src/store/webReducer'
+
+export function selectPopupState<T extends keyof PopupsState>(name: T): (state: WebState) => PopupsState[T] {
+  return (state) => state.popups[name]
+}
diff --git a/apps/extension/src/app/features/popups/slice.ts b/apps/extension/src/app/features/popups/slice.ts
new file mode 100644
index 00000000000..a11c446698a
--- /dev/null
+++ b/apps/extension/src/app/features/popups/slice.ts
@@ -0,0 +1,33 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+export enum PopupName {
+  Connect = 'connect',
+}
+
+export interface PopupsState {
+  [PopupName.Connect]: {
+    isOpen: boolean
+  }
+}
+
+const initialState: PopupsState = {
+  [PopupName.Connect]: {
+    isOpen: false,
+  },
+}
+
+const slice = createSlice({
+  name: 'popups',
+  initialState,
+  reducers: {
+    openPopup: (state, action: PayloadAction<PopupName>) => {
+      state[action.payload].isOpen = true
+    },
+    closePopup: (state, action: PayloadAction<PopupName>) => {
+      state[action.payload].isOpen = false
+    },
+  },
+})
+
+export const { openPopup, closePopup } = slice.actions
+export const { reducer: popupsReducer } = slice
diff --git a/apps/extension/src/app/features/receive/ReceiveScreen.test.tsx b/apps/extension/src/app/features/receive/ReceiveScreen.test.tsx
new file mode 100644
index 00000000000..fb640ab5706
--- /dev/null
+++ b/apps/extension/src/app/features/receive/ReceiveScreen.test.tsx
@@ -0,0 +1,24 @@
+import { ReceiveScreen } from 'src/app/features/receive/ReceiveScreen'
+import { cleanup, render, screen } from 'src/test/test-utils'
+import { ACCOUNT, preloadedSharedState } from 'wallet/src/test/fixtures'
+
+const preloadedState = preloadedSharedState({
+  account: ACCOUNT,
+})
+
+describe(ReceiveScreen, () => {
+  it('renders without error', async () => {
+    const tree = render(<ReceiveScreen />, { preloadedState })
+
+    expect(tree).toMatchSnapshot()
+    cleanup()
+  })
+
+  it('renders a QR code', async () => {
+    render(<ReceiveScreen />, { preloadedState })
+
+    const qrCode = await screen.getByTestId('wallet-qr-code')
+    expect(qrCode).toBeDefined()
+    cleanup()
+  })
+})
diff --git a/apps/extension/src/app/features/receive/ReceiveScreen.tsx b/apps/extension/src/app/features/receive/ReceiveScreen.tsx
new file mode 100644
index 00000000000..ac8ebfb2e50
--- /dev/null
+++ b/apps/extension/src/app/features/receive/ReceiveScreen.tsx
@@ -0,0 +1,29 @@
+import { useTranslation } from 'react-i18next'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { SCREEN_ITEM_HORIZONTAL_PAD } from 'src/app/constants'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex } from 'ui/src'
+import { X } from 'ui/src/components/icons'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { WalletQRCode } from 'wallet/src/components/QRCodeScanner/WalletQRCode'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+
+export function ReceiveScreen(): JSX.Element {
+  const { t } = useTranslation()
+  const { navigateBack } = useExtensionNavigation()
+  const activeAddress = useActiveAccountAddressWithThrow()
+
+  return (
+    <Trace logImpression modal={ModalName.ReceiveCryptoModal}>
+      <Flex fill py="$spacing8">
+        <Flex px="$spacing8">
+          <ScreenHeader Icon={X} title={t('home.label.receive')} onBackClick={navigateBack} />
+        </Flex>
+        <Flex fill grow pt="$spacing12" px={SCREEN_ITEM_HORIZONTAL_PAD} testID="wallet-qr-code">
+          <WalletQRCode address={activeAddress} />
+        </Flex>
+      </Flex>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/receive/__snapshots__/ReceiveScreen.test.tsx.snap b/apps/extension/src/app/features/receive/__snapshots__/ReceiveScreen.test.tsx.snap
new file mode 100644
index 00000000000..780be3ab591
--- /dev/null
+++ b/apps/extension/src/app/features/receive/__snapshots__/ReceiveScreen.test.tsx.snap
@@ -0,0 +1,12505 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ReceiveScreen renders without error 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <span
+        class="t_light is_inversed _dsp_contents"
+      >
+        <span
+          class=" t_light _dsp_contents is_Theme"
+        >
+          <div
+            class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _pt-1481558276 _pb-1481558276"
+          >
+            <div
+              class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pr-1481558276 _pl-1481558276"
+            >
+              <div
+                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _pr-1481558276 _pl-1481558276 _pt-1481558307 _pb-1481558307 _width-10037"
+              >
+                <div
+                  class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                >
+                  <svg
+                    fill="none"
+                    stroke-width="8"
+                    style="color: rgb(125, 125, 125); width: 24px; height: 24px;"
+                    viewBox="0 0 16 16"
+                  >
+                    <path
+                      d="M12.5303 4.53033C12.8232 4.23744 12.8232 3.76256 12.5303 3.46967C12.2374 3.17678 11.7626 3.17678 11.4697 3.46967L12.5303 4.53033ZM3.46967 11.4697C3.17678 11.7626 3.17678 12.2374 3.46967 12.5303C3.76256 12.8232 4.23744 12.8232 4.53033 12.5303L3.46967 11.4697ZM4.53033 3.46967C4.23744 3.17678 3.76256 3.17678 3.46967 3.46967C3.17678 3.76256 3.17678 4.23744 3.46967 4.53033L4.53033 3.46967ZM11.4697 12.5303C11.7626 12.8232 12.2374 12.8232 12.5303 12.5303C12.8232 12.2374 12.8232 11.7626 12.5303 11.4697L11.4697 12.5303ZM11.4697 3.46967L3.46967 11.4697L4.53033 12.5303L12.5303 4.53033L11.4697 3.46967ZM3.46967 4.53033L11.4697 12.5303L12.5303 11.4697L4.53033 3.46967L3.46967 4.53033Z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _justifyContent-center _flexGrow-1 _mr-24px _pt-1481558276 _pb-1481558276"
+                >
+                  <span
+                    class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
+                    data-disable-theme="true"
+                  >
+                    Receive
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div
+              class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _pt-1481558245 _pr-1481558245 _pl-1481558245"
+              data-testid="wallet-qr-code"
+            >
+              <div
+                class="css-view-175oi2r"
+                style="display: flex; flex-direction: column; flex-basis: auto; box-sizing: border-box; position: relative; min-height: 0px; min-width: 0px; flex-shrink: 0; align-items: center; gap: 12px; justify-content: flex-start; margin-bottom: 8px; flex-grow: 1; padding: 60px 16px 60px 16px;"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pt-1481558245 _pb-1481558245"
+                >
+                  <div
+                    class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _flexDirection-row _gap-1481558245"
+                  >
+                    <div
+                      class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _gap-1481558400"
+                    >
+                      <div
+                        class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558245"
+                      >
+                        <div
+                          class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558307"
+                        >
+                          <span
+                            class="font_heading _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-nowrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontFamily-299667014 _fontSize-24px _lineHeight-32px _fontWeight-400 _maxWidth-10037 _overflowX-hidden _overflowY-hidden _textOverflow-ellipsis _flexShrink-1"
+                            data-disable-theme="true"
+                            data-testid="address-display/name/Test Account"
+                          >
+                            Test Account
+                          </span>
+                        </div>
+                      </div>
+                      <div
+                        class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                        data-testid="copy"
+                      >
+                        <div
+                          class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _gap-1481558307 _mt-1481558400 _pr-1481558400 _pl-1481558400 _pt-1481558400 _pb-1481558400"
+                        >
+                          <span
+                            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400"
+                            data-disable-theme="true"
+                          >
+                            0x​82D5...3Fa6
+                          </span>
+                          <svg
+                            fill="none"
+                            stroke-width="8"
+                            style="color: rgb(125, 125, 125); width: 16px; height: 16px;"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M18.375 6.25H9.625C7.448 6.25 6.25 7.448 6.25 9.625V18.375C6.25 20.552 7.448 21.75 9.625 21.75H18.375C20.552 21.75 21.75 20.552 21.75 18.375V9.625C21.75 7.448 20.552 6.25 18.375 6.25ZM20.25 18.375C20.25 19.707 19.707 20.25 18.375 20.25H9.625C8.293 20.25 7.75 19.707 7.75 18.375V9.625C7.75 8.293 8.293 7.75 9.625 7.75H18.375C19.707 7.75 20.25 8.293 20.25 9.625V18.375ZM3.75 5.62V14.38C3.75 15.578 4.23309 15.873 4.39209 15.971C4.74609 16.187 4.85589 16.649 4.63989 17.002C4.49789 17.233 4.25202 17.36 3.99902 17.36C3.86602 17.36 3.72991 17.324 3.60791 17.25C2.70691 16.698 2.25 15.733 2.25 14.38V5.62C2.25 3.478 3.47912 2.25 5.62012 2.25H14.3799C16.0649 2.25 16.87 2.98897 17.25 3.60797C17.466 3.96097 17.355 4.42298 17.002 4.63898C16.648 4.85598 16.1879 4.74399 15.9709 4.39099C15.8739 4.23199 15.5779 3.74902 14.3799 3.74902H5.62012C4.29212 3.75002 3.75 4.292 3.75 5.62Z"
+                              fill="currentColor"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-FFFFFF35 _borderTopColor-568007262 _borderRightColor-568007262 _borderBottomColor-568007262 _borderLeftColor-568007262 _borderTopLeftRadius-1307610091 _borderTopRightRadius-1307610091 _borderBottomRightRadius-1307610091 _borderBottomLeftRadius-1307610091 _borderTopWidth-0px _borderRightWidth-0px _borderBottomWidth-0px _borderLeftWidth-0px _justifyContent-center _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-35931545"
+                >
+                  <svg
+                    height="240"
+                    viewBox="-8 -8 256 256"
+                    width="240"
+                  >
+                    <defs>
+                      <lineargradient
+                        gradientTransform="rotate(45)"
+                        id="grad"
+                        x1="0%"
+                        x2="100%"
+                        y1="0%"
+                        y2="100%"
+                      >
+                        <stop
+                          offset="0"
+                          stop-color="#00C3A0"
+                          stop-opacity="1"
+                        />
+                        <stop
+                          offset="1"
+                          stop-color="rgb(0,255,255)"
+                          stop-opacity="1"
+                        />
+                        <stop
+                          offset="1"
+                          stop-opacity="1"
+                        />
+                      </lineargradient>
+                    </defs>
+                    <g>
+                      <rect
+                        fill="#FFFFFF"
+                        height="256"
+                        rx="24"
+                        width="256"
+                        x="-8"
+                        y="-8"
+                      />
+                    </g>
+                    <g>
+                      <path
+                        d="
+          M 0,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,3.2432432432432434
+        
+          M 6.486486486486486,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,3.2432432432432434
+        
+          M 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+        
+          M 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+        
+          M 25.945945945945947,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,3.2432432432432434
+        
+          M 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+        
+          M 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+        
+          M 51.891891891891895,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,3.2432432432432434
+        
+          M 64.86486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,3.2432432432432434
+        
+          M 84.32432432432432,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,3.2432432432432434
+        
+          M 97.2972972972973,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,3.2432432432432434
+        
+          M 110.27027027027027,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,3.2432432432432434
+        
+          M 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+        
+          M 123.24324324324326,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,3.2432432432432434
+        
+          M 136.21621621621622,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,3.2432432432432434
+        
+          M 149.1891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,3.2432432432432434
+        
+          M 162.16216216216216,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,3.2432432432432434
+        
+          M 168.64864864864865,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,3.2432432432432434
+        
+          M 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+        
+          M 194.5945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,3.2432432432432434
+        
+          M 201.0810810810811,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,3.2432432432432434
+        
+          M 207.56756756756758,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,3.2432432432432434
+        
+          M 214.05405405405406,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,3.2432432432432434
+        
+          M 220.54054054054055,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,3.2432432432432434
+        
+          M 227.02702702702703,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,3.2432432432432434
+        
+          M 233.51351351351352,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,3.2432432432432434
+        
+          M 0,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,9.72972972972973
+        
+          M 38.91891891891892,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,9.72972972972973
+        
+          M 51.891891891891895,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,9.72972972972973
+        
+          M 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+        
+          M 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+        
+          M 77.83783783783784,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,9.72972972972973
+        
+          M 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+        
+          M 90.81081081081082,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,9.72972972972973
+        
+          M 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+        
+          M 110.27027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,9.72972972972973
+        
+          M 123.24324324324326,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,9.72972972972973
+        
+          M 136.21621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,9.72972972972973
+        
+          M 142.7027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,9.72972972972973
+        
+          M 155.67567567567568,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,9.72972972972973
+        
+          M 175.13513513513516,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,9.72972972972973
+        
+          M 181.62162162162164,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,9.72972972972973
+        
+          M 194.5945945945946,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,9.72972972972973
+        
+          M 233.51351351351352,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,9.72972972972973
+        
+          M 0,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,16.216216216216218
+        
+          M 12.972972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,16.216216216216218
+        
+          M 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+        
+          M 25.945945945945947,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,16.216216216216218
+        
+          M 38.91891891891892,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,16.216216216216218
+        
+          M 51.891891891891895,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,16.216216216216218
+        
+          M 71.35135135135135,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,16.216216216216218
+        
+          M 84.32432432432432,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,16.216216216216218
+        
+          M 90.81081081081082,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,16.216216216216218
+        
+          M 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+        
+          M 116.75675675675676,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,16.216216216216218
+        
+          M 123.24324324324326,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,16.216216216216218
+        
+          M 162.16216216216216,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,16.216216216216218
+        
+          M 175.13513513513516,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,16.216216216216218
+        
+          M 194.5945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,16.216216216216218
+        
+          M 207.56756756756758,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,16.216216216216218
+        
+          M 214.05405405405406,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,16.216216216216218
+        
+          M 220.54054054054055,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,16.216216216216218
+        
+          M 233.51351351351352,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,16.216216216216218
+        
+          M 0,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,22.7027027027027
+        
+          M 12.972972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,22.7027027027027
+        
+          M 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+        
+          M 25.945945945945947,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,22.7027027027027
+        
+          M 38.91891891891892,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,22.7027027027027
+        
+          M 58.37837837837838,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,22.7027027027027
+        
+          M 77.83783783783784,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,22.7027027027027
+        
+          M 90.81081081081082,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,22.7027027027027
+        
+          M 116.75675675675676,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,22.7027027027027
+        
+          M 129.72972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,22.7027027027027
+        
+          M 142.7027027027027,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,22.7027027027027
+        
+          M 155.67567567567568,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,22.7027027027027
+        
+          M 168.64864864864865,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,22.7027027027027
+        
+          M 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+        
+          M 194.5945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,22.7027027027027
+        
+          M 207.56756756756758,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,22.7027027027027
+        
+          M 214.05405405405406,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,22.7027027027027
+        
+          M 220.54054054054055,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,22.7027027027027
+        
+          M 233.51351351351352,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,22.7027027027027
+        
+          M 0,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,29.18918918918919
+        
+          M 12.972972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,29.18918918918919
+        
+          M 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+        
+          M 25.945945945945947,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,29.18918918918919
+        
+          M 38.91891891891892,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,29.18918918918919
+        
+          M 64.86486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,29.18918918918919
+        
+          M 84.32432432432432,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,29.18918918918919
+        
+          M 110.27027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,29.18918918918919
+        
+          M 123.24324324324326,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,29.18918918918919
+        
+          M 136.21621621621622,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,29.18918918918919
+        
+          M 142.7027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,29.18918918918919
+        
+          M 162.16216216216216,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,29.18918918918919
+        
+          M 181.62162162162164,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,29.18918918918919
+        
+          M 194.5945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,29.18918918918919
+        
+          M 207.56756756756758,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,29.18918918918919
+        
+          M 214.05405405405406,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,29.18918918918919
+        
+          M 220.54054054054055,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,29.18918918918919
+        
+          M 233.51351351351352,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,29.18918918918919
+        
+          M 0,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,35.67567567567568
+        
+          M 38.91891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,35.67567567567568
+        
+          M 51.891891891891895,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,35.67567567567568
+        
+          M 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+        
+          M 71.35135135135135,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,35.67567567567568
+        
+          M 97.2972972972973,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,35.67567567567568
+        
+          M 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+        
+          M 116.75675675675676,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,35.67567567567568
+        
+          M 149.1891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,35.67567567567568
+        
+          M 155.67567567567568,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,35.67567567567568
+        
+          M 162.16216216216216,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,35.67567567567568
+        
+          M 168.64864864864865,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,35.67567567567568
+        
+          M 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+        
+          M 194.5945945945946,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,35.67567567567568
+        
+          M 233.51351351351352,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,35.67567567567568
+        
+          M 0,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,42.16216216216216
+        
+          M 6.486486486486486,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,42.16216216216216
+        
+          M 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+        
+          M 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+        
+          M 25.945945945945947,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,42.16216216216216
+        
+          M 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+        
+          M 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+        
+          M 51.891891891891895,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,42.16216216216216
+        
+          M 64.86486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,42.16216216216216
+        
+          M 77.83783783783784,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,42.16216216216216
+        
+          M 90.81081081081082,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,42.16216216216216
+        
+          M 103.78378378378379,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,42.16216216216216
+        
+          M 116.75675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,42.16216216216216
+        
+          M 129.72972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,42.16216216216216
+        
+          M 142.7027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,42.16216216216216
+        
+          M 155.67567567567568,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,42.16216216216216
+        
+          M 168.64864864864865,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,42.16216216216216
+        
+          M 181.62162162162164,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,42.16216216216216
+        
+          M 194.5945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,42.16216216216216
+        
+          M 201.0810810810811,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,42.16216216216216
+        
+          M 207.56756756756758,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,42.16216216216216
+        
+          M 214.05405405405406,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,42.16216216216216
+        
+          M 220.54054054054055,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,42.16216216216216
+        
+          M 227.02702702702703,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,42.16216216216216
+        
+          M 233.51351351351352,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,42.16216216216216
+        
+          M 51.891891891891895,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,48.64864864864865
+        
+          M 64.86486486486487,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,48.64864864864865
+        
+          M 103.78378378378379,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,48.64864864864865
+        
+          M 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+        
+          M 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+        
+          M 129.72972972972974,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,48.64864864864865
+        
+          M 136.21621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,48.64864864864865
+        
+          M 142.7027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,48.64864864864865
+        
+          M 155.67567567567568,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,48.64864864864865
+        
+          M 162.16216216216216,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,48.64864864864865
+        
+          M 175.13513513513516,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,48.64864864864865
+        
+          M 181.62162162162164,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,48.64864864864865
+        
+          M 12.972972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,55.13513513513514
+        
+          M 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+        
+          M 25.945945945945947,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,55.13513513513514
+        
+          M 38.91891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,55.13513513513514
+        
+          M 51.891891891891895,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,55.13513513513514
+        
+          M 64.86486486486487,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,55.13513513513514
+        
+          M 77.83783783783784,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,55.13513513513514
+        
+          M 90.81081081081082,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,55.13513513513514
+        
+          M 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+        
+          M 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+        
+          M 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+        
+          M 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+        
+          M 123.24324324324326,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,55.13513513513514
+        
+          M 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+        
+          M 142.7027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,55.13513513513514
+        
+          M 149.1891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,55.13513513513514
+        
+          M 155.67567567567568,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,55.13513513513514
+        
+          M 168.64864864864865,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,55.13513513513514
+        
+          M 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+        
+          M 188.10810810810813,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,55.13513513513514
+        
+          M 194.5945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,55.13513513513514
+        
+          M 201.0810810810811,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,55.13513513513514
+        
+          M 220.54054054054055,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,55.13513513513514
+        
+          M 227.02702702702703,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,55.13513513513514
+        
+          M 233.51351351351352,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,55.13513513513514
+        
+          M 19.45945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,61.62162162162162
+        
+          M 64.86486486486487,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,61.62162162162162
+        
+          M 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+        
+          M 84.32432432432432,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,61.62162162162162
+        
+          M 97.2972972972973,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,61.62162162162162
+        
+          M 116.75675675675676,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,61.62162162162162
+        
+          M 123.24324324324326,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,61.62162162162162
+        
+          M 142.7027027027027,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,61.62162162162162
+        
+          M 155.67567567567568,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,61.62162162162162
+        
+          M 175.13513513513516,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,61.62162162162162
+        
+          M 188.10810810810813,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,61.62162162162162
+        
+          M 194.5945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,61.62162162162162
+        
+          M 233.51351351351352,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,61.62162162162162
+        
+          M 0,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,68.10810810810811
+        
+          M 12.972972972972974,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,68.10810810810811
+        
+          M 25.945945945945947,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,68.10810810810811
+        
+          M 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+        
+          M 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+        
+          M 45.40540540540541,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,68.10810810810811
+        
+          M 58.37837837837838,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,68.10810810810811
+        
+          M 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+        
+          M 103.78378378378379,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,68.10810810810811
+        
+          M 116.75675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,68.10810810810811
+        
+          M 142.7027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,68.10810810810811
+        
+          M 149.1891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,68.10810810810811
+        
+          M 175.13513513513516,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,68.10810810810811
+        
+          M 194.5945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,68.10810810810811
+        
+          M 201.0810810810811,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,68.10810810810811
+        
+          M 214.05405405405406,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,68.10810810810811
+        
+          M 233.51351351351352,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,68.10810810810811
+        
+          M 6.486486486486486,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,74.5945945945946
+        
+          M 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+        
+          M 25.945945945945947,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,74.5945945945946
+        
+          M 45.40540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,74.5945945945946
+        
+          M 71.35135135135135,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,74.5945945945946
+        
+          M 90.81081081081082,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,74.5945945945946
+        
+          M 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+        
+          M 110.27027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,74.5945945945946
+        
+          M 123.24324324324326,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,74.5945945945946
+        
+          M 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+        
+          M 142.7027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,74.5945945945946
+        
+          M 149.1891891891892,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,74.5945945945946
+        
+          M 175.13513513513516,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,74.5945945945946
+        
+          M 188.10810810810813,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,74.5945945945946
+        
+          M 194.5945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,74.5945945945946
+        
+          M 201.0810810810811,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,74.5945945945946
+        
+          M 207.56756756756758,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,74.5945945945946
+        
+          M 220.54054054054055,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,74.5945945945946
+        
+          M 227.02702702702703,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,74.5945945945946
+        
+          M 233.51351351351352,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,74.5945945945946
+        
+          M 0,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,81.08108108108108
+        
+          M 6.486486486486486,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,81.08108108108108
+        
+          M 19.45945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,81.08108108108108
+        
+          M 25.945945945945947,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,81.08108108108108
+        
+          M 38.91891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,81.08108108108108
+        
+          M 45.40540540540541,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,81.08108108108108
+        
+          M 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+        
+          M 71.35135135135135,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,81.08108108108108
+        
+          M 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+        
+          M 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+        
+          M 103.78378378378379,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,81.08108108108108
+        
+          M 116.75675675675676,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,81.08108108108108
+        
+          M 136.21621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,81.08108108108108
+        
+          M 149.1891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,81.08108108108108
+        
+          M 155.67567567567568,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,81.08108108108108
+        
+          M 168.64864864864865,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,81.08108108108108
+        
+          M 188.10810810810813,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,81.08108108108108
+        
+          M 194.5945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,81.08108108108108
+        
+          M 214.05405405405406,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,81.08108108108108
+        
+          M 233.51351351351352,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,81.08108108108108
+        
+          M 25.945945945945947,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,87.56756756756756
+        
+          M 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+        
+          M 64.86486486486487,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,87.56756756756756
+        
+          M 77.83783783783784,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,87.56756756756756
+        
+          M 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+        
+          M 90.81081081081082,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,87.56756756756756
+        
+          M 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+        
+          M 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+        
+          M 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+        
+          M 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+        
+          M 123.24324324324326,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,87.56756756756756
+        
+          M 136.21621621621622,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,87.56756756756756
+        
+          M 142.7027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,87.56756756756756
+        
+          M 149.1891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,87.56756756756756
+        
+          M 162.16216216216216,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,87.56756756756756
+        
+          M 175.13513513513516,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,87.56756756756756
+        
+          M 201.0810810810811,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,87.56756756756756
+        
+          M 207.56756756756758,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,87.56756756756756
+        
+          M 214.05405405405406,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,87.56756756756756
+        
+          M 0,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,94.05405405405406
+        
+          M 6.486486486486486,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,94.05405405405406
+        
+          M 19.45945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,94.05405405405406
+        
+          M 25.945945945945947,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,94.05405405405406
+        
+          M 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+        
+          M 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+        
+          M 45.40540540540541,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,94.05405405405406
+        
+          M 77.83783783783784,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,94.05405405405406
+        
+          M 97.2972972972973,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,94.05405405405406
+        
+          M 110.27027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,94.05405405405406
+        
+          M 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+        
+          M 123.24324324324326,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,94.05405405405406
+        
+          M 136.21621621621622,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,94.05405405405406
+        
+          M 142.7027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,94.05405405405406
+        
+          M 149.1891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,94.05405405405406
+        
+          M 181.62162162162164,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,94.05405405405406
+        
+          M 188.10810810810813,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,94.05405405405406
+        
+          M 194.5945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,94.05405405405406
+        
+          M 214.05405405405406,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,94.05405405405406
+        
+          M 227.02702702702703,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,94.05405405405406
+        
+          M 233.51351351351352,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,94.05405405405406
+        
+          M 12.972972972972974,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,100.54054054054055
+        
+          M 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+        
+          M 25.945945945945947,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,100.54054054054055
+        
+          M 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+        
+          M 51.891891891891895,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,100.54054054054055
+        
+          M 64.86486486486487,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,100.54054054054055
+        
+          M 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+        
+          M 84.32432432432432,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,100.54054054054055
+        
+          M 97.2972972972973,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,100.54054054054055
+        
+          M 136.21621621621622,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,100.54054054054055
+        
+          M 142.7027027027027,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,100.54054054054055
+        
+          M 168.64864864864865,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,100.54054054054055
+        
+          M 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+        
+          M 181.62162162162164,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,100.54054054054055
+        
+          M 188.10810810810813,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,100.54054054054055
+        
+          M 194.5945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,100.54054054054055
+        
+          M 207.56756756756758,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,100.54054054054055
+        
+          M 227.02702702702703,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,100.54054054054055
+        
+          M 233.51351351351352,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,100.54054054054055
+        
+          M 0,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,107.02702702702703
+        
+          M 6.486486486486486,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,107.02702702702703
+        
+          M 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+        
+          M 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+        
+          M 32.432432432432435,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,107.02702702702703
+        
+          M 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+        
+          M 58.37837837837838,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,107.02702702702703
+        
+          M 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+        
+          M 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+        
+          M 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+        
+          M 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+        
+          M 90.81081081081082,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,107.02702702702703
+        
+          M 103.78378378378379,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,107.02702702702703
+        
+          M 123.24324324324326,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,107.02702702702703
+        
+          M 136.21621621621622,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,107.02702702702703
+        
+          M 142.7027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,107.02702702702703
+        
+          M 149.1891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,107.02702702702703
+        
+          M 175.13513513513516,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,107.02702702702703
+        
+          M 181.62162162162164,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,107.02702702702703
+        
+          M 207.56756756756758,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,107.02702702702703
+        
+          M 220.54054054054055,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,107.02702702702703
+        
+          M 233.51351351351352,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,107.02702702702703
+        
+          M 0,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,113.51351351351352
+        
+          M 6.486486486486486,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,113.51351351351352
+        
+          M 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+        
+          M 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+        
+          M 32.432432432432435,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,113.51351351351352
+        
+          M 45.40540540540541,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,113.51351351351352
+        
+          M 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+        
+          M 71.35135135135135,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,113.51351351351352
+        
+          M 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+        
+          M 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+        
+          M 90.81081081081082,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,113.51351351351352
+        
+          M 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+        
+          M 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+        
+          M 116.75675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,113.51351351351352
+        
+          M 123.24324324324326,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,113.51351351351352
+        
+          M 149.1891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,113.51351351351352
+        
+          M 162.16216216216216,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,113.51351351351352
+        
+          M 175.13513513513516,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,113.51351351351352
+        
+          M 181.62162162162164,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,113.51351351351352
+        
+          M 188.10810810810813,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,113.51351351351352
+        
+          M 194.5945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,113.51351351351352
+        
+          M 201.0810810810811,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,113.51351351351352
+        
+          M 220.54054054054055,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,113.51351351351352
+        
+          M 227.02702702702703,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,113.51351351351352
+        
+          M 0,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,120
+        
+          M 6.486486486486486,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,120
+        
+          M 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+        
+          M 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+        
+          M 32.432432432432435,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,120
+        
+          M 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+        
+          M 77.83783783783784,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,120
+        
+          M 103.78378378378379,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,120
+        
+          M 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+        
+          M 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+        
+          M 123.24324324324326,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,120
+        
+          M 136.21621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,120
+        
+          M 155.67567567567568,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,120
+        
+          M 168.64864864864865,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,120
+        
+          M 194.5945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,120
+        
+          M 220.54054054054055,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,120
+        
+          M 233.51351351351352,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,120
+        
+          M 19.45945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,126.4864864864865
+        
+          M 58.37837837837838,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,126.4864864864865
+        
+          M 71.35135135135135,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,126.4864864864865
+        
+          M 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+        
+          M 110.27027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,126.4864864864865
+        
+          M 136.21621621621622,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,126.4864864864865
+        
+          M 142.7027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,126.4864864864865
+        
+          M 162.16216216216216,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,126.4864864864865
+        
+          M 175.13513513513516,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,126.4864864864865
+        
+          M 181.62162162162164,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,126.4864864864865
+        
+          M 194.5945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,126.4864864864865
+        
+          M 6.486486486486486,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,132.972972972973
+        
+          M 25.945945945945947,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,132.972972972973
+        
+          M 38.91891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,132.972972972973
+        
+          M 45.40540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,132.972972972973
+        
+          M 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+        
+          M 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+        
+          M 71.35135135135135,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,132.972972972973
+        
+          M 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+        
+          M 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+        
+          M 103.78378378378379,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,132.972972972973
+        
+          M 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+        
+          M 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+        
+          M 136.21621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,132.972972972973
+        
+          M 142.7027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,132.972972972973
+        
+          M 149.1891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,132.972972972973
+        
+          M 155.67567567567568,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,132.972972972973
+        
+          M 168.64864864864865,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,132.972972972973
+        
+          M 188.10810810810813,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,132.972972972973
+        
+          M 201.0810810810811,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,132.972972972973
+        
+          M 207.56756756756758,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,132.972972972973
+        
+          M 220.54054054054055,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,132.972972972973
+        
+          M 233.51351351351352,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,132.972972972973
+        
+          M 6.486486486486486,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,139.45945945945948
+        
+          M 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+        
+          M 32.432432432432435,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,139.45945945945948
+        
+          M 45.40540540540541,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,139.45945945945948
+        
+          M 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+        
+          M 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+        
+          M 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+        
+          M 84.32432432432432,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,139.45945945945948
+        
+          M 110.27027027027027,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,139.45945945945948
+        
+          M 129.72972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,139.45945945945948
+        
+          M 136.21621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,139.45945945945948
+        
+          M 149.1891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,139.45945945945948
+        
+          M 155.67567567567568,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,139.45945945945948
+        
+          M 175.13513513513516,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,139.45945945945948
+        
+          M 181.62162162162164,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,139.45945945945948
+        
+          M 188.10810810810813,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,139.45945945945948
+        
+          M 194.5945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,139.45945945945948
+        
+          M 220.54054054054055,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,139.45945945945948
+        
+          M 233.51351351351352,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,139.45945945945948
+        
+          M 0,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,145.94594594594597
+        
+          M 12.972972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,145.94594594594597
+        
+          M 38.91891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,145.94594594594597
+        
+          M 58.37837837837838,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,145.94594594594597
+        
+          M 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+        
+          M 77.83783783783784,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,145.94594594594597
+        
+          M 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+        
+          M 90.81081081081082,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,145.94594594594597
+        
+          M 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+        
+          M 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+        
+          M 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+        
+          M 123.24324324324326,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,145.94594594594597
+        
+          M 136.21621621621622,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,145.94594594594597
+        
+          M 149.1891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,145.94594594594597
+        
+          M 181.62162162162164,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,145.94594594594597
+        
+          M 214.05405405405406,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,145.94594594594597
+        
+          M 6.486486486486486,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,152.43243243243245
+        
+          M 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+        
+          M 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+        
+          M 25.945945945945947,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,152.43243243243245
+        
+          M 45.40540540540541,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,152.43243243243245
+        
+          M 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+        
+          M 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+        
+          M 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+        
+          M 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+        
+          M 90.81081081081082,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,152.43243243243245
+        
+          M 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+        
+          M 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+        
+          M 116.75675675675676,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,152.43243243243245
+        
+          M 129.72972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,152.43243243243245
+        
+          M 136.21621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,152.43243243243245
+        
+          M 142.7027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,152.43243243243245
+        
+          M 155.67567567567568,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,152.43243243243245
+        
+          M 168.64864864864865,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,152.43243243243245
+        
+          M 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+        
+          M 188.10810810810813,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,152.43243243243245
+        
+          M 194.5945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,152.43243243243245
+        
+          M 220.54054054054055,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,152.43243243243245
+        
+          M 227.02702702702703,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,152.43243243243245
+        
+          M 233.51351351351352,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,152.43243243243245
+        
+          M 0,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,158.91891891891893
+        
+          M 32.432432432432435,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,158.91891891891893
+        
+          M 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+        
+          M 51.891891891891895,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,158.91891891891893
+        
+          M 71.35135135135135,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,158.91891891891893
+        
+          M 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+        
+          M 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+        
+          M 90.81081081081082,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,158.91891891891893
+        
+          M 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+        
+          M 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+        
+          M 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+        
+          M 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+        
+          M 123.24324324324326,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,158.91891891891893
+        
+          M 136.21621621621622,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,158.91891891891893
+        
+          M 149.1891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,158.91891891891893
+        
+          M 181.62162162162164,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,158.91891891891893
+        
+          M 233.51351351351352,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,158.91891891891893
+        
+          M 0,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,165.40540540540542
+        
+          M 32.432432432432435,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,165.40540540540542
+        
+          M 45.40540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,165.40540540540542
+        
+          M 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+        
+          M 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+        
+          M 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+        
+          M 84.32432432432432,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,165.40540540540542
+        
+          M 116.75675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,165.40540540540542
+        
+          M 123.24324324324326,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,165.40540540540542
+        
+          M 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+        
+          M 155.67567567567568,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,165.40540540540542
+        
+          M 168.64864864864865,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,165.40540540540542
+        
+          M 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+        
+          M 181.62162162162164,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,165.40540540540542
+        
+          M 194.5945945945946,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,165.40540540540542
+        
+          M 201.0810810810811,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,165.40540540540542
+        
+          M 207.56756756756758,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,165.40540540540542
+        
+          M 220.54054054054055,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,165.40540540540542
+        
+          M 227.02702702702703,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,165.40540540540542
+        
+          M 233.51351351351352,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,165.40540540540542
+        
+          M 0,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,171.8918918918919
+        
+          M 12.972972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,171.8918918918919
+        
+          M 25.945945945945947,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,171.8918918918919
+        
+          M 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+        
+          M 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+        
+          M 58.37837837837838,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,171.8918918918919
+        
+          M 71.35135135135135,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,171.8918918918919
+        
+          M 90.81081081081082,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,171.8918918918919
+        
+          M 110.27027027027027,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,171.8918918918919
+        
+          M 123.24324324324326,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,171.8918918918919
+        
+          M 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+        
+          M 136.21621621621622,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,171.8918918918919
+        
+          M 214.05405405405406,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,171.8918918918919
+        
+          M 0,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,178.37837837837841
+        
+          M 19.45945945945946,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,178.37837837837841
+        
+          M 25.945945945945947,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,178.37837837837841
+        
+          M 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+        
+          M 51.891891891891895,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,178.37837837837841
+        
+          M 71.35135135135135,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,178.37837837837841
+        
+          M 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+        
+          M 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+        
+          M 110.27027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,178.37837837837841
+        
+          M 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+        
+          M 136.21621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,178.37837837837841
+        
+          M 142.7027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,178.37837837837841
+        
+          M 155.67567567567568,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,178.37837837837841
+        
+          M 162.16216216216216,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,178.37837837837841
+        
+          M 175.13513513513516,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,178.37837837837841
+        
+          M 181.62162162162164,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,178.37837837837841
+        
+          M 201.0810810810811,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,178.37837837837841
+        
+          M 207.56756756756758,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,178.37837837837841
+        
+          M 220.54054054054055,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,178.37837837837841
+        
+          M 227.02702702702703,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,178.37837837837841
+        
+          M 233.51351351351352,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,178.37837837837841
+        
+          M 0,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,184.8648648648649
+        
+          M 19.45945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,184.8648648648649
+        
+          M 32.432432432432435,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,184.8648648648649
+        
+          M 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+        
+          M 45.40540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,184.8648648648649
+        
+          M 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+        
+          M 90.81081081081082,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,184.8648648648649
+        
+          M 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+        
+          M 129.72972972972974,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,184.8648648648649
+        
+          M 136.21621621621622,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,184.8648648648649
+        
+          M 142.7027027027027,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,184.8648648648649
+        
+          M 175.13513513513516,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,184.8648648648649
+        
+          M 181.62162162162164,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,184.8648648648649
+        
+          M 188.10810810810813,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,184.8648648648649
+        
+          M 194.5945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,184.8648648648649
+        
+          M 201.0810810810811,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,184.8648648648649
+        
+          M 207.56756756756758,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,184.8648648648649
+        
+          M 233.51351351351352,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,184.8648648648649
+        
+          M 51.891891891891895,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,191.35135135135138
+        
+          M 71.35135135135135,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,191.35135135135138
+        
+          M 84.32432432432432,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,191.35135135135138
+        
+          M 97.2972972972973,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,191.35135135135138
+        
+          M 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+        
+          M 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+        
+          M 123.24324324324326,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,191.35135135135138
+        
+          M 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+        
+          M 142.7027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,191.35135135135138
+        
+          M 155.67567567567568,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,191.35135135135138
+        
+          M 162.16216216216216,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,191.35135135135138
+        
+          M 168.64864864864865,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,191.35135135135138
+        
+          M 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+        
+          M 181.62162162162164,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,191.35135135135138
+        
+          M 207.56756756756758,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,191.35135135135138
+        
+          M 214.05405405405406,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,191.35135135135138
+        
+          M 220.54054054054055,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,191.35135135135138
+        
+          M 233.51351351351352,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,191.35135135135138
+        
+          M 0,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,197.83783783783787
+        
+          M 6.486486486486486,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,197.83783783783787
+        
+          M 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+        
+          M 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+        
+          M 25.945945945945947,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,197.83783783783787
+        
+          M 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+        
+          M 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+        
+          M 58.37837837837838,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,197.83783783783787
+        
+          M 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+        
+          M 77.83783783783784,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,197.83783783783787
+        
+          M 90.81081081081082,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,197.83783783783787
+        
+          M 116.75675675675676,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,197.83783783783787
+        
+          M 123.24324324324326,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,197.83783783783787
+        
+          M 136.21621621621622,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,197.83783783783787
+        
+          M 149.1891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,197.83783783783787
+        
+          M 168.64864864864865,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,197.83783783783787
+        
+          M 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+        
+          M 181.62162162162164,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,197.83783783783787
+        
+          M 194.5945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,197.83783783783787
+        
+          M 207.56756756756758,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,197.83783783783787
+        
+          M 214.05405405405406,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,197.83783783783787
+        
+          M 0,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,204.32432432432435
+        
+          M 38.91891891891892,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,204.32432432432435
+        
+          M 58.37837837837838,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,204.32432432432435
+        
+          M 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+        
+          M 84.32432432432432,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,204.32432432432435
+        
+          M 90.81081081081082,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,204.32432432432435
+        
+          M 123.24324324324326,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,204.32432432432435
+        
+          M 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+        
+          M 136.21621621621622,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,204.32432432432435
+        
+          M 142.7027027027027,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,204.32432432432435
+        
+          M 162.16216216216216,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,204.32432432432435
+        
+          M 181.62162162162164,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,204.32432432432435
+        
+          M 207.56756756756758,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,204.32432432432435
+        
+          M 214.05405405405406,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,204.32432432432435
+        
+          M 227.02702702702703,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,204.32432432432435
+        
+          M 233.51351351351352,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,204.32432432432435
+        
+          M 0,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,210.81081081081084
+        
+          M 12.972972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,210.81081081081084
+        
+          M 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+        
+          M 25.945945945945947,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,210.81081081081084
+        
+          M 38.91891891891892,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,210.81081081081084
+        
+          M 51.891891891891895,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,210.81081081081084
+        
+          M 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+        
+          M 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+        
+          M 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+        
+          M 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+        
+          M 116.75675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,210.81081081081084
+        
+          M 129.72972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,210.81081081081084
+        
+          M 155.67567567567568,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,210.81081081081084
+        
+          M 168.64864864864865,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,210.81081081081084
+        
+          M 181.62162162162164,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,210.81081081081084
+        
+          M 188.10810810810813,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,210.81081081081084
+        
+          M 194.5945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,210.81081081081084
+        
+          M 201.0810810810811,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,210.81081081081084
+        
+          M 207.56756756756758,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,210.81081081081084
+        
+          M 214.05405405405406,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,210.81081081081084
+        
+          M 220.54054054054055,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,210.81081081081084
+        
+          M 227.02702702702703,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,210.81081081081084
+        
+          M 233.51351351351352,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,210.81081081081084
+        
+          M 0,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,217.29729729729732
+        
+          M 12.972972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,217.29729729729732
+        
+          M 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+        
+          M 25.945945945945947,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,217.29729729729732
+        
+          M 38.91891891891892,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,217.29729729729732
+        
+          M 51.891891891891895,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,217.29729729729732
+        
+          M 71.35135135135135,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,217.29729729729732
+        
+          M 97.2972972972973,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,217.29729729729732
+        
+          M 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+        
+          M 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+        
+          M 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+        
+          M 129.72972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,217.29729729729732
+        
+          M 142.7027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,217.29729729729732
+        
+          M 175.13513513513516,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,217.29729729729732
+        
+          M 188.10810810810813,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,217.29729729729732
+        
+          M 194.5945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,217.29729729729732
+        
+          M 214.05405405405406,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,217.29729729729732
+        
+          M 233.51351351351352,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,217.29729729729732
+        
+          M 0,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,223.7837837837838
+        
+          M 12.972972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,223.7837837837838
+        
+          M 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+        
+          M 25.945945945945947,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,223.7837837837838
+        
+          M 38.91891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,223.7837837837838
+        
+          M 51.891891891891895,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,223.7837837837838
+        
+          M 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+        
+          M 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+        
+          M 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+        
+          M 84.32432432432432,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,223.7837837837838
+        
+          M 90.81081081081082,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,223.7837837837838
+        
+          M 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+        
+          M 116.75675675675676,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,223.7837837837838
+        
+          M 123.24324324324326,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,223.7837837837838
+        
+          M 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+        
+          M 142.7027027027027,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,223.7837837837838
+        
+          M 149.1891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,223.7837837837838
+        
+          M 155.67567567567568,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,223.7837837837838
+        
+          M 168.64864864864865,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,223.7837837837838
+        
+          M 181.62162162162164,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,223.7837837837838
+        
+          M 194.5945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,223.7837837837838
+        
+          M 233.51351351351352,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,223.7837837837838
+        
+          M 0,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,230.2702702702703
+        
+          M 38.91891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,230.2702702702703
+        
+          M 64.86486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,230.2702702702703
+        
+          M 84.32432432432432,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,230.2702702702703
+        
+          M 90.81081081081082,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,230.2702702702703
+        
+          M 103.78378378378379,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,230.2702702702703
+        
+          M 116.75675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,230.2702702702703
+        
+          M 123.24324324324326,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,230.2702702702703
+        
+          M 136.21621621621622,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,230.2702702702703
+        
+          M 149.1891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,230.2702702702703
+        
+          M 162.16216216216216,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,230.2702702702703
+        
+          M 201.0810810810811,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,230.2702702702703
+        
+          M 233.51351351351352,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,230.2702702702703
+        
+          M 0,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,236.75675675675677
+        
+          M 6.486486486486486,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,236.75675675675677
+        
+          M 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+        
+          M 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+        
+          M 25.945945945945947,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,236.75675675675677
+        
+          M 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+        
+          M 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+        
+          M 77.83783783783784,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,236.75675675675677
+        
+          M 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+        
+          M 97.2972972972973,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,236.75675675675677
+        
+          M 110.27027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,236.75675675675677
+        
+          M 123.24324324324326,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,236.75675675675677
+        
+          M 136.21621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,236.75675675675677
+        
+          M 142.7027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,236.75675675675677
+        
+          M 149.1891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,236.75675675675677
+        
+          M 155.67567567567568,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,236.75675675675677
+        
+          M 168.64864864864865,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,236.75675675675677
+        
+          M 181.62162162162164,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,236.75675675675677
+        
+          M 194.5945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,236.75675675675677
+        
+          M 201.0810810810811,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,236.75675675675677
+        
+          M 207.56756756756758,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,236.75675675675677
+        
+          M 227.02702702702703,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,236.75675675675677
+        
+          M 233.51351351351352,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,236.75675675675677
+        "
+                        fill="#00C3A0"
+                      />
+                      <path
+                        d="
+          M 0,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,3.2432432432432434
+        
+          M 6.486486486486486,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,3.2432432432432434
+        
+          M 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+        
+          M 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+        
+          M 25.945945945945947,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,3.2432432432432434
+        
+          M 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+        
+          M 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+        
+          M 51.891891891891895,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,3.2432432432432434
+        
+          M 64.86486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,3.2432432432432434
+        
+          M 84.32432432432432,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,3.2432432432432434
+        
+          M 97.2972972972973,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,3.2432432432432434
+        
+          M 110.27027027027027,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,3.2432432432432434
+        
+          M 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+        
+          M 123.24324324324326,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,3.2432432432432434
+        
+          M 136.21621621621622,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,3.2432432432432434
+        
+          M 149.1891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,3.2432432432432434
+        
+          M 162.16216216216216,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,3.2432432432432434
+        
+          M 168.64864864864865,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,3.2432432432432434
+        
+          M 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+        
+          M 194.5945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,3.2432432432432434
+        
+          M 201.0810810810811,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,3.2432432432432434
+        
+          M 207.56756756756758,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,3.2432432432432434
+        
+          M 214.05405405405406,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,3.2432432432432434
+        
+          M 220.54054054054055,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,3.2432432432432434
+        
+          M 227.02702702702703,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,3.2432432432432434
+        
+          M 233.51351351351352,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,3.2432432432432434
+        
+          M 0,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,9.72972972972973
+        
+          M 38.91891891891892,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,9.72972972972973
+        
+          M 51.891891891891895,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,9.72972972972973
+        
+          M 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+        
+          M 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+        
+          M 77.83783783783784,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,9.72972972972973
+        
+          M 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+        
+          M 90.81081081081082,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,9.72972972972973
+        
+          M 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+        
+          M 110.27027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,9.72972972972973
+        
+          M 123.24324324324326,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,9.72972972972973
+        
+          M 136.21621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,9.72972972972973
+        
+          M 142.7027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,9.72972972972973
+        
+          M 155.67567567567568,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,9.72972972972973
+        
+          M 175.13513513513516,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,9.72972972972973
+        
+          M 181.62162162162164,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,9.72972972972973
+        
+          M 194.5945945945946,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,9.72972972972973
+        
+          M 233.51351351351352,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,9.72972972972973
+        
+          M 0,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,16.216216216216218
+        
+          M 12.972972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,16.216216216216218
+        
+          M 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+        
+          M 25.945945945945947,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,16.216216216216218
+        
+          M 38.91891891891892,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,16.216216216216218
+        
+          M 51.891891891891895,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,16.216216216216218
+        
+          M 71.35135135135135,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,16.216216216216218
+        
+          M 84.32432432432432,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,16.216216216216218
+        
+          M 90.81081081081082,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,16.216216216216218
+        
+          M 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+        
+          M 116.75675675675676,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,16.216216216216218
+        
+          M 123.24324324324326,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,16.216216216216218
+        
+          M 162.16216216216216,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,16.216216216216218
+        
+          M 175.13513513513516,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,16.216216216216218
+        
+          M 194.5945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,16.216216216216218
+        
+          M 207.56756756756758,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,16.216216216216218
+        
+          M 214.05405405405406,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,16.216216216216218
+        
+          M 220.54054054054055,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,16.216216216216218
+        
+          M 233.51351351351352,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,16.216216216216218
+        
+          M 0,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,22.7027027027027
+        
+          M 12.972972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,22.7027027027027
+        
+          M 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+        
+          M 25.945945945945947,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,22.7027027027027
+        
+          M 38.91891891891892,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,22.7027027027027
+        
+          M 58.37837837837838,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,22.7027027027027
+        
+          M 77.83783783783784,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,22.7027027027027
+        
+          M 90.81081081081082,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,22.7027027027027
+        
+          M 116.75675675675676,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,22.7027027027027
+        
+          M 129.72972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,22.7027027027027
+        
+          M 142.7027027027027,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,22.7027027027027
+        
+          M 155.67567567567568,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,22.7027027027027
+        
+          M 168.64864864864865,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,22.7027027027027
+        
+          M 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+        
+          M 194.5945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,22.7027027027027
+        
+          M 207.56756756756758,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,22.7027027027027
+        
+          M 214.05405405405406,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,22.7027027027027
+        
+          M 220.54054054054055,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,22.7027027027027
+        
+          M 233.51351351351352,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,22.7027027027027
+        
+          M 0,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,29.18918918918919
+        
+          M 12.972972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,29.18918918918919
+        
+          M 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+        
+          M 25.945945945945947,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,29.18918918918919
+        
+          M 38.91891891891892,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,29.18918918918919
+        
+          M 64.86486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,29.18918918918919
+        
+          M 84.32432432432432,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,29.18918918918919
+        
+          M 110.27027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,29.18918918918919
+        
+          M 123.24324324324326,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,29.18918918918919
+        
+          M 136.21621621621622,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,29.18918918918919
+        
+          M 142.7027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,29.18918918918919
+        
+          M 162.16216216216216,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,29.18918918918919
+        
+          M 181.62162162162164,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,29.18918918918919
+        
+          M 194.5945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,29.18918918918919
+        
+          M 207.56756756756758,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,29.18918918918919
+        
+          M 214.05405405405406,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,29.18918918918919
+        
+          M 220.54054054054055,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,29.18918918918919
+        
+          M 233.51351351351352,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,29.18918918918919
+        
+          M 0,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,35.67567567567568
+        
+          M 38.91891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,35.67567567567568
+        
+          M 51.891891891891895,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,35.67567567567568
+        
+          M 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+        
+          M 71.35135135135135,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,35.67567567567568
+        
+          M 97.2972972972973,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,35.67567567567568
+        
+          M 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+        
+          M 116.75675675675676,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,35.67567567567568
+        
+          M 149.1891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,35.67567567567568
+        
+          M 155.67567567567568,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,35.67567567567568
+        
+          M 162.16216216216216,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,35.67567567567568
+        
+          M 168.64864864864865,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,35.67567567567568
+        
+          M 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+        
+          M 194.5945945945946,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,35.67567567567568
+        
+          M 233.51351351351352,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,35.67567567567568
+        
+          M 0,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,42.16216216216216
+        
+          M 6.486486486486486,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,42.16216216216216
+        
+          M 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+        
+          M 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+        
+          M 25.945945945945947,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,42.16216216216216
+        
+          M 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+        
+          M 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+        
+          M 51.891891891891895,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,42.16216216216216
+        
+          M 64.86486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,42.16216216216216
+        
+          M 77.83783783783784,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,42.16216216216216
+        
+          M 90.81081081081082,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,42.16216216216216
+        
+          M 103.78378378378379,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,42.16216216216216
+        
+          M 116.75675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,42.16216216216216
+        
+          M 129.72972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,42.16216216216216
+        
+          M 142.7027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,42.16216216216216
+        
+          M 155.67567567567568,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,42.16216216216216
+        
+          M 168.64864864864865,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,42.16216216216216
+        
+          M 181.62162162162164,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,42.16216216216216
+        
+          M 194.5945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,42.16216216216216
+        
+          M 201.0810810810811,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,42.16216216216216
+        
+          M 207.56756756756758,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,42.16216216216216
+        
+          M 214.05405405405406,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,42.16216216216216
+        
+          M 220.54054054054055,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,42.16216216216216
+        
+          M 227.02702702702703,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,42.16216216216216
+        
+          M 233.51351351351352,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,42.16216216216216
+        
+          M 51.891891891891895,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,48.64864864864865
+        
+          M 64.86486486486487,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,48.64864864864865
+        
+          M 103.78378378378379,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,48.64864864864865
+        
+          M 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+        
+          M 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+        
+          M 129.72972972972974,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,48.64864864864865
+        
+          M 136.21621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,48.64864864864865
+        
+          M 142.7027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,48.64864864864865
+        
+          M 155.67567567567568,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,48.64864864864865
+        
+          M 162.16216216216216,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,48.64864864864865
+        
+          M 175.13513513513516,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,48.64864864864865
+        
+          M 181.62162162162164,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,48.64864864864865
+        
+          M 12.972972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,55.13513513513514
+        
+          M 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+        
+          M 25.945945945945947,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,55.13513513513514
+        
+          M 38.91891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,55.13513513513514
+        
+          M 51.891891891891895,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,55.13513513513514
+        
+          M 64.86486486486487,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,55.13513513513514
+        
+          M 77.83783783783784,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,55.13513513513514
+        
+          M 90.81081081081082,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,55.13513513513514
+        
+          M 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+        
+          M 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+        
+          M 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+        
+          M 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+        
+          M 123.24324324324326,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,55.13513513513514
+        
+          M 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+        
+          M 142.7027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,55.13513513513514
+        
+          M 149.1891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,55.13513513513514
+        
+          M 155.67567567567568,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,55.13513513513514
+        
+          M 168.64864864864865,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,55.13513513513514
+        
+          M 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+        
+          M 188.10810810810813,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,55.13513513513514
+        
+          M 194.5945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,55.13513513513514
+        
+          M 201.0810810810811,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,55.13513513513514
+        
+          M 220.54054054054055,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,55.13513513513514
+        
+          M 227.02702702702703,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,55.13513513513514
+        
+          M 233.51351351351352,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,55.13513513513514
+        
+          M 19.45945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,61.62162162162162
+        
+          M 64.86486486486487,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,61.62162162162162
+        
+          M 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+        
+          M 84.32432432432432,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,61.62162162162162
+        
+          M 97.2972972972973,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,61.62162162162162
+        
+          M 116.75675675675676,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,61.62162162162162
+        
+          M 123.24324324324326,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,61.62162162162162
+        
+          M 142.7027027027027,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,61.62162162162162
+        
+          M 155.67567567567568,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,61.62162162162162
+        
+          M 175.13513513513516,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,61.62162162162162
+        
+          M 188.10810810810813,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,61.62162162162162
+        
+          M 194.5945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,61.62162162162162
+        
+          M 233.51351351351352,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,61.62162162162162
+        
+          M 0,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,68.10810810810811
+        
+          M 12.972972972972974,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,68.10810810810811
+        
+          M 25.945945945945947,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,68.10810810810811
+        
+          M 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+        
+          M 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+        
+          M 45.40540540540541,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,68.10810810810811
+        
+          M 58.37837837837838,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,68.10810810810811
+        
+          M 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+        
+          M 103.78378378378379,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,68.10810810810811
+        
+          M 116.75675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,68.10810810810811
+        
+          M 142.7027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,68.10810810810811
+        
+          M 149.1891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,68.10810810810811
+        
+          M 175.13513513513516,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,68.10810810810811
+        
+          M 194.5945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,68.10810810810811
+        
+          M 201.0810810810811,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,68.10810810810811
+        
+          M 214.05405405405406,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,68.10810810810811
+        
+          M 233.51351351351352,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,68.10810810810811
+        
+          M 6.486486486486486,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,74.5945945945946
+        
+          M 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+        
+          M 25.945945945945947,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,74.5945945945946
+        
+          M 45.40540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,74.5945945945946
+        
+          M 71.35135135135135,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,74.5945945945946
+        
+          M 90.81081081081082,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,74.5945945945946
+        
+          M 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+        
+          M 110.27027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,74.5945945945946
+        
+          M 123.24324324324326,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,74.5945945945946
+        
+          M 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+        
+          M 142.7027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,74.5945945945946
+        
+          M 149.1891891891892,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,74.5945945945946
+        
+          M 175.13513513513516,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,74.5945945945946
+        
+          M 188.10810810810813,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,74.5945945945946
+        
+          M 194.5945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,74.5945945945946
+        
+          M 201.0810810810811,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,74.5945945945946
+        
+          M 207.56756756756758,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,74.5945945945946
+        
+          M 220.54054054054055,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,74.5945945945946
+        
+          M 227.02702702702703,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,74.5945945945946
+        
+          M 233.51351351351352,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,74.5945945945946
+        
+          M 0,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,81.08108108108108
+        
+          M 6.486486486486486,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,81.08108108108108
+        
+          M 19.45945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,81.08108108108108
+        
+          M 25.945945945945947,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,81.08108108108108
+        
+          M 38.91891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,81.08108108108108
+        
+          M 45.40540540540541,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,81.08108108108108
+        
+          M 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+        
+          M 71.35135135135135,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,81.08108108108108
+        
+          M 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+        
+          M 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+        
+          M 103.78378378378379,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,81.08108108108108
+        
+          M 116.75675675675676,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,81.08108108108108
+        
+          M 136.21621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,81.08108108108108
+        
+          M 149.1891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,81.08108108108108
+        
+          M 155.67567567567568,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,81.08108108108108
+        
+          M 168.64864864864865,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,81.08108108108108
+        
+          M 188.10810810810813,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,81.08108108108108
+        
+          M 194.5945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,81.08108108108108
+        
+          M 214.05405405405406,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,81.08108108108108
+        
+          M 233.51351351351352,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,81.08108108108108
+        
+          M 25.945945945945947,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,87.56756756756756
+        
+          M 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+        
+          M 64.86486486486487,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,87.56756756756756
+        
+          M 77.83783783783784,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,87.56756756756756
+        
+          M 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+        
+          M 90.81081081081082,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,87.56756756756756
+        
+          M 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+        
+          M 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+        
+          M 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+        
+          M 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+        
+          M 123.24324324324326,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,87.56756756756756
+        
+          M 136.21621621621622,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,87.56756756756756
+        
+          M 142.7027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,87.56756756756756
+        
+          M 149.1891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,87.56756756756756
+        
+          M 162.16216216216216,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,87.56756756756756
+        
+          M 175.13513513513516,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,87.56756756756756
+        
+          M 201.0810810810811,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,87.56756756756756
+        
+          M 207.56756756756758,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,87.56756756756756
+        
+          M 214.05405405405406,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,87.56756756756756
+        
+          M 0,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,94.05405405405406
+        
+          M 6.486486486486486,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,94.05405405405406
+        
+          M 19.45945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,94.05405405405406
+        
+          M 25.945945945945947,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,94.05405405405406
+        
+          M 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+        
+          M 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+        
+          M 45.40540540540541,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,94.05405405405406
+        
+          M 77.83783783783784,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,94.05405405405406
+        
+          M 97.2972972972973,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,94.05405405405406
+        
+          M 110.27027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,94.05405405405406
+        
+          M 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+        
+          M 123.24324324324326,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,94.05405405405406
+        
+          M 136.21621621621622,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,94.05405405405406
+        
+          M 142.7027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,94.05405405405406
+        
+          M 149.1891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,94.05405405405406
+        
+          M 181.62162162162164,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,94.05405405405406
+        
+          M 188.10810810810813,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,94.05405405405406
+        
+          M 194.5945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,94.05405405405406
+        
+          M 214.05405405405406,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,94.05405405405406
+        
+          M 227.02702702702703,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,94.05405405405406
+        
+          M 233.51351351351352,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,94.05405405405406
+        
+          M 12.972972972972974,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,100.54054054054055
+        
+          M 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+        
+          M 25.945945945945947,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,100.54054054054055
+        
+          M 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+        
+          M 51.891891891891895,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,100.54054054054055
+        
+          M 64.86486486486487,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,100.54054054054055
+        
+          M 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+        
+          M 84.32432432432432,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,100.54054054054055
+        
+          M 97.2972972972973,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,100.54054054054055
+        
+          M 136.21621621621622,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,100.54054054054055
+        
+          M 142.7027027027027,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,100.54054054054055
+        
+          M 168.64864864864865,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,100.54054054054055
+        
+          M 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+        
+          M 181.62162162162164,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,100.54054054054055
+        
+          M 188.10810810810813,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,100.54054054054055
+        
+          M 194.5945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,100.54054054054055
+        
+          M 207.56756756756758,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,100.54054054054055
+        
+          M 227.02702702702703,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,100.54054054054055
+        
+          M 233.51351351351352,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,100.54054054054055
+        
+          M 0,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,107.02702702702703
+        
+          M 6.486486486486486,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,107.02702702702703
+        
+          M 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+        
+          M 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+        
+          M 32.432432432432435,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,107.02702702702703
+        
+          M 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+        
+          M 58.37837837837838,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,107.02702702702703
+        
+          M 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+        
+          M 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+        
+          M 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+        
+          M 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+        
+          M 90.81081081081082,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,107.02702702702703
+        
+          M 103.78378378378379,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,107.02702702702703
+        
+          M 123.24324324324326,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,107.02702702702703
+        
+          M 136.21621621621622,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,107.02702702702703
+        
+          M 142.7027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,107.02702702702703
+        
+          M 149.1891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,107.02702702702703
+        
+          M 175.13513513513516,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,107.02702702702703
+        
+          M 181.62162162162164,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,107.02702702702703
+        
+          M 207.56756756756758,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,107.02702702702703
+        
+          M 220.54054054054055,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,107.02702702702703
+        
+          M 233.51351351351352,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,107.02702702702703
+        
+          M 0,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,113.51351351351352
+        
+          M 6.486486486486486,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,113.51351351351352
+        
+          M 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+        
+          M 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+        
+          M 32.432432432432435,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,113.51351351351352
+        
+          M 45.40540540540541,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,113.51351351351352
+        
+          M 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+        
+          M 71.35135135135135,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,113.51351351351352
+        
+          M 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+        
+          M 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+        
+          M 90.81081081081082,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,113.51351351351352
+        
+          M 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+        
+          M 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+        
+          M 116.75675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,113.51351351351352
+        
+          M 123.24324324324326,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,113.51351351351352
+        
+          M 149.1891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,113.51351351351352
+        
+          M 162.16216216216216,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,113.51351351351352
+        
+          M 175.13513513513516,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,113.51351351351352
+        
+          M 181.62162162162164,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,113.51351351351352
+        
+          M 188.10810810810813,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,113.51351351351352
+        
+          M 194.5945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,113.51351351351352
+        
+          M 201.0810810810811,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,113.51351351351352
+        
+          M 220.54054054054055,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,113.51351351351352
+        
+          M 227.02702702702703,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,113.51351351351352
+        
+          M 0,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,120
+        
+          M 6.486486486486486,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,120
+        
+          M 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+        
+          M 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+        
+          M 32.432432432432435,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,120
+        
+          M 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+        
+          M 77.83783783783784,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,120
+        
+          M 103.78378378378379,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,120
+        
+          M 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+        
+          M 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+        
+          M 123.24324324324326,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,120
+        
+          M 136.21621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,120
+        
+          M 155.67567567567568,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,120
+        
+          M 168.64864864864865,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,120
+        
+          M 194.5945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,120
+        
+          M 220.54054054054055,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,120
+        
+          M 233.51351351351352,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,120
+        
+          M 19.45945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,126.4864864864865
+        
+          M 58.37837837837838,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,126.4864864864865
+        
+          M 71.35135135135135,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,126.4864864864865
+        
+          M 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+        
+          M 110.27027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,126.4864864864865
+        
+          M 136.21621621621622,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,126.4864864864865
+        
+          M 142.7027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,126.4864864864865
+        
+          M 162.16216216216216,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,126.4864864864865
+        
+          M 175.13513513513516,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,126.4864864864865
+        
+          M 181.62162162162164,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,126.4864864864865
+        
+          M 194.5945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,126.4864864864865
+        
+          M 6.486486486486486,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,132.972972972973
+        
+          M 25.945945945945947,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,132.972972972973
+        
+          M 38.91891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,132.972972972973
+        
+          M 45.40540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,132.972972972973
+        
+          M 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+        
+          M 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+        
+          M 71.35135135135135,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,132.972972972973
+        
+          M 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+        
+          M 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+        
+          M 103.78378378378379,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,132.972972972973
+        
+          M 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+        
+          M 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+        
+          M 136.21621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,132.972972972973
+        
+          M 142.7027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,132.972972972973
+        
+          M 149.1891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,132.972972972973
+        
+          M 155.67567567567568,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,132.972972972973
+        
+          M 168.64864864864865,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,132.972972972973
+        
+          M 188.10810810810813,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,132.972972972973
+        
+          M 201.0810810810811,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,132.972972972973
+        
+          M 207.56756756756758,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,132.972972972973
+        
+          M 220.54054054054055,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,132.972972972973
+        
+          M 233.51351351351352,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,132.972972972973
+        
+          M 6.486486486486486,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,139.45945945945948
+        
+          M 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+        
+          M 32.432432432432435,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,139.45945945945948
+        
+          M 45.40540540540541,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,139.45945945945948
+        
+          M 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+        
+          M 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+        
+          M 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+        
+          M 84.32432432432432,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,139.45945945945948
+        
+          M 110.27027027027027,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,139.45945945945948
+        
+          M 129.72972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,139.45945945945948
+        
+          M 136.21621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,139.45945945945948
+        
+          M 149.1891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,139.45945945945948
+        
+          M 155.67567567567568,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,139.45945945945948
+        
+          M 175.13513513513516,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,139.45945945945948
+        
+          M 181.62162162162164,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,139.45945945945948
+        
+          M 188.10810810810813,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,139.45945945945948
+        
+          M 194.5945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,139.45945945945948
+        
+          M 220.54054054054055,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,139.45945945945948
+        
+          M 233.51351351351352,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,139.45945945945948
+        
+          M 0,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,145.94594594594597
+        
+          M 12.972972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,145.94594594594597
+        
+          M 38.91891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,145.94594594594597
+        
+          M 58.37837837837838,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,145.94594594594597
+        
+          M 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+        
+          M 77.83783783783784,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,145.94594594594597
+        
+          M 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+        
+          M 90.81081081081082,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,145.94594594594597
+        
+          M 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+        
+          M 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+        
+          M 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+        
+          M 123.24324324324326,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,145.94594594594597
+        
+          M 136.21621621621622,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,145.94594594594597
+        
+          M 149.1891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,145.94594594594597
+        
+          M 181.62162162162164,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,145.94594594594597
+        
+          M 214.05405405405406,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,145.94594594594597
+        
+          M 6.486486486486486,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,152.43243243243245
+        
+          M 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+        
+          M 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+        
+          M 25.945945945945947,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,152.43243243243245
+        
+          M 45.40540540540541,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,152.43243243243245
+        
+          M 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+        
+          M 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+        
+          M 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+        
+          M 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+        
+          M 90.81081081081082,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,152.43243243243245
+        
+          M 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+        
+          M 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+        
+          M 116.75675675675676,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,152.43243243243245
+        
+          M 129.72972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,152.43243243243245
+        
+          M 136.21621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,152.43243243243245
+        
+          M 142.7027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,152.43243243243245
+        
+          M 155.67567567567568,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,152.43243243243245
+        
+          M 168.64864864864865,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,152.43243243243245
+        
+          M 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+        
+          M 188.10810810810813,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,152.43243243243245
+        
+          M 194.5945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,152.43243243243245
+        
+          M 220.54054054054055,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,152.43243243243245
+        
+          M 227.02702702702703,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,152.43243243243245
+        
+          M 233.51351351351352,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,152.43243243243245
+        
+          M 0,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,158.91891891891893
+        
+          M 32.432432432432435,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,158.91891891891893
+        
+          M 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+        
+          M 51.891891891891895,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,158.91891891891893
+        
+          M 71.35135135135135,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,158.91891891891893
+        
+          M 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+        
+          M 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+        
+          M 90.81081081081082,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,158.91891891891893
+        
+          M 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+        
+          M 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+        
+          M 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+        
+          M 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+        
+          M 123.24324324324326,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,158.91891891891893
+        
+          M 136.21621621621622,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,158.91891891891893
+        
+          M 149.1891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,158.91891891891893
+        
+          M 181.62162162162164,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,158.91891891891893
+        
+          M 233.51351351351352,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,158.91891891891893
+        
+          M 0,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,165.40540540540542
+        
+          M 32.432432432432435,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,165.40540540540542
+        
+          M 45.40540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,165.40540540540542
+        
+          M 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+        
+          M 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+        
+          M 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+        
+          M 84.32432432432432,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,165.40540540540542
+        
+          M 116.75675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,165.40540540540542
+        
+          M 123.24324324324326,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,165.40540540540542
+        
+          M 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+        
+          M 155.67567567567568,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,165.40540540540542
+        
+          M 168.64864864864865,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,165.40540540540542
+        
+          M 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+        
+          M 181.62162162162164,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,165.40540540540542
+        
+          M 194.5945945945946,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,165.40540540540542
+        
+          M 201.0810810810811,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,165.40540540540542
+        
+          M 207.56756756756758,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,165.40540540540542
+        
+          M 220.54054054054055,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,165.40540540540542
+        
+          M 227.02702702702703,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,165.40540540540542
+        
+          M 233.51351351351352,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,165.40540540540542
+        
+          M 0,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,171.8918918918919
+        
+          M 12.972972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,171.8918918918919
+        
+          M 25.945945945945947,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,171.8918918918919
+        
+          M 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+        
+          M 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+        
+          M 58.37837837837838,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,171.8918918918919
+        
+          M 71.35135135135135,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,171.8918918918919
+        
+          M 90.81081081081082,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,171.8918918918919
+        
+          M 110.27027027027027,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,171.8918918918919
+        
+          M 123.24324324324326,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,171.8918918918919
+        
+          M 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+        
+          M 136.21621621621622,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,171.8918918918919
+        
+          M 214.05405405405406,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,171.8918918918919
+        
+          M 0,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,178.37837837837841
+        
+          M 19.45945945945946,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,178.37837837837841
+        
+          M 25.945945945945947,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,178.37837837837841
+        
+          M 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+        
+          M 51.891891891891895,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,178.37837837837841
+        
+          M 71.35135135135135,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,178.37837837837841
+        
+          M 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+        
+          M 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+        
+          M 110.27027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,178.37837837837841
+        
+          M 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+        
+          M 136.21621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,178.37837837837841
+        
+          M 142.7027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,178.37837837837841
+        
+          M 155.67567567567568,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,178.37837837837841
+        
+          M 162.16216216216216,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,178.37837837837841
+        
+          M 175.13513513513516,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,178.37837837837841
+        
+          M 181.62162162162164,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,178.37837837837841
+        
+          M 201.0810810810811,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,178.37837837837841
+        
+          M 207.56756756756758,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,178.37837837837841
+        
+          M 220.54054054054055,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,178.37837837837841
+        
+          M 227.02702702702703,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,178.37837837837841
+        
+          M 233.51351351351352,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,178.37837837837841
+        
+          M 0,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,184.8648648648649
+        
+          M 19.45945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,184.8648648648649
+        
+          M 32.432432432432435,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,184.8648648648649
+        
+          M 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+        
+          M 45.40540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,184.8648648648649
+        
+          M 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+        
+          M 90.81081081081082,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,184.8648648648649
+        
+          M 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+        
+          M 129.72972972972974,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,184.8648648648649
+        
+          M 136.21621621621622,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,184.8648648648649
+        
+          M 142.7027027027027,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,184.8648648648649
+        
+          M 175.13513513513516,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,184.8648648648649
+        
+          M 181.62162162162164,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,184.8648648648649
+        
+          M 188.10810810810813,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,184.8648648648649
+        
+          M 194.5945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,184.8648648648649
+        
+          M 201.0810810810811,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,184.8648648648649
+        
+          M 207.56756756756758,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,184.8648648648649
+        
+          M 233.51351351351352,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,184.8648648648649
+        
+          M 51.891891891891895,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,191.35135135135138
+        
+          M 71.35135135135135,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,191.35135135135138
+        
+          M 84.32432432432432,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,191.35135135135138
+        
+          M 97.2972972972973,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,191.35135135135138
+        
+          M 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+        
+          M 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+        
+          M 123.24324324324326,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,191.35135135135138
+        
+          M 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+        
+          M 142.7027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,191.35135135135138
+        
+          M 155.67567567567568,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,191.35135135135138
+        
+          M 162.16216216216216,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,191.35135135135138
+        
+          M 168.64864864864865,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,191.35135135135138
+        
+          M 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+        
+          M 181.62162162162164,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,191.35135135135138
+        
+          M 207.56756756756758,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,191.35135135135138
+        
+          M 214.05405405405406,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,191.35135135135138
+        
+          M 220.54054054054055,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,191.35135135135138
+        
+          M 233.51351351351352,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,191.35135135135138
+        
+          M 0,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,197.83783783783787
+        
+          M 6.486486486486486,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,197.83783783783787
+        
+          M 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+        
+          M 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+        
+          M 25.945945945945947,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,197.83783783783787
+        
+          M 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+        
+          M 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+        
+          M 58.37837837837838,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,197.83783783783787
+        
+          M 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+        
+          M 77.83783783783784,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,197.83783783783787
+        
+          M 90.81081081081082,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,197.83783783783787
+        
+          M 116.75675675675676,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,197.83783783783787
+        
+          M 123.24324324324326,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,197.83783783783787
+        
+          M 136.21621621621622,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,197.83783783783787
+        
+          M 149.1891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,197.83783783783787
+        
+          M 168.64864864864865,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,197.83783783783787
+        
+          M 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+        
+          M 181.62162162162164,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,197.83783783783787
+        
+          M 194.5945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,197.83783783783787
+        
+          M 207.56756756756758,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,197.83783783783787
+        
+          M 214.05405405405406,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,197.83783783783787
+        
+          M 0,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,204.32432432432435
+        
+          M 38.91891891891892,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,204.32432432432435
+        
+          M 58.37837837837838,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,204.32432432432435
+        
+          M 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+        
+          M 84.32432432432432,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,204.32432432432435
+        
+          M 90.81081081081082,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,204.32432432432435
+        
+          M 123.24324324324326,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,204.32432432432435
+        
+          M 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+        
+          M 136.21621621621622,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,204.32432432432435
+        
+          M 142.7027027027027,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,204.32432432432435
+        
+          M 162.16216216216216,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,204.32432432432435
+        
+          M 181.62162162162164,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,204.32432432432435
+        
+          M 207.56756756756758,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,204.32432432432435
+        
+          M 214.05405405405406,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,204.32432432432435
+        
+          M 227.02702702702703,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,204.32432432432435
+        
+          M 233.51351351351352,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,204.32432432432435
+        
+          M 0,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,210.81081081081084
+        
+          M 12.972972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,210.81081081081084
+        
+          M 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+        
+          M 25.945945945945947,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,210.81081081081084
+        
+          M 38.91891891891892,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,210.81081081081084
+        
+          M 51.891891891891895,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,210.81081081081084
+        
+          M 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+        
+          M 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+        
+          M 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+        
+          M 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+        
+          M 116.75675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,210.81081081081084
+        
+          M 129.72972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,210.81081081081084
+        
+          M 155.67567567567568,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,210.81081081081084
+        
+          M 168.64864864864865,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,210.81081081081084
+        
+          M 181.62162162162164,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,210.81081081081084
+        
+          M 188.10810810810813,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,210.81081081081084
+        
+          M 194.5945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,210.81081081081084
+        
+          M 201.0810810810811,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,210.81081081081084
+        
+          M 207.56756756756758,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,210.81081081081084
+        
+          M 214.05405405405406,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,210.81081081081084
+        
+          M 220.54054054054055,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,210.81081081081084
+        
+          M 227.02702702702703,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,210.81081081081084
+        
+          M 233.51351351351352,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,210.81081081081084
+        
+          M 0,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,217.29729729729732
+        
+          M 12.972972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,217.29729729729732
+        
+          M 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+        
+          M 25.945945945945947,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,217.29729729729732
+        
+          M 38.91891891891892,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,217.29729729729732
+        
+          M 51.891891891891895,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,217.29729729729732
+        
+          M 71.35135135135135,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,217.29729729729732
+        
+          M 97.2972972972973,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,217.29729729729732
+        
+          M 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+        
+          M 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+        
+          M 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+        
+          M 129.72972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,217.29729729729732
+        
+          M 142.7027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,217.29729729729732
+        
+          M 175.13513513513516,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,217.29729729729732
+        
+          M 188.10810810810813,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,217.29729729729732
+        
+          M 194.5945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,217.29729729729732
+        
+          M 214.05405405405406,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,217.29729729729732
+        
+          M 233.51351351351352,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,217.29729729729732
+        
+          M 0,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,223.7837837837838
+        
+          M 12.972972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,223.7837837837838
+        
+          M 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+        
+          M 25.945945945945947,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,223.7837837837838
+        
+          M 38.91891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,223.7837837837838
+        
+          M 51.891891891891895,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,223.7837837837838
+        
+          M 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+        
+          M 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+        
+          M 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+        
+          M 84.32432432432432,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,223.7837837837838
+        
+          M 90.81081081081082,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,223.7837837837838
+        
+          M 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+        
+          M 116.75675675675676,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,223.7837837837838
+        
+          M 123.24324324324326,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,223.7837837837838
+        
+          M 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+        
+          M 142.7027027027027,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,223.7837837837838
+        
+          M 149.1891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,223.7837837837838
+        
+          M 155.67567567567568,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,223.7837837837838
+        
+          M 168.64864864864865,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,223.7837837837838
+        
+          M 181.62162162162164,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,223.7837837837838
+        
+          M 194.5945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,223.7837837837838
+        
+          M 233.51351351351352,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,223.7837837837838
+        
+          M 0,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,230.2702702702703
+        
+          M 38.91891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,230.2702702702703
+        
+          M 64.86486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,230.2702702702703
+        
+          M 84.32432432432432,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,230.2702702702703
+        
+          M 90.81081081081082,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,230.2702702702703
+        
+          M 103.78378378378379,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,230.2702702702703
+        
+          M 116.75675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,230.2702702702703
+        
+          M 123.24324324324326,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,230.2702702702703
+        
+          M 136.21621621621622,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,230.2702702702703
+        
+          M 149.1891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,230.2702702702703
+        
+          M 162.16216216216216,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,230.2702702702703
+        
+          M 201.0810810810811,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,230.2702702702703
+        
+          M 233.51351351351352,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,230.2702702702703
+        
+          M 0,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,236.75675675675677
+        
+          M 6.486486486486486,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,236.75675675675677
+        
+          M 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+        
+          M 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+        
+          M 25.945945945945947,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,236.75675675675677
+        
+          M 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+        
+          M 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+        
+          M 77.83783783783784,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,236.75675675675677
+        
+          M 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+        
+          M 97.2972972972973,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,236.75675675675677
+        
+          M 110.27027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,236.75675675675677
+        
+          M 123.24324324324326,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,236.75675675675677
+        
+          M 136.21621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,236.75675675675677
+        
+          M 142.7027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,236.75675675675677
+        
+          M 149.1891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,236.75675675675677
+        
+          M 155.67567567567568,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,236.75675675675677
+        
+          M 168.64864864864865,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,236.75675675675677
+        
+          M 181.62162162162164,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,236.75675675675677
+        
+          M 194.5945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,236.75675675675677
+        
+          M 201.0810810810811,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,236.75675675675677
+        
+          M 207.56756756756758,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,236.75675675675677
+        
+          M 227.02702702702703,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,236.75675675675677
+        
+          M 233.51351351351352,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,236.75675675675677
+        "
+                        fill="#2222222D"
+                      />
+                      <g
+                        transform="scale(1.15)"
+                      >
+                        <path
+                          d="M0 0H40V40H0V0Z"
+                          fill="#FFFFFF"
+                        />
+                      </g>
+                      <g
+                        transform="scale(1.15)"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#00C3A0"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#00C3A0"
+                        />
+                      </g>
+                      <g
+                        transform="scale(1.15)"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#2222222D"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#2222222D"
+                        />
+                      </g>
+                      <g
+                        transform="translate(0, 194) scale(1.15)"
+                        translate="0, 194"
+                      >
+                        <path
+                          d="M0 0H40V40H0V0Z"
+                          fill="#FFFFFF"
+                        />
+                      </g>
+                      <g
+                        transform="translate(0, 194) scale(1.15)"
+                        translate="0, 194"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#00C3A0"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#00C3A0"
+                        />
+                      </g>
+                      <g
+                        transform="translate(0, 194) scale(1.15)"
+                        translate="0, 194"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#2222222D"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#2222222D"
+                        />
+                      </g>
+                      <g
+                        transform="translate(194, 0) scale(1.15)"
+                        translate="194, 0"
+                      >
+                        <path
+                          d="M0 0H40V40H0V0Z"
+                          fill="#FFFFFF"
+                        />
+                      </g>
+                      <g
+                        transform="translate(194, 0) scale(1.15)"
+                        translate="194, 0"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#00C3A0"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#00C3A0"
+                        />
+                      </g>
+                      <g
+                        transform="translate(194, 0) scale(1.15)"
+                        translate="194, 0"
+                      >
+                        <path
+                          clip-rule="evenodd"
+                          d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                          fill="#2222222D"
+                          fill-rule="evenodd"
+                        />
+                        <path
+                          d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                          fill="#2222222D"
+                        />
+                      </g>
+                    </g>
+                  </svg>
+                  <div
+                    class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _overflowX-visible _overflowY-visible _pl-1481558338 _position-absolute _pt-1481558338"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-568007324 _borderTopColor-568007324 _borderRightColor-568007324 _borderBottomColor-568007324 _borderLeftColor-568007324 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-4px _borderRightWidth-4px _borderBottomWidth-4px _borderLeftWidth-4px _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                      data-testid="account-icon"
+                    >
+                      <svg
+                        height="60"
+                        viewBox="0 0 60 60"
+                        width="60"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <g
+                          style="transform-origin: center center;"
+                        >
+                          <circle
+                            cx="30"
+                            cy="30"
+                            fill="#00C3A01F"
+                            r="30"
+                          />
+                          <g
+                            transform="translate(10, 10) scale(0.8333333333333334)"
+                          >
+                            <path
+                              clip-rule="evenodd"
+                              d="M20.9454 0.0175773C22.4936 -0.167833 23.763 1.13917 23.763 2.72944V21.3625C23.763 22.9527 22.4993 24.2419 20.9405 24.2419L2.67549 24.2419C1.11665 24.2419 -0.16452 22.9469 0.0172307 21.3675C1.30306 10.1936 9.99222 1.32931 20.9454 0.0175773Z"
+                              fill="#00C3A0"
+                              fill-rule="evenodd"
+                            />
+                            <path
+                              clip-rule="evenodd"
+                              d="M27.0546 47.9824C25.5064 48.1678 24.237 46.8608 24.237 45.2706V26.6375C24.237 25.0473 25.5007 23.7581 27.0595 23.7581L45.3245 23.7581C46.8833 23.7581 48.1645 25.0531 47.9828 26.6325C46.6969 37.8064 38.0078 46.6707 27.0546 47.9824Z"
+                              fill="#00C3A0"
+                              fill-rule="evenodd"
+                            />
+                          </g>
+                        </g>
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-568007293 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pl-8px"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    >
+                      <div
+                        class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                        data-testid="network-logo"
+                        style="border-radius: 6px; overflow: hidden;"
+                      >
+                        <span
+                          class="_dsp_contents"
+                        >
+                          <div
+                            class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                            style="width: 16px; height: 16px;"
+                          >
+                            <div
+                              class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                            />
+                          </div>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <span
+                  class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _lineHeight-16px _textAlign-center _fontSize-12px _fontWeight-400"
+                  data-disable-theme="true"
+                >
+                  You can receive tokens & NFTs on Ethereum, Polygon, Arbitrum, Optimism, Base, ZKsync, Zora, Avalanche, Celo, Blast, and BNB Chain.
+                </span>
+                <div
+                  class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                >
+                  <span
+                    class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1380577629 _fontSize-16px _lineHeight-24px _fontWeight-500"
+                    data-disable-theme="true"
+                  >
+                    Learn more
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </span>
+      </span>
+    </div>
+  </body>,
+  "container": <div>
+    <span
+      class="t_light is_inversed _dsp_contents"
+    >
+      <span
+        class=" t_light _dsp_contents is_Theme"
+      >
+        <div
+          class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _pt-1481558276 _pb-1481558276"
+        >
+          <div
+            class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pr-1481558276 _pl-1481558276"
+          >
+            <div
+              class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _pr-1481558276 _pl-1481558276 _pt-1481558307 _pb-1481558307 _width-10037"
+            >
+              <div
+                class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+              >
+                <svg
+                  fill="none"
+                  stroke-width="8"
+                  style="color: rgb(125, 125, 125); width: 24px; height: 24px;"
+                  viewBox="0 0 16 16"
+                >
+                  <path
+                    d="M12.5303 4.53033C12.8232 4.23744 12.8232 3.76256 12.5303 3.46967C12.2374 3.17678 11.7626 3.17678 11.4697 3.46967L12.5303 4.53033ZM3.46967 11.4697C3.17678 11.7626 3.17678 12.2374 3.46967 12.5303C3.76256 12.8232 4.23744 12.8232 4.53033 12.5303L3.46967 11.4697ZM4.53033 3.46967C4.23744 3.17678 3.76256 3.17678 3.46967 3.46967C3.17678 3.76256 3.17678 4.23744 3.46967 4.53033L4.53033 3.46967ZM11.4697 12.5303C11.7626 12.8232 12.2374 12.8232 12.5303 12.5303C12.8232 12.2374 12.8232 11.7626 12.5303 11.4697L11.4697 12.5303ZM11.4697 3.46967L3.46967 11.4697L4.53033 12.5303L12.5303 4.53033L11.4697 3.46967ZM3.46967 4.53033L11.4697 12.5303L12.5303 11.4697L4.53033 3.46967L3.46967 4.53033Z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
+              <div
+                class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _justifyContent-center _flexGrow-1 _mr-24px _pt-1481558276 _pb-1481558276"
+              >
+                <span
+                  class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
+                  data-disable-theme="true"
+                >
+                  Receive
+                </span>
+              </div>
+            </div>
+          </div>
+          <div
+            class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _pt-1481558245 _pr-1481558245 _pl-1481558245"
+            data-testid="wallet-qr-code"
+          >
+            <div
+              class="css-view-175oi2r"
+              style="display: flex; flex-direction: column; flex-basis: auto; box-sizing: border-box; position: relative; min-height: 0px; min-width: 0px; flex-shrink: 0; align-items: center; gap: 12px; justify-content: flex-start; margin-bottom: 8px; flex-grow: 1; padding: 60px 16px 60px 16px;"
+            >
+              <div
+                class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pt-1481558245 _pb-1481558245"
+              >
+                <div
+                  class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _flexDirection-row _gap-1481558245"
+                >
+                  <div
+                    class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _alignItems-center _gap-1481558400"
+                  >
+                    <div
+                      class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558245"
+                    >
+                      <div
+                        class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558307"
+                      >
+                        <span
+                          class="font_heading _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-nowrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontFamily-299667014 _fontSize-24px _lineHeight-32px _fontWeight-400 _maxWidth-10037 _overflowX-hidden _overflowY-hidden _textOverflow-ellipsis _flexShrink-1"
+                          data-disable-theme="true"
+                          data-testid="address-display/name/Test Account"
+                        >
+                          Test Account
+                        </span>
+                      </div>
+                    </div>
+                    <div
+                      class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+                      data-testid="copy"
+                    >
+                      <div
+                        class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _gap-1481558307 _mt-1481558400 _pr-1481558400 _pl-1481558400 _pt-1481558400 _pb-1481558400"
+                      >
+                        <span
+                          class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400"
+                          data-disable-theme="true"
+                        >
+                          0x​82D5...3Fa6
+                        </span>
+                        <svg
+                          fill="none"
+                          stroke-width="8"
+                          style="color: rgb(125, 125, 125); width: 16px; height: 16px;"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            d="M18.375 6.25H9.625C7.448 6.25 6.25 7.448 6.25 9.625V18.375C6.25 20.552 7.448 21.75 9.625 21.75H18.375C20.552 21.75 21.75 20.552 21.75 18.375V9.625C21.75 7.448 20.552 6.25 18.375 6.25ZM20.25 18.375C20.25 19.707 19.707 20.25 18.375 20.25H9.625C8.293 20.25 7.75 19.707 7.75 18.375V9.625C7.75 8.293 8.293 7.75 9.625 7.75H18.375C19.707 7.75 20.25 8.293 20.25 9.625V18.375ZM3.75 5.62V14.38C3.75 15.578 4.23309 15.873 4.39209 15.971C4.74609 16.187 4.85589 16.649 4.63989 17.002C4.49789 17.233 4.25202 17.36 3.99902 17.36C3.86602 17.36 3.72991 17.324 3.60791 17.25C2.70691 16.698 2.25 15.733 2.25 14.38V5.62C2.25 3.478 3.47912 2.25 5.62012 2.25H14.3799C16.0649 2.25 16.87 2.98897 17.25 3.60797C17.466 3.96097 17.355 4.42298 17.002 4.63898C16.648 4.85598 16.1879 4.74399 15.9709 4.39099C15.8739 4.23199 15.5779 3.74902 14.3799 3.74902H5.62012C4.29212 3.75002 3.75 4.292 3.75 5.62Z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-FFFFFF35 _borderTopColor-568007262 _borderRightColor-568007262 _borderBottomColor-568007262 _borderLeftColor-568007262 _borderTopLeftRadius-1307610091 _borderTopRightRadius-1307610091 _borderBottomRightRadius-1307610091 _borderBottomLeftRadius-1307610091 _borderTopWidth-0px _borderRightWidth-0px _borderBottomWidth-0px _borderLeftWidth-0px _justifyContent-center _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid _boxShadow-35931545"
+              >
+                <svg
+                  height="240"
+                  viewBox="-8 -8 256 256"
+                  width="240"
+                >
+                  <defs>
+                    <lineargradient
+                      gradientTransform="rotate(45)"
+                      id="grad"
+                      x1="0%"
+                      x2="100%"
+                      y1="0%"
+                      y2="100%"
+                    >
+                      <stop
+                        offset="0"
+                        stop-color="#00C3A0"
+                        stop-opacity="1"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="rgb(0,255,255)"
+                        stop-opacity="1"
+                      />
+                      <stop
+                        offset="1"
+                        stop-opacity="1"
+                      />
+                    </lineargradient>
+                  </defs>
+                  <g>
+                    <rect
+                      fill="#FFFFFF"
+                      height="256"
+                      rx="24"
+                      width="256"
+                      x="-8"
+                      y="-8"
+                    />
+                  </g>
+                  <g>
+                    <path
+                      d="
+          M 0,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,3.2432432432432434
+        
+          M 6.486486486486486,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,3.2432432432432434
+        
+          M 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+        
+          M 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+        
+          M 25.945945945945947,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,3.2432432432432434
+        
+          M 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+        
+          M 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+        
+          M 51.891891891891895,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,3.2432432432432434
+        
+          M 64.86486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,3.2432432432432434
+        
+          M 84.32432432432432,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,3.2432432432432434
+        
+          M 97.2972972972973,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,3.2432432432432434
+        
+          M 110.27027027027027,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,3.2432432432432434
+        
+          M 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+        
+          M 123.24324324324326,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,3.2432432432432434
+        
+          M 136.21621621621622,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,3.2432432432432434
+        
+          M 149.1891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,3.2432432432432434
+        
+          M 162.16216216216216,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,3.2432432432432434
+        
+          M 168.64864864864865,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,3.2432432432432434
+        
+          M 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+        
+          M 194.5945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,3.2432432432432434
+        
+          M 201.0810810810811,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,3.2432432432432434
+        
+          M 207.56756756756758,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,3.2432432432432434
+        
+          M 214.05405405405406,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,3.2432432432432434
+        
+          M 220.54054054054055,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,3.2432432432432434
+        
+          M 227.02702702702703,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,3.2432432432432434
+        
+          M 233.51351351351352,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,3.2432432432432434
+        
+          M 0,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,9.72972972972973
+        
+          M 38.91891891891892,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,9.72972972972973
+        
+          M 51.891891891891895,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,9.72972972972973
+        
+          M 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+        
+          M 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+        
+          M 77.83783783783784,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,9.72972972972973
+        
+          M 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+        
+          M 90.81081081081082,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,9.72972972972973
+        
+          M 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+        
+          M 110.27027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,9.72972972972973
+        
+          M 123.24324324324326,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,9.72972972972973
+        
+          M 136.21621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,9.72972972972973
+        
+          M 142.7027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,9.72972972972973
+        
+          M 155.67567567567568,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,9.72972972972973
+        
+          M 175.13513513513516,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,9.72972972972973
+        
+          M 181.62162162162164,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,9.72972972972973
+        
+          M 194.5945945945946,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,9.72972972972973
+        
+          M 233.51351351351352,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,9.72972972972973
+        
+          M 0,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,16.216216216216218
+        
+          M 12.972972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,16.216216216216218
+        
+          M 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+        
+          M 25.945945945945947,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,16.216216216216218
+        
+          M 38.91891891891892,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,16.216216216216218
+        
+          M 51.891891891891895,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,16.216216216216218
+        
+          M 71.35135135135135,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,16.216216216216218
+        
+          M 84.32432432432432,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,16.216216216216218
+        
+          M 90.81081081081082,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,16.216216216216218
+        
+          M 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+        
+          M 116.75675675675676,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,16.216216216216218
+        
+          M 123.24324324324326,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,16.216216216216218
+        
+          M 162.16216216216216,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,16.216216216216218
+        
+          M 175.13513513513516,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,16.216216216216218
+        
+          M 194.5945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,16.216216216216218
+        
+          M 207.56756756756758,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,16.216216216216218
+        
+          M 214.05405405405406,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,16.216216216216218
+        
+          M 220.54054054054055,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,16.216216216216218
+        
+          M 233.51351351351352,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,16.216216216216218
+        
+          M 0,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,22.7027027027027
+        
+          M 12.972972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,22.7027027027027
+        
+          M 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+        
+          M 25.945945945945947,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,22.7027027027027
+        
+          M 38.91891891891892,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,22.7027027027027
+        
+          M 58.37837837837838,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,22.7027027027027
+        
+          M 77.83783783783784,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,22.7027027027027
+        
+          M 90.81081081081082,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,22.7027027027027
+        
+          M 116.75675675675676,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,22.7027027027027
+        
+          M 129.72972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,22.7027027027027
+        
+          M 142.7027027027027,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,22.7027027027027
+        
+          M 155.67567567567568,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,22.7027027027027
+        
+          M 168.64864864864865,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,22.7027027027027
+        
+          M 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+        
+          M 194.5945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,22.7027027027027
+        
+          M 207.56756756756758,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,22.7027027027027
+        
+          M 214.05405405405406,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,22.7027027027027
+        
+          M 220.54054054054055,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,22.7027027027027
+        
+          M 233.51351351351352,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,22.7027027027027
+        
+          M 0,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,29.18918918918919
+        
+          M 12.972972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,29.18918918918919
+        
+          M 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+        
+          M 25.945945945945947,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,29.18918918918919
+        
+          M 38.91891891891892,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,29.18918918918919
+        
+          M 64.86486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,29.18918918918919
+        
+          M 84.32432432432432,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,29.18918918918919
+        
+          M 110.27027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,29.18918918918919
+        
+          M 123.24324324324326,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,29.18918918918919
+        
+          M 136.21621621621622,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,29.18918918918919
+        
+          M 142.7027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,29.18918918918919
+        
+          M 162.16216216216216,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,29.18918918918919
+        
+          M 181.62162162162164,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,29.18918918918919
+        
+          M 194.5945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,29.18918918918919
+        
+          M 207.56756756756758,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,29.18918918918919
+        
+          M 214.05405405405406,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,29.18918918918919
+        
+          M 220.54054054054055,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,29.18918918918919
+        
+          M 233.51351351351352,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,29.18918918918919
+        
+          M 0,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,35.67567567567568
+        
+          M 38.91891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,35.67567567567568
+        
+          M 51.891891891891895,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,35.67567567567568
+        
+          M 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+        
+          M 71.35135135135135,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,35.67567567567568
+        
+          M 97.2972972972973,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,35.67567567567568
+        
+          M 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+        
+          M 116.75675675675676,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,35.67567567567568
+        
+          M 149.1891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,35.67567567567568
+        
+          M 155.67567567567568,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,35.67567567567568
+        
+          M 162.16216216216216,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,35.67567567567568
+        
+          M 168.64864864864865,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,35.67567567567568
+        
+          M 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+        
+          M 194.5945945945946,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,35.67567567567568
+        
+          M 233.51351351351352,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,35.67567567567568
+        
+          M 0,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,42.16216216216216
+        
+          M 6.486486486486486,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,42.16216216216216
+        
+          M 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+        
+          M 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+        
+          M 25.945945945945947,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,42.16216216216216
+        
+          M 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+        
+          M 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+        
+          M 51.891891891891895,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,42.16216216216216
+        
+          M 64.86486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,42.16216216216216
+        
+          M 77.83783783783784,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,42.16216216216216
+        
+          M 90.81081081081082,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,42.16216216216216
+        
+          M 103.78378378378379,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,42.16216216216216
+        
+          M 116.75675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,42.16216216216216
+        
+          M 129.72972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,42.16216216216216
+        
+          M 142.7027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,42.16216216216216
+        
+          M 155.67567567567568,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,42.16216216216216
+        
+          M 168.64864864864865,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,42.16216216216216
+        
+          M 181.62162162162164,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,42.16216216216216
+        
+          M 194.5945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,42.16216216216216
+        
+          M 201.0810810810811,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,42.16216216216216
+        
+          M 207.56756756756758,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,42.16216216216216
+        
+          M 214.05405405405406,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,42.16216216216216
+        
+          M 220.54054054054055,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,42.16216216216216
+        
+          M 227.02702702702703,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,42.16216216216216
+        
+          M 233.51351351351352,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,42.16216216216216
+        
+          M 51.891891891891895,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,48.64864864864865
+        
+          M 64.86486486486487,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,48.64864864864865
+        
+          M 103.78378378378379,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,48.64864864864865
+        
+          M 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+        
+          M 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+        
+          M 129.72972972972974,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,48.64864864864865
+        
+          M 136.21621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,48.64864864864865
+        
+          M 142.7027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,48.64864864864865
+        
+          M 155.67567567567568,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,48.64864864864865
+        
+          M 162.16216216216216,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,48.64864864864865
+        
+          M 175.13513513513516,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,48.64864864864865
+        
+          M 181.62162162162164,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,48.64864864864865
+        
+          M 12.972972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,55.13513513513514
+        
+          M 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+        
+          M 25.945945945945947,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,55.13513513513514
+        
+          M 38.91891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,55.13513513513514
+        
+          M 51.891891891891895,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,55.13513513513514
+        
+          M 64.86486486486487,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,55.13513513513514
+        
+          M 77.83783783783784,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,55.13513513513514
+        
+          M 90.81081081081082,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,55.13513513513514
+        
+          M 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+        
+          M 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+        
+          M 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+        
+          M 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+        
+          M 123.24324324324326,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,55.13513513513514
+        
+          M 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+        
+          M 142.7027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,55.13513513513514
+        
+          M 149.1891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,55.13513513513514
+        
+          M 155.67567567567568,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,55.13513513513514
+        
+          M 168.64864864864865,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,55.13513513513514
+        
+          M 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+        
+          M 188.10810810810813,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,55.13513513513514
+        
+          M 194.5945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,55.13513513513514
+        
+          M 201.0810810810811,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,55.13513513513514
+        
+          M 220.54054054054055,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,55.13513513513514
+        
+          M 227.02702702702703,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,55.13513513513514
+        
+          M 233.51351351351352,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,55.13513513513514
+        
+          M 19.45945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,61.62162162162162
+        
+          M 64.86486486486487,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,61.62162162162162
+        
+          M 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+        
+          M 84.32432432432432,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,61.62162162162162
+        
+          M 97.2972972972973,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,61.62162162162162
+        
+          M 116.75675675675676,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,61.62162162162162
+        
+          M 123.24324324324326,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,61.62162162162162
+        
+          M 142.7027027027027,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,61.62162162162162
+        
+          M 155.67567567567568,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,61.62162162162162
+        
+          M 175.13513513513516,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,61.62162162162162
+        
+          M 188.10810810810813,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,61.62162162162162
+        
+          M 194.5945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,61.62162162162162
+        
+          M 233.51351351351352,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,61.62162162162162
+        
+          M 0,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,68.10810810810811
+        
+          M 12.972972972972974,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,68.10810810810811
+        
+          M 25.945945945945947,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,68.10810810810811
+        
+          M 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+        
+          M 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+        
+          M 45.40540540540541,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,68.10810810810811
+        
+          M 58.37837837837838,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,68.10810810810811
+        
+          M 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+        
+          M 103.78378378378379,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,68.10810810810811
+        
+          M 116.75675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,68.10810810810811
+        
+          M 142.7027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,68.10810810810811
+        
+          M 149.1891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,68.10810810810811
+        
+          M 175.13513513513516,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,68.10810810810811
+        
+          M 194.5945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,68.10810810810811
+        
+          M 201.0810810810811,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,68.10810810810811
+        
+          M 214.05405405405406,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,68.10810810810811
+        
+          M 233.51351351351352,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,68.10810810810811
+        
+          M 6.486486486486486,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,74.5945945945946
+        
+          M 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+        
+          M 25.945945945945947,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,74.5945945945946
+        
+          M 45.40540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,74.5945945945946
+        
+          M 71.35135135135135,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,74.5945945945946
+        
+          M 90.81081081081082,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,74.5945945945946
+        
+          M 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+        
+          M 110.27027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,74.5945945945946
+        
+          M 123.24324324324326,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,74.5945945945946
+        
+          M 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+        
+          M 142.7027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,74.5945945945946
+        
+          M 149.1891891891892,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,74.5945945945946
+        
+          M 175.13513513513516,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,74.5945945945946
+        
+          M 188.10810810810813,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,74.5945945945946
+        
+          M 194.5945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,74.5945945945946
+        
+          M 201.0810810810811,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,74.5945945945946
+        
+          M 207.56756756756758,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,74.5945945945946
+        
+          M 220.54054054054055,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,74.5945945945946
+        
+          M 227.02702702702703,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,74.5945945945946
+        
+          M 233.51351351351352,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,74.5945945945946
+        
+          M 0,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,81.08108108108108
+        
+          M 6.486486486486486,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,81.08108108108108
+        
+          M 19.45945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,81.08108108108108
+        
+          M 25.945945945945947,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,81.08108108108108
+        
+          M 38.91891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,81.08108108108108
+        
+          M 45.40540540540541,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,81.08108108108108
+        
+          M 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+        
+          M 71.35135135135135,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,81.08108108108108
+        
+          M 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+        
+          M 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+        
+          M 103.78378378378379,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,81.08108108108108
+        
+          M 116.75675675675676,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,81.08108108108108
+        
+          M 136.21621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,81.08108108108108
+        
+          M 149.1891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,81.08108108108108
+        
+          M 155.67567567567568,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,81.08108108108108
+        
+          M 168.64864864864865,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,81.08108108108108
+        
+          M 188.10810810810813,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,81.08108108108108
+        
+          M 194.5945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,81.08108108108108
+        
+          M 214.05405405405406,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,81.08108108108108
+        
+          M 233.51351351351352,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,81.08108108108108
+        
+          M 25.945945945945947,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,87.56756756756756
+        
+          M 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+        
+          M 64.86486486486487,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,87.56756756756756
+        
+          M 77.83783783783784,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,87.56756756756756
+        
+          M 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+        
+          M 90.81081081081082,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,87.56756756756756
+        
+          M 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+        
+          M 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+        
+          M 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+        
+          M 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+        
+          M 123.24324324324326,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,87.56756756756756
+        
+          M 136.21621621621622,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,87.56756756756756
+        
+          M 142.7027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,87.56756756756756
+        
+          M 149.1891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,87.56756756756756
+        
+          M 162.16216216216216,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,87.56756756756756
+        
+          M 175.13513513513516,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,87.56756756756756
+        
+          M 201.0810810810811,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,87.56756756756756
+        
+          M 207.56756756756758,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,87.56756756756756
+        
+          M 214.05405405405406,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,87.56756756756756
+        
+          M 0,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,94.05405405405406
+        
+          M 6.486486486486486,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,94.05405405405406
+        
+          M 19.45945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,94.05405405405406
+        
+          M 25.945945945945947,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,94.05405405405406
+        
+          M 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+        
+          M 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+        
+          M 45.40540540540541,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,94.05405405405406
+        
+          M 77.83783783783784,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,94.05405405405406
+        
+          M 97.2972972972973,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,94.05405405405406
+        
+          M 110.27027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,94.05405405405406
+        
+          M 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+        
+          M 123.24324324324326,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,94.05405405405406
+        
+          M 136.21621621621622,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,94.05405405405406
+        
+          M 142.7027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,94.05405405405406
+        
+          M 149.1891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,94.05405405405406
+        
+          M 181.62162162162164,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,94.05405405405406
+        
+          M 188.10810810810813,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,94.05405405405406
+        
+          M 194.5945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,94.05405405405406
+        
+          M 214.05405405405406,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,94.05405405405406
+        
+          M 227.02702702702703,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,94.05405405405406
+        
+          M 233.51351351351352,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,94.05405405405406
+        
+          M 12.972972972972974,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,100.54054054054055
+        
+          M 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+        
+          M 25.945945945945947,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,100.54054054054055
+        
+          M 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+        
+          M 51.891891891891895,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,100.54054054054055
+        
+          M 64.86486486486487,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,100.54054054054055
+        
+          M 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+        
+          M 84.32432432432432,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,100.54054054054055
+        
+          M 97.2972972972973,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,100.54054054054055
+        
+          M 136.21621621621622,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,100.54054054054055
+        
+          M 142.7027027027027,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,100.54054054054055
+        
+          M 168.64864864864865,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,100.54054054054055
+        
+          M 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+        
+          M 181.62162162162164,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,100.54054054054055
+        
+          M 188.10810810810813,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,100.54054054054055
+        
+          M 194.5945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,100.54054054054055
+        
+          M 207.56756756756758,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,100.54054054054055
+        
+          M 227.02702702702703,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,100.54054054054055
+        
+          M 233.51351351351352,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,100.54054054054055
+        
+          M 0,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,107.02702702702703
+        
+          M 6.486486486486486,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,107.02702702702703
+        
+          M 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+        
+          M 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+        
+          M 32.432432432432435,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,107.02702702702703
+        
+          M 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+        
+          M 58.37837837837838,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,107.02702702702703
+        
+          M 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+        
+          M 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+        
+          M 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+        
+          M 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+        
+          M 90.81081081081082,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,107.02702702702703
+        
+          M 103.78378378378379,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,107.02702702702703
+        
+          M 123.24324324324326,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,107.02702702702703
+        
+          M 136.21621621621622,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,107.02702702702703
+        
+          M 142.7027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,107.02702702702703
+        
+          M 149.1891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,107.02702702702703
+        
+          M 175.13513513513516,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,107.02702702702703
+        
+          M 181.62162162162164,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,107.02702702702703
+        
+          M 207.56756756756758,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,107.02702702702703
+        
+          M 220.54054054054055,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,107.02702702702703
+        
+          M 233.51351351351352,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,107.02702702702703
+        
+          M 0,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,113.51351351351352
+        
+          M 6.486486486486486,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,113.51351351351352
+        
+          M 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+        
+          M 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+        
+          M 32.432432432432435,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,113.51351351351352
+        
+          M 45.40540540540541,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,113.51351351351352
+        
+          M 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+        
+          M 71.35135135135135,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,113.51351351351352
+        
+          M 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+        
+          M 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+        
+          M 90.81081081081082,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,113.51351351351352
+        
+          M 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+        
+          M 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+        
+          M 116.75675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,113.51351351351352
+        
+          M 123.24324324324326,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,113.51351351351352
+        
+          M 149.1891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,113.51351351351352
+        
+          M 162.16216216216216,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,113.51351351351352
+        
+          M 175.13513513513516,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,113.51351351351352
+        
+          M 181.62162162162164,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,113.51351351351352
+        
+          M 188.10810810810813,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,113.51351351351352
+        
+          M 194.5945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,113.51351351351352
+        
+          M 201.0810810810811,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,113.51351351351352
+        
+          M 220.54054054054055,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,113.51351351351352
+        
+          M 227.02702702702703,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,113.51351351351352
+        
+          M 0,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,120
+        
+          M 6.486486486486486,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,120
+        
+          M 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+        
+          M 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+        
+          M 32.432432432432435,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,120
+        
+          M 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+        
+          M 77.83783783783784,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,120
+        
+          M 103.78378378378379,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,120
+        
+          M 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+        
+          M 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+        
+          M 123.24324324324326,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,120
+        
+          M 136.21621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,120
+        
+          M 155.67567567567568,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,120
+        
+          M 168.64864864864865,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,120
+        
+          M 194.5945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,120
+        
+          M 220.54054054054055,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,120
+        
+          M 233.51351351351352,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,120
+        
+          M 19.45945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,126.4864864864865
+        
+          M 58.37837837837838,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,126.4864864864865
+        
+          M 71.35135135135135,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,126.4864864864865
+        
+          M 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+        
+          M 110.27027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,126.4864864864865
+        
+          M 136.21621621621622,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,126.4864864864865
+        
+          M 142.7027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,126.4864864864865
+        
+          M 162.16216216216216,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,126.4864864864865
+        
+          M 175.13513513513516,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,126.4864864864865
+        
+          M 181.62162162162164,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,126.4864864864865
+        
+          M 194.5945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,126.4864864864865
+        
+          M 6.486486486486486,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,132.972972972973
+        
+          M 25.945945945945947,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,132.972972972973
+        
+          M 38.91891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,132.972972972973
+        
+          M 45.40540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,132.972972972973
+        
+          M 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+        
+          M 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+        
+          M 71.35135135135135,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,132.972972972973
+        
+          M 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+        
+          M 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+        
+          M 103.78378378378379,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,132.972972972973
+        
+          M 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+        
+          M 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+        
+          M 136.21621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,132.972972972973
+        
+          M 142.7027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,132.972972972973
+        
+          M 149.1891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,132.972972972973
+        
+          M 155.67567567567568,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,132.972972972973
+        
+          M 168.64864864864865,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,132.972972972973
+        
+          M 188.10810810810813,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,132.972972972973
+        
+          M 201.0810810810811,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,132.972972972973
+        
+          M 207.56756756756758,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,132.972972972973
+        
+          M 220.54054054054055,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,132.972972972973
+        
+          M 233.51351351351352,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,132.972972972973
+        
+          M 6.486486486486486,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,139.45945945945948
+        
+          M 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+        
+          M 32.432432432432435,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,139.45945945945948
+        
+          M 45.40540540540541,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,139.45945945945948
+        
+          M 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+        
+          M 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+        
+          M 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+        
+          M 84.32432432432432,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,139.45945945945948
+        
+          M 110.27027027027027,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,139.45945945945948
+        
+          M 129.72972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,139.45945945945948
+        
+          M 136.21621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,139.45945945945948
+        
+          M 149.1891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,139.45945945945948
+        
+          M 155.67567567567568,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,139.45945945945948
+        
+          M 175.13513513513516,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,139.45945945945948
+        
+          M 181.62162162162164,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,139.45945945945948
+        
+          M 188.10810810810813,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,139.45945945945948
+        
+          M 194.5945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,139.45945945945948
+        
+          M 220.54054054054055,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,139.45945945945948
+        
+          M 233.51351351351352,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,139.45945945945948
+        
+          M 0,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,145.94594594594597
+        
+          M 12.972972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,145.94594594594597
+        
+          M 38.91891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,145.94594594594597
+        
+          M 58.37837837837838,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,145.94594594594597
+        
+          M 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+        
+          M 77.83783783783784,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,145.94594594594597
+        
+          M 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+        
+          M 90.81081081081082,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,145.94594594594597
+        
+          M 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+        
+          M 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+        
+          M 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+        
+          M 123.24324324324326,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,145.94594594594597
+        
+          M 136.21621621621622,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,145.94594594594597
+        
+          M 149.1891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,145.94594594594597
+        
+          M 181.62162162162164,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,145.94594594594597
+        
+          M 214.05405405405406,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,145.94594594594597
+        
+          M 6.486486486486486,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,152.43243243243245
+        
+          M 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+        
+          M 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+        
+          M 25.945945945945947,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,152.43243243243245
+        
+          M 45.40540540540541,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,152.43243243243245
+        
+          M 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+        
+          M 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+        
+          M 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+        
+          M 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+        
+          M 90.81081081081082,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,152.43243243243245
+        
+          M 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+        
+          M 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+        
+          M 116.75675675675676,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,152.43243243243245
+        
+          M 129.72972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,152.43243243243245
+        
+          M 136.21621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,152.43243243243245
+        
+          M 142.7027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,152.43243243243245
+        
+          M 155.67567567567568,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,152.43243243243245
+        
+          M 168.64864864864865,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,152.43243243243245
+        
+          M 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+        
+          M 188.10810810810813,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,152.43243243243245
+        
+          M 194.5945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,152.43243243243245
+        
+          M 220.54054054054055,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,152.43243243243245
+        
+          M 227.02702702702703,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,152.43243243243245
+        
+          M 233.51351351351352,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,152.43243243243245
+        
+          M 0,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,158.91891891891893
+        
+          M 32.432432432432435,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,158.91891891891893
+        
+          M 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+        
+          M 51.891891891891895,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,158.91891891891893
+        
+          M 71.35135135135135,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,158.91891891891893
+        
+          M 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+        
+          M 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+        
+          M 90.81081081081082,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,158.91891891891893
+        
+          M 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+        
+          M 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+        
+          M 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+        
+          M 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+        
+          M 123.24324324324326,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,158.91891891891893
+        
+          M 136.21621621621622,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,158.91891891891893
+        
+          M 149.1891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,158.91891891891893
+        
+          M 181.62162162162164,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,158.91891891891893
+        
+          M 233.51351351351352,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,158.91891891891893
+        
+          M 0,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,165.40540540540542
+        
+          M 32.432432432432435,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,165.40540540540542
+        
+          M 45.40540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,165.40540540540542
+        
+          M 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+        
+          M 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+        
+          M 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+        
+          M 84.32432432432432,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,165.40540540540542
+        
+          M 116.75675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,165.40540540540542
+        
+          M 123.24324324324326,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,165.40540540540542
+        
+          M 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+        
+          M 155.67567567567568,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,165.40540540540542
+        
+          M 168.64864864864865,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,165.40540540540542
+        
+          M 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+        
+          M 181.62162162162164,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,165.40540540540542
+        
+          M 194.5945945945946,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,165.40540540540542
+        
+          M 201.0810810810811,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,165.40540540540542
+        
+          M 207.56756756756758,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,165.40540540540542
+        
+          M 220.54054054054055,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,165.40540540540542
+        
+          M 227.02702702702703,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,165.40540540540542
+        
+          M 233.51351351351352,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,165.40540540540542
+        
+          M 0,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,171.8918918918919
+        
+          M 12.972972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,171.8918918918919
+        
+          M 25.945945945945947,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,171.8918918918919
+        
+          M 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+        
+          M 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+        
+          M 58.37837837837838,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,171.8918918918919
+        
+          M 71.35135135135135,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,171.8918918918919
+        
+          M 90.81081081081082,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,171.8918918918919
+        
+          M 110.27027027027027,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,171.8918918918919
+        
+          M 123.24324324324326,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,171.8918918918919
+        
+          M 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+        
+          M 136.21621621621622,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,171.8918918918919
+        
+          M 214.05405405405406,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,171.8918918918919
+        
+          M 0,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,178.37837837837841
+        
+          M 19.45945945945946,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,178.37837837837841
+        
+          M 25.945945945945947,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,178.37837837837841
+        
+          M 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+        
+          M 51.891891891891895,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,178.37837837837841
+        
+          M 71.35135135135135,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,178.37837837837841
+        
+          M 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+        
+          M 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+        
+          M 110.27027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,178.37837837837841
+        
+          M 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+        
+          M 136.21621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,178.37837837837841
+        
+          M 142.7027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,178.37837837837841
+        
+          M 155.67567567567568,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,178.37837837837841
+        
+          M 162.16216216216216,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,178.37837837837841
+        
+          M 175.13513513513516,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,178.37837837837841
+        
+          M 181.62162162162164,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,178.37837837837841
+        
+          M 201.0810810810811,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,178.37837837837841
+        
+          M 207.56756756756758,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,178.37837837837841
+        
+          M 220.54054054054055,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,178.37837837837841
+        
+          M 227.02702702702703,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,178.37837837837841
+        
+          M 233.51351351351352,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,178.37837837837841
+        
+          M 0,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,184.8648648648649
+        
+          M 19.45945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,184.8648648648649
+        
+          M 32.432432432432435,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,184.8648648648649
+        
+          M 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+        
+          M 45.40540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,184.8648648648649
+        
+          M 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+        
+          M 90.81081081081082,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,184.8648648648649
+        
+          M 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+        
+          M 129.72972972972974,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,184.8648648648649
+        
+          M 136.21621621621622,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,184.8648648648649
+        
+          M 142.7027027027027,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,184.8648648648649
+        
+          M 175.13513513513516,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,184.8648648648649
+        
+          M 181.62162162162164,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,184.8648648648649
+        
+          M 188.10810810810813,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,184.8648648648649
+        
+          M 194.5945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,184.8648648648649
+        
+          M 201.0810810810811,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,184.8648648648649
+        
+          M 207.56756756756758,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,184.8648648648649
+        
+          M 233.51351351351352,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,184.8648648648649
+        
+          M 51.891891891891895,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,191.35135135135138
+        
+          M 71.35135135135135,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,191.35135135135138
+        
+          M 84.32432432432432,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,191.35135135135138
+        
+          M 97.2972972972973,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,191.35135135135138
+        
+          M 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+        
+          M 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+        
+          M 123.24324324324326,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,191.35135135135138
+        
+          M 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+        
+          M 142.7027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,191.35135135135138
+        
+          M 155.67567567567568,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,191.35135135135138
+        
+          M 162.16216216216216,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,191.35135135135138
+        
+          M 168.64864864864865,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,191.35135135135138
+        
+          M 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+        
+          M 181.62162162162164,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,191.35135135135138
+        
+          M 207.56756756756758,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,191.35135135135138
+        
+          M 214.05405405405406,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,191.35135135135138
+        
+          M 220.54054054054055,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,191.35135135135138
+        
+          M 233.51351351351352,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,191.35135135135138
+        
+          M 0,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,197.83783783783787
+        
+          M 6.486486486486486,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,197.83783783783787
+        
+          M 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+        
+          M 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+        
+          M 25.945945945945947,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,197.83783783783787
+        
+          M 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+        
+          M 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+        
+          M 58.37837837837838,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,197.83783783783787
+        
+          M 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+        
+          M 77.83783783783784,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,197.83783783783787
+        
+          M 90.81081081081082,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,197.83783783783787
+        
+          M 116.75675675675676,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,197.83783783783787
+        
+          M 123.24324324324326,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,197.83783783783787
+        
+          M 136.21621621621622,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,197.83783783783787
+        
+          M 149.1891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,197.83783783783787
+        
+          M 168.64864864864865,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,197.83783783783787
+        
+          M 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+        
+          M 181.62162162162164,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,197.83783783783787
+        
+          M 194.5945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,197.83783783783787
+        
+          M 207.56756756756758,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,197.83783783783787
+        
+          M 214.05405405405406,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,197.83783783783787
+        
+          M 0,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,204.32432432432435
+        
+          M 38.91891891891892,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,204.32432432432435
+        
+          M 58.37837837837838,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,204.32432432432435
+        
+          M 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+        
+          M 84.32432432432432,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,204.32432432432435
+        
+          M 90.81081081081082,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,204.32432432432435
+        
+          M 123.24324324324326,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,204.32432432432435
+        
+          M 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+        
+          M 136.21621621621622,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,204.32432432432435
+        
+          M 142.7027027027027,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,204.32432432432435
+        
+          M 162.16216216216216,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,204.32432432432435
+        
+          M 181.62162162162164,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,204.32432432432435
+        
+          M 207.56756756756758,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,204.32432432432435
+        
+          M 214.05405405405406,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,204.32432432432435
+        
+          M 227.02702702702703,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,204.32432432432435
+        
+          M 233.51351351351352,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,204.32432432432435
+        
+          M 0,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,210.81081081081084
+        
+          M 12.972972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,210.81081081081084
+        
+          M 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+        
+          M 25.945945945945947,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,210.81081081081084
+        
+          M 38.91891891891892,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,210.81081081081084
+        
+          M 51.891891891891895,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,210.81081081081084
+        
+          M 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+        
+          M 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+        
+          M 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+        
+          M 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+        
+          M 116.75675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,210.81081081081084
+        
+          M 129.72972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,210.81081081081084
+        
+          M 155.67567567567568,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,210.81081081081084
+        
+          M 168.64864864864865,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,210.81081081081084
+        
+          M 181.62162162162164,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,210.81081081081084
+        
+          M 188.10810810810813,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,210.81081081081084
+        
+          M 194.5945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,210.81081081081084
+        
+          M 201.0810810810811,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,210.81081081081084
+        
+          M 207.56756756756758,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,210.81081081081084
+        
+          M 214.05405405405406,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,210.81081081081084
+        
+          M 220.54054054054055,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,210.81081081081084
+        
+          M 227.02702702702703,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,210.81081081081084
+        
+          M 233.51351351351352,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,210.81081081081084
+        
+          M 0,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,217.29729729729732
+        
+          M 12.972972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,217.29729729729732
+        
+          M 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+        
+          M 25.945945945945947,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,217.29729729729732
+        
+          M 38.91891891891892,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,217.29729729729732
+        
+          M 51.891891891891895,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,217.29729729729732
+        
+          M 71.35135135135135,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,217.29729729729732
+        
+          M 97.2972972972973,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,217.29729729729732
+        
+          M 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+        
+          M 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+        
+          M 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+        
+          M 129.72972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,217.29729729729732
+        
+          M 142.7027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,217.29729729729732
+        
+          M 175.13513513513516,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,217.29729729729732
+        
+          M 188.10810810810813,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,217.29729729729732
+        
+          M 194.5945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,217.29729729729732
+        
+          M 214.05405405405406,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,217.29729729729732
+        
+          M 233.51351351351352,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,217.29729729729732
+        
+          M 0,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,223.7837837837838
+        
+          M 12.972972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,223.7837837837838
+        
+          M 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+        
+          M 25.945945945945947,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,223.7837837837838
+        
+          M 38.91891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,223.7837837837838
+        
+          M 51.891891891891895,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,223.7837837837838
+        
+          M 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+        
+          M 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+        
+          M 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+        
+          M 84.32432432432432,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,223.7837837837838
+        
+          M 90.81081081081082,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,223.7837837837838
+        
+          M 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+        
+          M 116.75675675675676,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,223.7837837837838
+        
+          M 123.24324324324326,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,223.7837837837838
+        
+          M 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+        
+          M 142.7027027027027,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,223.7837837837838
+        
+          M 149.1891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,223.7837837837838
+        
+          M 155.67567567567568,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,223.7837837837838
+        
+          M 168.64864864864865,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,223.7837837837838
+        
+          M 181.62162162162164,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,223.7837837837838
+        
+          M 194.5945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,223.7837837837838
+        
+          M 233.51351351351352,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,223.7837837837838
+        
+          M 0,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,230.2702702702703
+        
+          M 38.91891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,230.2702702702703
+        
+          M 64.86486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,230.2702702702703
+        
+          M 84.32432432432432,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,230.2702702702703
+        
+          M 90.81081081081082,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,230.2702702702703
+        
+          M 103.78378378378379,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,230.2702702702703
+        
+          M 116.75675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,230.2702702702703
+        
+          M 123.24324324324326,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,230.2702702702703
+        
+          M 136.21621621621622,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,230.2702702702703
+        
+          M 149.1891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,230.2702702702703
+        
+          M 162.16216216216216,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,230.2702702702703
+        
+          M 201.0810810810811,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,230.2702702702703
+        
+          M 233.51351351351352,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,230.2702702702703
+        
+          M 0,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,236.75675675675677
+        
+          M 6.486486486486486,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,236.75675675675677
+        
+          M 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+        
+          M 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+        
+          M 25.945945945945947,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,236.75675675675677
+        
+          M 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+        
+          M 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+        
+          M 77.83783783783784,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,236.75675675675677
+        
+          M 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+        
+          M 97.2972972972973,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,236.75675675675677
+        
+          M 110.27027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,236.75675675675677
+        
+          M 123.24324324324326,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,236.75675675675677
+        
+          M 136.21621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,236.75675675675677
+        
+          M 142.7027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,236.75675675675677
+        
+          M 149.1891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,236.75675675675677
+        
+          M 155.67567567567568,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,236.75675675675677
+        
+          M 168.64864864864865,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,236.75675675675677
+        
+          M 181.62162162162164,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,236.75675675675677
+        
+          M 194.5945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,236.75675675675677
+        
+          M 201.0810810810811,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,236.75675675675677
+        
+          M 207.56756756756758,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,236.75675675675677
+        
+          M 227.02702702702703,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,236.75675675675677
+        
+          M 233.51351351351352,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,236.75675675675677
+        "
+                      fill="#00C3A0"
+                    />
+                    <path
+                      d="
+          M 0,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,3.2432432432432434
+        
+          M 6.486486486486486,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,3.2432432432432434
+        
+          M 12.972972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,3.2432432432432434
+        
+          M 19.45945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,3.2432432432432434
+        
+          M 25.945945945945947,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,3.2432432432432434
+        
+          M 32.432432432432435,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,3.2432432432432434
+        
+          M 38.91891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,3.2432432432432434
+        
+          M 51.891891891891895,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,3.2432432432432434
+        
+          M 64.86486486486487,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,3.2432432432432434
+        
+          M 84.32432432432432,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,3.2432432432432434
+        
+          M 97.2972972972973,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,3.2432432432432434
+        
+          M 110.27027027027027,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,3.2432432432432434
+        
+          M 116.75675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,3.2432432432432434
+        
+          M 123.24324324324326,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,3.2432432432432434
+        
+          M 136.21621621621622,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,3.2432432432432434
+        
+          M 149.1891891891892,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,3.2432432432432434
+        
+          M 162.16216216216216,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,3.2432432432432434
+        
+          M 168.64864864864865,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,3.2432432432432434
+        
+          M 175.13513513513516,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,3.2432432432432434
+        
+          M 194.5945945945946,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,3.2432432432432434
+        
+          M 201.0810810810811,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,3.2432432432432434
+        
+          M 207.56756756756758,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,3.2432432432432434
+        
+          M 214.05405405405406,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,3.2432432432432434
+        
+          M 220.54054054054055,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,3.2432432432432434
+        
+          M 227.02702702702703,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,3.2432432432432434
+        
+          M 233.51351351351352,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,3.2432432432432434
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,3.2432432432432434
+        
+          M 0,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,9.72972972972973
+        
+          M 38.91891891891892,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,9.72972972972973
+        
+          M 51.891891891891895,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,9.72972972972973
+        
+          M 58.37837837837838,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,9.72972972972973
+        
+          M 64.86486486486487,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,9.72972972972973
+        
+          M 77.83783783783784,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,9.72972972972973
+        
+          M 84.32432432432432,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,9.72972972972973
+        
+          M 90.81081081081082,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,9.72972972972973
+        
+          M 97.2972972972973,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,9.72972972972973
+        
+          M 110.27027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,9.72972972972973
+        
+          M 123.24324324324326,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,9.72972972972973
+        
+          M 136.21621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,9.72972972972973
+        
+          M 142.7027027027027,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,9.72972972972973
+        
+          M 155.67567567567568,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,9.72972972972973
+        
+          M 175.13513513513516,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,9.72972972972973
+        
+          M 181.62162162162164,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,9.72972972972973
+        
+          M 194.5945945945946,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,9.72972972972973
+        
+          M 233.51351351351352,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,9.72972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,9.72972972972973
+        
+          M 0,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,16.216216216216218
+        
+          M 12.972972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,16.216216216216218
+        
+          M 19.45945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,16.216216216216218
+        
+          M 25.945945945945947,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,16.216216216216218
+        
+          M 38.91891891891892,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,16.216216216216218
+        
+          M 51.891891891891895,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,16.216216216216218
+        
+          M 71.35135135135135,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,16.216216216216218
+        
+          M 84.32432432432432,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,16.216216216216218
+        
+          M 90.81081081081082,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,16.216216216216218
+        
+          M 97.2972972972973,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,16.216216216216218
+        
+          M 116.75675675675676,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,16.216216216216218
+        
+          M 123.24324324324326,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,16.216216216216218
+        
+          M 162.16216216216216,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,16.216216216216218
+        
+          M 175.13513513513516,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,16.216216216216218
+        
+          M 194.5945945945946,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,16.216216216216218
+        
+          M 207.56756756756758,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,16.216216216216218
+        
+          M 214.05405405405406,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,16.216216216216218
+        
+          M 220.54054054054055,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,16.216216216216218
+        
+          M 233.51351351351352,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,16.216216216216218
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,16.216216216216218
+        
+          M 0,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,22.7027027027027
+        
+          M 12.972972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,22.7027027027027
+        
+          M 19.45945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,22.7027027027027
+        
+          M 25.945945945945947,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,22.7027027027027
+        
+          M 38.91891891891892,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,22.7027027027027
+        
+          M 58.37837837837838,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,22.7027027027027
+        
+          M 77.83783783783784,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,22.7027027027027
+        
+          M 90.81081081081082,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,22.7027027027027
+        
+          M 116.75675675675676,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,22.7027027027027
+        
+          M 129.72972972972974,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,22.7027027027027
+        
+          M 142.7027027027027,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,22.7027027027027
+        
+          M 155.67567567567568,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,22.7027027027027
+        
+          M 168.64864864864865,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,22.7027027027027
+        
+          M 175.13513513513516,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,22.7027027027027
+        
+          M 194.5945945945946,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,22.7027027027027
+        
+          M 207.56756756756758,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,22.7027027027027
+        
+          M 214.05405405405406,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,22.7027027027027
+        
+          M 220.54054054054055,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,22.7027027027027
+        
+          M 233.51351351351352,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,22.7027027027027
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,22.7027027027027
+        
+          M 0,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,29.18918918918919
+        
+          M 12.972972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,29.18918918918919
+        
+          M 19.45945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,29.18918918918919
+        
+          M 25.945945945945947,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,29.18918918918919
+        
+          M 38.91891891891892,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,29.18918918918919
+        
+          M 64.86486486486487,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,29.18918918918919
+        
+          M 84.32432432432432,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,29.18918918918919
+        
+          M 110.27027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,29.18918918918919
+        
+          M 123.24324324324326,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,29.18918918918919
+        
+          M 136.21621621621622,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,29.18918918918919
+        
+          M 142.7027027027027,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,29.18918918918919
+        
+          M 162.16216216216216,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,29.18918918918919
+        
+          M 181.62162162162164,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,29.18918918918919
+        
+          M 194.5945945945946,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,29.18918918918919
+        
+          M 207.56756756756758,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,29.18918918918919
+        
+          M 214.05405405405406,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,29.18918918918919
+        
+          M 220.54054054054055,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,29.18918918918919
+        
+          M 233.51351351351352,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,29.18918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,29.18918918918919
+        
+          M 0,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,35.67567567567568
+        
+          M 38.91891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,35.67567567567568
+        
+          M 51.891891891891895,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,35.67567567567568
+        
+          M 58.37837837837838,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,35.67567567567568
+        
+          M 71.35135135135135,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,35.67567567567568
+        
+          M 97.2972972972973,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,35.67567567567568
+        
+          M 103.78378378378379,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,35.67567567567568
+        
+          M 116.75675675675676,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,35.67567567567568
+        
+          M 149.1891891891892,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,35.67567567567568
+        
+          M 155.67567567567568,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,35.67567567567568
+        
+          M 162.16216216216216,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,35.67567567567568
+        
+          M 168.64864864864865,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,35.67567567567568
+        
+          M 175.13513513513516,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,35.67567567567568
+        
+          M 194.5945945945946,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,35.67567567567568
+        
+          M 233.51351351351352,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,35.67567567567568
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,35.67567567567568
+        
+          M 0,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,42.16216216216216
+        
+          M 6.486486486486486,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,42.16216216216216
+        
+          M 12.972972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,42.16216216216216
+        
+          M 19.45945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,42.16216216216216
+        
+          M 25.945945945945947,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,42.16216216216216
+        
+          M 32.432432432432435,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,42.16216216216216
+        
+          M 38.91891891891892,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,42.16216216216216
+        
+          M 51.891891891891895,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,42.16216216216216
+        
+          M 64.86486486486487,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,42.16216216216216
+        
+          M 77.83783783783784,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,42.16216216216216
+        
+          M 90.81081081081082,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,42.16216216216216
+        
+          M 103.78378378378379,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,42.16216216216216
+        
+          M 116.75675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,42.16216216216216
+        
+          M 129.72972972972974,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,42.16216216216216
+        
+          M 142.7027027027027,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,42.16216216216216
+        
+          M 155.67567567567568,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,42.16216216216216
+        
+          M 168.64864864864865,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,42.16216216216216
+        
+          M 181.62162162162164,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,42.16216216216216
+        
+          M 194.5945945945946,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,42.16216216216216
+        
+          M 201.0810810810811,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,42.16216216216216
+        
+          M 207.56756756756758,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,42.16216216216216
+        
+          M 214.05405405405406,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,42.16216216216216
+        
+          M 220.54054054054055,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,42.16216216216216
+        
+          M 227.02702702702703,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,42.16216216216216
+        
+          M 233.51351351351352,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,42.16216216216216
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,42.16216216216216
+        
+          M 51.891891891891895,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,48.64864864864865
+        
+          M 64.86486486486487,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,48.64864864864865
+        
+          M 103.78378378378379,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,48.64864864864865
+        
+          M 110.27027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,48.64864864864865
+        
+          M 116.75675675675676,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,48.64864864864865
+        
+          M 129.72972972972974,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,48.64864864864865
+        
+          M 136.21621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,48.64864864864865
+        
+          M 142.7027027027027,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,48.64864864864865
+        
+          M 155.67567567567568,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,48.64864864864865
+        
+          M 162.16216216216216,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,48.64864864864865
+        
+          M 175.13513513513516,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,48.64864864864865
+        
+          M 181.62162162162164,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,48.64864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,48.64864864864865
+        
+          M 12.972972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,55.13513513513514
+        
+          M 19.45945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,55.13513513513514
+        
+          M 25.945945945945947,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,55.13513513513514
+        
+          M 38.91891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,55.13513513513514
+        
+          M 51.891891891891895,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,55.13513513513514
+        
+          M 64.86486486486487,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,55.13513513513514
+        
+          M 77.83783783783784,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,55.13513513513514
+        
+          M 90.81081081081082,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,55.13513513513514
+        
+          M 97.2972972972973,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,55.13513513513514
+        
+          M 103.78378378378379,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,55.13513513513514
+        
+          M 110.27027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,55.13513513513514
+        
+          M 116.75675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,55.13513513513514
+        
+          M 123.24324324324326,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,55.13513513513514
+        
+          M 129.72972972972974,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,55.13513513513514
+        
+          M 142.7027027027027,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,55.13513513513514
+        
+          M 149.1891891891892,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,55.13513513513514
+        
+          M 155.67567567567568,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,55.13513513513514
+        
+          M 168.64864864864865,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,55.13513513513514
+        
+          M 175.13513513513516,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,55.13513513513514
+        
+          M 188.10810810810813,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,55.13513513513514
+        
+          M 194.5945945945946,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,55.13513513513514
+        
+          M 201.0810810810811,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,55.13513513513514
+        
+          M 220.54054054054055,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,55.13513513513514
+        
+          M 227.02702702702703,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,55.13513513513514
+        
+          M 233.51351351351352,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,55.13513513513514
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,55.13513513513514
+        
+          M 19.45945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,61.62162162162162
+        
+          M 64.86486486486487,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,61.62162162162162
+        
+          M 71.35135135135135,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,61.62162162162162
+        
+          M 84.32432432432432,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,61.62162162162162
+        
+          M 97.2972972972973,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,61.62162162162162
+        
+          M 116.75675675675676,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,61.62162162162162
+        
+          M 123.24324324324326,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,61.62162162162162
+        
+          M 142.7027027027027,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,61.62162162162162
+        
+          M 155.67567567567568,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,61.62162162162162
+        
+          M 175.13513513513516,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,61.62162162162162
+        
+          M 188.10810810810813,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,61.62162162162162
+        
+          M 194.5945945945946,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,61.62162162162162
+        
+          M 233.51351351351352,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,61.62162162162162
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,61.62162162162162
+        
+          M 0,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,68.10810810810811
+        
+          M 12.972972972972974,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,68.10810810810811
+        
+          M 25.945945945945947,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,68.10810810810811
+        
+          M 32.432432432432435,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,68.10810810810811
+        
+          M 38.91891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,68.10810810810811
+        
+          M 45.40540540540541,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,68.10810810810811
+        
+          M 58.37837837837838,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,68.10810810810811
+        
+          M 64.86486486486487,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,68.10810810810811
+        
+          M 103.78378378378379,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,68.10810810810811
+        
+          M 116.75675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,68.10810810810811
+        
+          M 142.7027027027027,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,68.10810810810811
+        
+          M 149.1891891891892,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,68.10810810810811
+        
+          M 175.13513513513516,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,68.10810810810811
+        
+          M 194.5945945945946,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,68.10810810810811
+        
+          M 201.0810810810811,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,68.10810810810811
+        
+          M 214.05405405405406,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,68.10810810810811
+        
+          M 233.51351351351352,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,68.10810810810811
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,68.10810810810811
+        
+          M 6.486486486486486,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,74.5945945945946
+        
+          M 12.972972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,74.5945945945946
+        
+          M 25.945945945945947,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,74.5945945945946
+        
+          M 45.40540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,74.5945945945946
+        
+          M 71.35135135135135,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,74.5945945945946
+        
+          M 90.81081081081082,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,74.5945945945946
+        
+          M 97.2972972972973,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,74.5945945945946
+        
+          M 110.27027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,74.5945945945946
+        
+          M 123.24324324324326,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,74.5945945945946
+        
+          M 129.72972972972974,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,74.5945945945946
+        
+          M 142.7027027027027,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,74.5945945945946
+        
+          M 149.1891891891892,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,74.5945945945946
+        
+          M 175.13513513513516,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,74.5945945945946
+        
+          M 188.10810810810813,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,74.5945945945946
+        
+          M 194.5945945945946,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,74.5945945945946
+        
+          M 201.0810810810811,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,74.5945945945946
+        
+          M 207.56756756756758,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,74.5945945945946
+        
+          M 220.54054054054055,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,74.5945945945946
+        
+          M 227.02702702702703,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,74.5945945945946
+        
+          M 233.51351351351352,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,74.5945945945946
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,74.5945945945946
+        
+          M 0,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,81.08108108108108
+        
+          M 6.486486486486486,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,81.08108108108108
+        
+          M 19.45945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,81.08108108108108
+        
+          M 25.945945945945947,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,81.08108108108108
+        
+          M 38.91891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,81.08108108108108
+        
+          M 45.40540540540541,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,81.08108108108108
+        
+          M 51.891891891891895,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,81.08108108108108
+        
+          M 71.35135135135135,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,81.08108108108108
+        
+          M 77.83783783783784,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,81.08108108108108
+        
+          M 84.32432432432432,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,81.08108108108108
+        
+          M 103.78378378378379,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,81.08108108108108
+        
+          M 116.75675675675676,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,81.08108108108108
+        
+          M 136.21621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,81.08108108108108
+        
+          M 149.1891891891892,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,81.08108108108108
+        
+          M 155.67567567567568,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,81.08108108108108
+        
+          M 168.64864864864865,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,81.08108108108108
+        
+          M 188.10810810810813,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,81.08108108108108
+        
+          M 194.5945945945946,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,81.08108108108108
+        
+          M 214.05405405405406,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,81.08108108108108
+        
+          M 233.51351351351352,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,81.08108108108108
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,81.08108108108108
+        
+          M 25.945945945945947,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,87.56756756756756
+        
+          M 32.432432432432435,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,87.56756756756756
+        
+          M 64.86486486486487,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,87.56756756756756
+        
+          M 77.83783783783784,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,87.56756756756756
+        
+          M 84.32432432432432,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,87.56756756756756
+        
+          M 90.81081081081082,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,87.56756756756756
+        
+          M 97.2972972972973,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,87.56756756756756
+        
+          M 103.78378378378379,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,87.56756756756756
+        
+          M 110.27027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,87.56756756756756
+        
+          M 116.75675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,87.56756756756756
+        
+          M 123.24324324324326,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,87.56756756756756
+        
+          M 136.21621621621622,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,87.56756756756756
+        
+          M 142.7027027027027,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,87.56756756756756
+        
+          M 149.1891891891892,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,87.56756756756756
+        
+          M 162.16216216216216,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,87.56756756756756
+        
+          M 175.13513513513516,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,87.56756756756756
+        
+          M 201.0810810810811,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,87.56756756756756
+        
+          M 207.56756756756758,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,87.56756756756756
+        
+          M 214.05405405405406,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,87.56756756756756
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,87.56756756756756
+        
+          M 0,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,94.05405405405406
+        
+          M 6.486486486486486,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,94.05405405405406
+        
+          M 19.45945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,94.05405405405406
+        
+          M 25.945945945945947,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,94.05405405405406
+        
+          M 32.432432432432435,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,94.05405405405406
+        
+          M 38.91891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,94.05405405405406
+        
+          M 45.40540540540541,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,94.05405405405406
+        
+          M 77.83783783783784,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,94.05405405405406
+        
+          M 97.2972972972973,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,94.05405405405406
+        
+          M 110.27027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,94.05405405405406
+        
+          M 116.75675675675676,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,94.05405405405406
+        
+          M 123.24324324324326,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,94.05405405405406
+        
+          M 136.21621621621622,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,94.05405405405406
+        
+          M 142.7027027027027,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,94.05405405405406
+        
+          M 149.1891891891892,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,94.05405405405406
+        
+          M 181.62162162162164,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,94.05405405405406
+        
+          M 188.10810810810813,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,94.05405405405406
+        
+          M 194.5945945945946,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,94.05405405405406
+        
+          M 214.05405405405406,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,94.05405405405406
+        
+          M 227.02702702702703,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,94.05405405405406
+        
+          M 233.51351351351352,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,94.05405405405406
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,94.05405405405406
+        
+          M 12.972972972972974,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,100.54054054054055
+        
+          M 19.45945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,100.54054054054055
+        
+          M 25.945945945945947,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,100.54054054054055
+        
+          M 32.432432432432435,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,100.54054054054055
+        
+          M 51.891891891891895,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,100.54054054054055
+        
+          M 64.86486486486487,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,100.54054054054055
+        
+          M 71.35135135135135,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,100.54054054054055
+        
+          M 84.32432432432432,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,100.54054054054055
+        
+          M 97.2972972972973,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,100.54054054054055
+        
+          M 136.21621621621622,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,100.54054054054055
+        
+          M 142.7027027027027,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,100.54054054054055
+        
+          M 168.64864864864865,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,100.54054054054055
+        
+          M 175.13513513513516,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,100.54054054054055
+        
+          M 181.62162162162164,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,100.54054054054055
+        
+          M 188.10810810810813,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,100.54054054054055
+        
+          M 194.5945945945946,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,100.54054054054055
+        
+          M 207.56756756756758,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,100.54054054054055
+        
+          M 227.02702702702703,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,100.54054054054055
+        
+          M 233.51351351351352,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,100.54054054054055
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,100.54054054054055
+        
+          M 0,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,107.02702702702703
+        
+          M 6.486486486486486,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,107.02702702702703
+        
+          M 12.972972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,107.02702702702703
+        
+          M 19.45945945945946,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,107.02702702702703
+        
+          M 32.432432432432435,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,107.02702702702703
+        
+          M 38.91891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,107.02702702702703
+        
+          M 58.37837837837838,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,107.02702702702703
+        
+          M 64.86486486486487,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,107.02702702702703
+        
+          M 71.35135135135135,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,107.02702702702703
+        
+          M 77.83783783783784,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,107.02702702702703
+        
+          M 84.32432432432432,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,107.02702702702703
+        
+          M 90.81081081081082,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,107.02702702702703
+        
+          M 103.78378378378379,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,107.02702702702703
+        
+          M 123.24324324324326,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,107.02702702702703
+        
+          M 136.21621621621622,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,107.02702702702703
+        
+          M 142.7027027027027,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,107.02702702702703
+        
+          M 149.1891891891892,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,107.02702702702703
+        
+          M 175.13513513513516,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,107.02702702702703
+        
+          M 181.62162162162164,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,107.02702702702703
+        
+          M 207.56756756756758,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,107.02702702702703
+        
+          M 220.54054054054055,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,107.02702702702703
+        
+          M 233.51351351351352,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,107.02702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,107.02702702702703
+        
+          M 0,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,113.51351351351352
+        
+          M 6.486486486486486,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,113.51351351351352
+        
+          M 12.972972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,113.51351351351352
+        
+          M 19.45945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,113.51351351351352
+        
+          M 32.432432432432435,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,113.51351351351352
+        
+          M 45.40540540540541,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,113.51351351351352
+        
+          M 51.891891891891895,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,113.51351351351352
+        
+          M 71.35135135135135,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,113.51351351351352
+        
+          M 77.83783783783784,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,113.51351351351352
+        
+          M 84.32432432432432,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,113.51351351351352
+        
+          M 90.81081081081082,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,113.51351351351352
+        
+          M 97.2972972972973,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,113.51351351351352
+        
+          M 103.78378378378379,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,113.51351351351352
+        
+          M 116.75675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,113.51351351351352
+        
+          M 123.24324324324326,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,113.51351351351352
+        
+          M 149.1891891891892,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,113.51351351351352
+        
+          M 162.16216216216216,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,113.51351351351352
+        
+          M 175.13513513513516,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,113.51351351351352
+        
+          M 181.62162162162164,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,113.51351351351352
+        
+          M 188.10810810810813,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,113.51351351351352
+        
+          M 194.5945945945946,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,113.51351351351352
+        
+          M 201.0810810810811,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,113.51351351351352
+        
+          M 220.54054054054055,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,113.51351351351352
+        
+          M 227.02702702702703,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,113.51351351351352
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,113.51351351351352
+        
+          M 0,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,120
+        
+          M 6.486486486486486,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,120
+        
+          M 12.972972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,120
+        
+          M 19.45945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,120
+        
+          M 32.432432432432435,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,120
+        
+          M 38.91891891891892,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,120
+        
+          M 77.83783783783784,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,120
+        
+          M 103.78378378378379,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,120
+        
+          M 110.27027027027027,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,120
+        
+          M 116.75675675675676,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,120
+        
+          M 123.24324324324326,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,120
+        
+          M 136.21621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,120
+        
+          M 155.67567567567568,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,120
+        
+          M 168.64864864864865,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,120
+        
+          M 194.5945945945946,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,120
+        
+          M 220.54054054054055,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,120
+        
+          M 233.51351351351352,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,120
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,120
+        
+          M 19.45945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,126.4864864864865
+        
+          M 58.37837837837838,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,126.4864864864865
+        
+          M 71.35135135135135,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,126.4864864864865
+        
+          M 77.83783783783784,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,126.4864864864865
+        
+          M 110.27027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,126.4864864864865
+        
+          M 136.21621621621622,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,126.4864864864865
+        
+          M 142.7027027027027,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,126.4864864864865
+        
+          M 162.16216216216216,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,126.4864864864865
+        
+          M 175.13513513513516,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,126.4864864864865
+        
+          M 181.62162162162164,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,126.4864864864865
+        
+          M 194.5945945945946,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,126.4864864864865
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,126.4864864864865
+        
+          M 6.486486486486486,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,132.972972972973
+        
+          M 25.945945945945947,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,132.972972972973
+        
+          M 38.91891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,132.972972972973
+        
+          M 45.40540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,132.972972972973
+        
+          M 51.891891891891895,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,132.972972972973
+        
+          M 58.37837837837838,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,132.972972972973
+        
+          M 71.35135135135135,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,132.972972972973
+        
+          M 77.83783783783784,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,132.972972972973
+        
+          M 84.32432432432432,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,132.972972972973
+        
+          M 103.78378378378379,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,132.972972972973
+        
+          M 110.27027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,132.972972972973
+        
+          M 116.75675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,132.972972972973
+        
+          M 136.21621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,132.972972972973
+        
+          M 142.7027027027027,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,132.972972972973
+        
+          M 149.1891891891892,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,132.972972972973
+        
+          M 155.67567567567568,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,132.972972972973
+        
+          M 168.64864864864865,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,132.972972972973
+        
+          M 188.10810810810813,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,132.972972972973
+        
+          M 201.0810810810811,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,132.972972972973
+        
+          M 207.56756756756758,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,132.972972972973
+        
+          M 220.54054054054055,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,132.972972972973
+        
+          M 233.51351351351352,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,132.972972972973
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,132.972972972973
+        
+          M 6.486486486486486,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,139.45945945945948
+        
+          M 12.972972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,139.45945945945948
+        
+          M 32.432432432432435,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,139.45945945945948
+        
+          M 45.40540540540541,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,139.45945945945948
+        
+          M 51.891891891891895,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,139.45945945945948
+        
+          M 58.37837837837838,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,139.45945945945948
+        
+          M 64.86486486486487,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,139.45945945945948
+        
+          M 84.32432432432432,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,139.45945945945948
+        
+          M 110.27027027027027,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,139.45945945945948
+        
+          M 129.72972972972974,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,139.45945945945948
+        
+          M 136.21621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,139.45945945945948
+        
+          M 149.1891891891892,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,139.45945945945948
+        
+          M 155.67567567567568,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,139.45945945945948
+        
+          M 175.13513513513516,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,139.45945945945948
+        
+          M 181.62162162162164,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,139.45945945945948
+        
+          M 188.10810810810813,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,139.45945945945948
+        
+          M 194.5945945945946,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,139.45945945945948
+        
+          M 220.54054054054055,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,139.45945945945948
+        
+          M 233.51351351351352,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,139.45945945945948
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,139.45945945945948
+        
+          M 0,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,145.94594594594597
+        
+          M 12.972972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,145.94594594594597
+        
+          M 38.91891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,145.94594594594597
+        
+          M 58.37837837837838,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,145.94594594594597
+        
+          M 64.86486486486487,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,145.94594594594597
+        
+          M 77.83783783783784,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,145.94594594594597
+        
+          M 84.32432432432432,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,145.94594594594597
+        
+          M 90.81081081081082,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,145.94594594594597
+        
+          M 97.2972972972973,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,145.94594594594597
+        
+          M 103.78378378378379,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,145.94594594594597
+        
+          M 110.27027027027027,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,145.94594594594597
+        
+          M 123.24324324324326,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,145.94594594594597
+        
+          M 136.21621621621622,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,145.94594594594597
+        
+          M 149.1891891891892,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,145.94594594594597
+        
+          M 181.62162162162164,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,145.94594594594597
+        
+          M 214.05405405405406,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,145.94594594594597
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,145.94594594594597
+        
+          M 6.486486486486486,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,152.43243243243245
+        
+          M 12.972972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,152.43243243243245
+        
+          M 19.45945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,152.43243243243245
+        
+          M 25.945945945945947,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,152.43243243243245
+        
+          M 45.40540540540541,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,152.43243243243245
+        
+          M 51.891891891891895,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,152.43243243243245
+        
+          M 58.37837837837838,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,152.43243243243245
+        
+          M 64.86486486486487,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,152.43243243243245
+        
+          M 71.35135135135135,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,152.43243243243245
+        
+          M 90.81081081081082,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,152.43243243243245
+        
+          M 97.2972972972973,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,152.43243243243245
+        
+          M 103.78378378378379,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,152.43243243243245
+        
+          M 116.75675675675676,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,152.43243243243245
+        
+          M 129.72972972972974,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,152.43243243243245
+        
+          M 136.21621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,152.43243243243245
+        
+          M 142.7027027027027,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,152.43243243243245
+        
+          M 155.67567567567568,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,152.43243243243245
+        
+          M 168.64864864864865,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,152.43243243243245
+        
+          M 175.13513513513516,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,152.43243243243245
+        
+          M 188.10810810810813,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,152.43243243243245
+        
+          M 194.5945945945946,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,152.43243243243245
+        
+          M 220.54054054054055,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,152.43243243243245
+        
+          M 227.02702702702703,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,152.43243243243245
+        
+          M 233.51351351351352,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,152.43243243243245
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,152.43243243243245
+        
+          M 0,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,158.91891891891893
+        
+          M 32.432432432432435,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,158.91891891891893
+        
+          M 38.91891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,158.91891891891893
+        
+          M 51.891891891891895,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,158.91891891891893
+        
+          M 71.35135135135135,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,158.91891891891893
+        
+          M 77.83783783783784,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,158.91891891891893
+        
+          M 84.32432432432432,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,158.91891891891893
+        
+          M 90.81081081081082,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,158.91891891891893
+        
+          M 97.2972972972973,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,158.91891891891893
+        
+          M 103.78378378378379,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,158.91891891891893
+        
+          M 110.27027027027027,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,158.91891891891893
+        
+          M 116.75675675675676,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,158.91891891891893
+        
+          M 123.24324324324326,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,158.91891891891893
+        
+          M 136.21621621621622,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,158.91891891891893
+        
+          M 149.1891891891892,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,158.91891891891893
+        
+          M 181.62162162162164,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,158.91891891891893
+        
+          M 233.51351351351352,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,158.91891891891893
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,158.91891891891893
+        
+          M 0,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,165.40540540540542
+        
+          M 32.432432432432435,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,165.40540540540542
+        
+          M 45.40540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,165.40540540540542
+        
+          M 51.891891891891895,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,165.40540540540542
+        
+          M 58.37837837837838,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,165.40540540540542
+        
+          M 64.86486486486487,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,165.40540540540542
+        
+          M 84.32432432432432,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,165.40540540540542
+        
+          M 116.75675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,165.40540540540542
+        
+          M 123.24324324324326,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,165.40540540540542
+        
+          M 129.72972972972974,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,165.40540540540542
+        
+          M 155.67567567567568,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,165.40540540540542
+        
+          M 168.64864864864865,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,165.40540540540542
+        
+          M 175.13513513513516,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,165.40540540540542
+        
+          M 181.62162162162164,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,165.40540540540542
+        
+          M 194.5945945945946,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,165.40540540540542
+        
+          M 201.0810810810811,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,165.40540540540542
+        
+          M 207.56756756756758,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,165.40540540540542
+        
+          M 220.54054054054055,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,165.40540540540542
+        
+          M 227.02702702702703,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,165.40540540540542
+        
+          M 233.51351351351352,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,165.40540540540542
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,165.40540540540542
+        
+          M 0,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,171.8918918918919
+        
+          M 12.972972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,171.8918918918919
+        
+          M 25.945945945945947,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,171.8918918918919
+        
+          M 32.432432432432435,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,171.8918918918919
+        
+          M 38.91891891891892,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,171.8918918918919
+        
+          M 58.37837837837838,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,171.8918918918919
+        
+          M 71.35135135135135,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,171.8918918918919
+        
+          M 90.81081081081082,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,171.8918918918919
+        
+          M 110.27027027027027,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,171.8918918918919
+        
+          M 123.24324324324326,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,171.8918918918919
+        
+          M 129.72972972972974,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,171.8918918918919
+        
+          M 136.21621621621622,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,171.8918918918919
+        
+          M 214.05405405405406,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,171.8918918918919
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,171.8918918918919
+        
+          M 0,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,178.37837837837841
+        
+          M 19.45945945945946,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,178.37837837837841
+        
+          M 25.945945945945947,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,178.37837837837841
+        
+          M 32.432432432432435,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,178.37837837837841
+        
+          M 51.891891891891895,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,178.37837837837841
+        
+          M 71.35135135135135,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,178.37837837837841
+        
+          M 77.83783783783784,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,178.37837837837841
+        
+          M 84.32432432432432,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,178.37837837837841
+        
+          M 110.27027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,178.37837837837841
+        
+          M 116.75675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,178.37837837837841
+        
+          M 136.21621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,178.37837837837841
+        
+          M 142.7027027027027,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,178.37837837837841
+        
+          M 155.67567567567568,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,178.37837837837841
+        
+          M 162.16216216216216,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,178.37837837837841
+        
+          M 175.13513513513516,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,178.37837837837841
+        
+          M 181.62162162162164,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,178.37837837837841
+        
+          M 201.0810810810811,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,178.37837837837841
+        
+          M 207.56756756756758,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,178.37837837837841
+        
+          M 220.54054054054055,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,178.37837837837841
+        
+          M 227.02702702702703,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,178.37837837837841
+        
+          M 233.51351351351352,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,178.37837837837841
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,178.37837837837841
+        
+          M 0,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,184.8648648648649
+        
+          M 19.45945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,184.8648648648649
+        
+          M 32.432432432432435,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,184.8648648648649
+        
+          M 38.91891891891892,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,184.8648648648649
+        
+          M 45.40540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.40540540540541,184.8648648648649
+        
+          M 51.891891891891895,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,184.8648648648649
+        
+          M 90.81081081081082,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,184.8648648648649
+        
+          M 97.2972972972973,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,184.8648648648649
+        
+          M 129.72972972972974,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,184.8648648648649
+        
+          M 136.21621621621622,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,184.8648648648649
+        
+          M 142.7027027027027,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,184.8648648648649
+        
+          M 175.13513513513516,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,184.8648648648649
+        
+          M 181.62162162162164,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,184.8648648648649
+        
+          M 188.10810810810813,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,184.8648648648649
+        
+          M 194.5945945945946,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,184.8648648648649
+        
+          M 201.0810810810811,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,184.8648648648649
+        
+          M 207.56756756756758,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,184.8648648648649
+        
+          M 233.51351351351352,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,184.8648648648649
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,184.8648648648649
+        
+          M 51.891891891891895,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,191.35135135135138
+        
+          M 71.35135135135135,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,191.35135135135138
+        
+          M 84.32432432432432,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,191.35135135135138
+        
+          M 97.2972972972973,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,191.35135135135138
+        
+          M 103.78378378378379,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,191.35135135135138
+        
+          M 110.27027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,191.35135135135138
+        
+          M 123.24324324324326,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,191.35135135135138
+        
+          M 129.72972972972974,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,191.35135135135138
+        
+          M 142.7027027027027,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,191.35135135135138
+        
+          M 155.67567567567568,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,191.35135135135138
+        
+          M 162.16216216216216,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,191.35135135135138
+        
+          M 168.64864864864865,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,191.35135135135138
+        
+          M 175.13513513513516,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,191.35135135135138
+        
+          M 181.62162162162164,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,191.35135135135138
+        
+          M 207.56756756756758,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,191.35135135135138
+        
+          M 214.05405405405406,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,191.35135135135138
+        
+          M 220.54054054054055,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,191.35135135135138
+        
+          M 233.51351351351352,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,191.35135135135138
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,191.35135135135138
+        
+          M 0,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,197.83783783783787
+        
+          M 6.486486486486486,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,197.83783783783787
+        
+          M 12.972972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,197.83783783783787
+        
+          M 19.45945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,197.83783783783787
+        
+          M 25.945945945945947,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,197.83783783783787
+        
+          M 32.432432432432435,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,197.83783783783787
+        
+          M 38.91891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,197.83783783783787
+        
+          M 58.37837837837838,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,197.83783783783787
+        
+          M 64.86486486486487,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,197.83783783783787
+        
+          M 77.83783783783784,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,197.83783783783787
+        
+          M 90.81081081081082,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,197.83783783783787
+        
+          M 116.75675675675676,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,197.83783783783787
+        
+          M 123.24324324324326,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,197.83783783783787
+        
+          M 136.21621621621622,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,197.83783783783787
+        
+          M 149.1891891891892,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,197.83783783783787
+        
+          M 168.64864864864865,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,197.83783783783787
+        
+          M 175.13513513513516,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,197.83783783783787
+        
+          M 181.62162162162164,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,197.83783783783787
+        
+          M 194.5945945945946,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,197.83783783783787
+        
+          M 207.56756756756758,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,197.83783783783787
+        
+          M 214.05405405405406,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,197.83783783783787
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,197.83783783783787
+        
+          M 0,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,204.32432432432435
+        
+          M 38.91891891891892,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,204.32432432432435
+        
+          M 58.37837837837838,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,204.32432432432435
+        
+          M 64.86486486486487,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,204.32432432432435
+        
+          M 84.32432432432432,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,204.32432432432435
+        
+          M 90.81081081081082,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,204.32432432432435
+        
+          M 123.24324324324326,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,204.32432432432435
+        
+          M 129.72972972972974,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,204.32432432432435
+        
+          M 136.21621621621622,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,204.32432432432435
+        
+          M 142.7027027027027,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,204.32432432432435
+        
+          M 162.16216216216216,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,204.32432432432435
+        
+          M 181.62162162162164,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,204.32432432432435
+        
+          M 207.56756756756758,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,204.32432432432435
+        
+          M 214.05405405405406,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,204.32432432432435
+        
+          M 227.02702702702703,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,204.32432432432435
+        
+          M 233.51351351351352,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,204.32432432432435
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,204.32432432432435
+        
+          M 0,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,210.81081081081084
+        
+          M 12.972972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,210.81081081081084
+        
+          M 19.45945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,210.81081081081084
+        
+          M 25.945945945945947,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,210.81081081081084
+        
+          M 38.91891891891892,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,210.81081081081084
+        
+          M 51.891891891891895,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,210.81081081081084
+        
+          M 58.37837837837838,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,210.81081081081084
+        
+          M 64.86486486486487,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,210.81081081081084
+        
+          M 71.35135135135135,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,210.81081081081084
+        
+          M 77.83783783783784,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,210.81081081081084
+        
+          M 116.75675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,210.81081081081084
+        
+          M 129.72972972972974,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,210.81081081081084
+        
+          M 155.67567567567568,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,210.81081081081084
+        
+          M 168.64864864864865,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,210.81081081081084
+        
+          M 181.62162162162164,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,210.81081081081084
+        
+          M 188.10810810810813,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,210.81081081081084
+        
+          M 194.5945945945946,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,210.81081081081084
+        
+          M 201.0810810810811,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,210.81081081081084
+        
+          M 207.56756756756758,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,210.81081081081084
+        
+          M 214.05405405405406,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,210.81081081081084
+        
+          M 220.54054054054055,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702706,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054055,210.81081081081084
+        
+          M 227.02702702702703,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,210.81081081081084
+        
+          M 233.51351351351352,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,210.81081081081084
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,210.81081081081084
+        
+          M 0,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,217.29729729729732
+        
+          M 12.972972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,217.29729729729732
+        
+          M 19.45945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,217.29729729729732
+        
+          M 25.945945945945947,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,217.29729729729732
+        
+          M 38.91891891891892,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,217.29729729729732
+        
+          M 51.891891891891895,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,217.29729729729732
+        
+          M 71.35135135135135,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,217.29729729729732
+        
+          M 97.2972972972973,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,217.29729729729732
+        
+          M 103.78378378378379,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,217.29729729729732
+        
+          M 110.27027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,217.29729729729732
+        
+          M 116.75675675675676,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,217.29729729729732
+        
+          M 129.72972972972974,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,217.29729729729732
+        
+          M 142.7027027027027,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,217.29729729729732
+        
+          M 175.13513513513516,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162167,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,217.29729729729732
+        
+          M 188.10810810810813,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.59459459459464,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810813,217.29729729729732
+        
+          M 194.5945945945946,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,217.29729729729732
+        
+          M 214.05405405405406,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 220.54054054054058,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.05405405405406,217.29729729729732
+        
+          M 233.51351351351352,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,217.29729729729732
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,217.29729729729732
+        
+          M 0,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,223.7837837837838
+        
+          M 12.972972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,223.7837837837838
+        
+          M 19.45945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,223.7837837837838
+        
+          M 25.945945945945947,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,223.7837837837838
+        
+          M 38.91891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,223.7837837837838
+        
+          M 51.891891891891895,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 51.891891891891895,223.7837837837838
+        
+          M 58.37837837837838,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 58.37837837837838,223.7837837837838
+        
+          M 64.86486486486487,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,223.7837837837838
+        
+          M 71.35135135135135,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,223.7837837837838
+        
+          M 84.32432432432432,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,223.7837837837838
+        
+          M 90.81081081081082,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,223.7837837837838
+        
+          M 97.2972972972973,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,223.7837837837838
+        
+          M 116.75675675675676,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,223.7837837837838
+        
+          M 123.24324324324326,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,223.7837837837838
+        
+          M 129.72972972972974,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621625,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,223.7837837837838
+        
+          M 142.7027027027027,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,223.7837837837838
+        
+          M 149.1891891891892,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,223.7837837837838
+        
+          M 155.67567567567568,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,223.7837837837838
+        
+          M 168.64864864864865,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,223.7837837837838
+        
+          M 181.62162162162164,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,223.7837837837838
+        
+          M 194.5945945945946,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,223.7837837837838
+        
+          M 233.51351351351352,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,223.7837837837838
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,223.7837837837838
+        
+          M 0,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,230.2702702702703
+        
+          M 38.91891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,230.2702702702703
+        
+          M 64.86486486486487,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 71.35135135135135,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 64.86486486486487,230.2702702702703
+        
+          M 84.32432432432432,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,230.2702702702703
+        
+          M 90.81081081081082,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.81081081081082,230.2702702702703
+        
+          M 103.78378378378379,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,230.2702702702703
+        
+          M 116.75675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324324,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,230.2702702702703
+        
+          M 123.24324324324326,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,230.2702702702703
+        
+          M 136.21621621621622,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,230.2702702702703
+        
+          M 149.1891891891892,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,230.2702702702703
+        
+          M 162.16216216216216,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864867,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.16216216216216,230.2702702702703
+        
+          M 201.0810810810811,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,230.2702702702703
+        
+          M 233.51351351351352,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,230.2702702702703
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,230.2702702702703
+        
+          M 0,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486487,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 0,236.75675675675677
+        
+          M 6.486486486486486,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 6.486486486486486,236.75675675675677
+        
+          M 12.972972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 12.972972972972974,236.75675675675677
+        
+          M 19.45945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945944,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 19.45945945945946,236.75675675675677
+        
+          M 25.945945945945947,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 25.945945945945947,236.75675675675677
+        
+          M 32.432432432432435,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 32.432432432432435,236.75675675675677
+        
+          M 38.91891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 45.4054054054054,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 38.91891891891892,236.75675675675677
+        
+          M 77.83783783783784,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 77.83783783783784,236.75675675675677
+        
+          M 84.32432432432432,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 90.8108108108108,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 84.32432432432432,236.75675675675677
+        
+          M 97.2972972972973,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 103.78378378378379,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 97.2972972972973,236.75675675675677
+        
+          M 110.27027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 116.75675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 110.27027027027027,236.75675675675677
+        
+          M 123.24324324324326,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 129.72972972972974,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 123.24324324324326,236.75675675675677
+        
+          M 136.21621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.70270270270274,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 136.21621621621622,236.75675675675677
+        
+          M 142.7027027027027,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.18918918918922,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 142.7027027027027,236.75675675675677
+        
+          M 149.1891891891892,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.6756756756757,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 149.1891891891892,236.75675675675677
+        
+          M 155.67567567567568,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 162.1621621621622,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 155.67567567567568,236.75675675675677
+        
+          M 168.64864864864865,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 175.13513513513516,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 168.64864864864865,236.75675675675677
+        
+          M 181.62162162162164,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 188.10810810810815,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 181.62162162162164,236.75675675675677
+        
+          M 194.5945945945946,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.08108108108112,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 194.5945945945946,236.75675675675677
+        
+          M 201.0810810810811,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.5675675675676,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 201.0810810810811,236.75675675675677
+        
+          M 207.56756756756758,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 214.0540540540541,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 207.56756756756758,236.75675675675677
+        
+          M 227.02702702702703,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351354,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 227.02702702702703,236.75675675675677
+        
+          M 233.51351351351352,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 240.00000000000003,236.75675675675677
+          A 3.2432432432432434,3.2432432432432434 0 1,0 233.51351351351352,236.75675675675677
+        "
+                      fill="#2222222D"
+                    />
+                    <g
+                      transform="scale(1.15)"
+                    >
+                      <path
+                        d="M0 0H40V40H0V0Z"
+                        fill="#FFFFFF"
+                      />
+                    </g>
+                    <g
+                      transform="scale(1.15)"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#00C3A0"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#00C3A0"
+                      />
+                    </g>
+                    <g
+                      transform="scale(1.15)"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#2222222D"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#2222222D"
+                      />
+                    </g>
+                    <g
+                      transform="translate(0, 194) scale(1.15)"
+                      translate="0, 194"
+                    >
+                      <path
+                        d="M0 0H40V40H0V0Z"
+                        fill="#FFFFFF"
+                      />
+                    </g>
+                    <g
+                      transform="translate(0, 194) scale(1.15)"
+                      translate="0, 194"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#00C3A0"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#00C3A0"
+                      />
+                    </g>
+                    <g
+                      transform="translate(0, 194) scale(1.15)"
+                      translate="0, 194"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#2222222D"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#2222222D"
+                      />
+                    </g>
+                    <g
+                      transform="translate(194, 0) scale(1.15)"
+                      translate="194, 0"
+                    >
+                      <path
+                        d="M0 0H40V40H0V0Z"
+                        fill="#FFFFFF"
+                      />
+                    </g>
+                    <g
+                      transform="translate(194, 0) scale(1.15)"
+                      translate="194, 0"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#00C3A0"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#00C3A0"
+                      />
+                    </g>
+                    <g
+                      transform="translate(194, 0) scale(1.15)"
+                      translate="194, 0"
+                    >
+                      <path
+                        clip-rule="evenodd"
+                        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+                        fill="#2222222D"
+                        fill-rule="evenodd"
+                      />
+                      <path
+                        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+                        fill="#2222222D"
+                      />
+                    </g>
+                  </g>
+                </svg>
+                <div
+                  class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _backgroundColor-733175080 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _overflowX-visible _overflowY-visible _pl-1481558338 _position-absolute _pt-1481558338"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _minHeight-0px _minWidth-0px _flexShrink-0 _backgroundColor-568007324 _borderTopColor-568007324 _borderRightColor-568007324 _borderBottomColor-568007324 _borderLeftColor-568007324 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-4px _borderRightWidth-4px _borderBottomWidth-4px _borderLeftWidth-4px _position-relative _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                    data-testid="account-icon"
+                  >
+                    <svg
+                      height="60"
+                      viewBox="0 0 60 60"
+                      width="60"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <g
+                        style="transform-origin: center center;"
+                      >
+                        <circle
+                          cx="30"
+                          cy="30"
+                          fill="#00C3A01F"
+                          r="30"
+                        />
+                        <g
+                          transform="translate(10, 10) scale(0.8333333333333334)"
+                        >
+                          <path
+                            clip-rule="evenodd"
+                            d="M20.9454 0.0175773C22.4936 -0.167833 23.763 1.13917 23.763 2.72944V21.3625C23.763 22.9527 22.4993 24.2419 20.9405 24.2419L2.67549 24.2419C1.11665 24.2419 -0.16452 22.9469 0.0172307 21.3675C1.30306 10.1936 9.99222 1.32931 20.9454 0.0175773Z"
+                            fill="#00C3A0"
+                            fill-rule="evenodd"
+                          />
+                          <path
+                            clip-rule="evenodd"
+                            d="M27.0546 47.9824C25.5064 48.1678 24.237 46.8608 24.237 45.2706V26.6375C24.237 25.0473 25.5007 23.7581 27.0595 23.7581L45.3245 23.7581C46.8833 23.7581 48.1645 25.0531 47.9828 26.6325C46.6969 37.8064 38.0078 46.6707 27.0546 47.9824Z"
+                            fill="#00C3A0"
+                            fill-rule="evenodd"
+                          />
+                        </g>
+                      </g>
+                    </svg>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="_display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _backgroundColor-568007293 _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122"
+              >
+                <div
+                  class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _pl-8px"
+                >
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopColor-568007293 _borderRightColor-568007293 _borderBottomColor-568007293 _borderLeftColor-568007293 _borderTopLeftRadius-8px _borderTopRightRadius-8px _borderBottomRightRadius-8px _borderBottomLeftRadius-8px _borderTopWidth-2px _borderRightWidth-2px _borderBottomWidth-2px _borderLeftWidth-2px _ml--8px _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
+                  >
+                    <div
+                      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+                      data-testid="network-logo"
+                      style="border-radius: 6px; overflow: hidden;"
+                    >
+                      <span
+                        class="_dsp_contents"
+                      >
+                        <div
+                          class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                          style="width: 16px; height: 16px;"
+                        >
+                          <div
+                            class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-ehq7j7"
+                          />
+                        </div>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <span
+                class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _lineHeight-16px _textAlign-center _fontSize-12px _fontWeight-400"
+                data-disable-theme="true"
+              >
+                You can receive tokens & NFTs on Ethereum, Polygon, Arbitrum, Optimism, Base, ZKsync, Zora, Avalanche, Celo, Blast, and BNB Chain.
+              </span>
+              <div
+                class="_opacity-0active-0d0t7546 _transform-0active-scale11281 _display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _cursor-pointer"
+              >
+                <span
+                  class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1380577629 _fontSize-16px _lineHeight-24px _fontWeight-500"
+                  data-disable-theme="true"
+                >
+                  Learn more
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </span>
+    </span>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "store": {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
+  "unmount": [Function],
+}
+`;
diff --git a/apps/extension/src/app/features/settings/DevMenuScreen.tsx b/apps/extension/src/app/features/settings/DevMenuScreen.tsx
new file mode 100644
index 00000000000..5436dceee09
--- /dev/null
+++ b/apps/extension/src/app/features/settings/DevMenuScreen.tsx
@@ -0,0 +1,44 @@
+import { useTranslation } from 'react-i18next'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { SettingsItemWithDropdown } from 'src/app/features/settings/SettingsItemWithDropdown'
+import { Accordion, Flex, ScrollView } from 'ui/src'
+import { Settings } from 'ui/src/components/icons'
+import i18n from 'uniswap/src/i18n/i18n'
+import { GatingOverrides } from 'wallet/src/components/gating/GatingOverrides'
+import { Language, SUPPORTED_LANGUAGES } from 'wallet/src/features/language/constants'
+import { getLanguageInfo, useCurrentLanguageInfo } from 'wallet/src/features/language/hooks'
+import { setCurrentLanguage } from 'wallet/src/features/language/slice'
+import { useAppDispatch } from 'wallet/src/state'
+
+export function DevMenuScreen(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  // Changing extension language requires changing system settings, so allowing for easy override here
+  const currentLanguageInfo = useCurrentLanguageInfo()
+
+  return (
+    <ScrollView>
+      <ScreenHeader title="Developer Settings" />
+      <Flex gap="$spacing8">
+        <SettingsItemWithDropdown
+          Icon={Settings}
+          items={SUPPORTED_LANGUAGES.map((language) => {
+            return { value: language, label: getLanguageInfo(t, language).displayName }
+          })}
+          selected={currentLanguageInfo.displayName}
+          title="Language Override"
+          onSelect={async (value) => {
+            const language = value as Language
+            const languageInfo = getLanguageInfo(t, language)
+            await i18n.changeLanguage(languageInfo.locale)
+            dispatch(setCurrentLanguage(language))
+          }}
+        />
+        <Accordion collapsible type="single">
+          <GatingOverrides />
+        </Accordion>
+      </Flex>
+    </ScrollView>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsDropdown.tsx b/apps/extension/src/app/features/settings/SettingsDropdown.tsx
new file mode 100644
index 00000000000..be9ee09cd86
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsDropdown.tsx
@@ -0,0 +1,92 @@
+import { useState } from 'react'
+import { Flex, Popover, ScrollView, Text, TouchableArea } from 'ui/src'
+import { Check, RotatableChevron } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+
+type DropdownItem = {
+  label: string
+  value: unknown
+}
+
+export type SettingsDropdownProps = {
+  selected: string
+  items: DropdownItem[]
+  disableDropdown?: boolean
+  onSelect: (item: unknown) => void
+}
+
+const MAX_DROPDOWN_HEIGHT = 220
+const MAX_DROPDOWN_WIDTH = 200
+
+export function SettingsDropdown({ selected, items, disableDropdown, onSelect }: SettingsDropdownProps): JSX.Element {
+  const [isOpen, setIsOpen] = useState(false)
+
+  return (
+    <Flex>
+      <Popover open={isOpen} stayInFrame={true} onOpenChange={(open) => setIsOpen(open)}>
+        <Popover.Trigger disabled={disableDropdown}>
+          <Flex
+            row
+            backgroundColor="$surface2"
+            borderRadius="$roundedFull"
+            cursor="pointer"
+            px="$spacing8"
+            py="$spacing4"
+          >
+            <Text color="$neutral2" px="$spacing4" variant="subheading2">
+              {selected}
+            </Text>
+            <RotatableChevron color="$neutral2" direction="down" height={iconSizes.icon16} width={iconSizes.icon16} />
+          </Flex>
+        </Popover.Trigger>
+        <Popover.Content backgroundColor="$transparent" disableRemoveScroll={false}>
+          <Flex
+            borderColor="$surface3"
+            borderRadius="$rounded16"
+            shadowColor="$shadowColor"
+            shadowOffset={{ width: 0, height: 2 }}
+            shadowRadius={20}
+            style={{ backdropFilter: 'blur(12px)' }}
+          >
+            <Flex
+              backgroundColor="$surface4"
+              borderRadius="$rounded16"
+              height="100%"
+              opacity={0.64}
+              position="absolute"
+              width="100%"
+            />
+            <ScrollView>
+              <Flex gap="$spacing8" maxHeight={MAX_DROPDOWN_HEIGHT} maxWidth={MAX_DROPDOWN_WIDTH} p="$spacing8">
+                {items.map((item, index) => (
+                  <TouchableArea
+                    key={item.label}
+                    hoverable
+                    borderRadius="$rounded8"
+                    onPress={() => {
+                      onSelect(item.value)
+                      setIsOpen(false)
+                    }}
+                  >
+                    <Flex row alignItems="center" gap="$spacing24" px="$spacing8" py="$spacing4">
+                      <Flex fill>
+                        <Text key={index} color="$neutral1" variant="body2">
+                          {item.label}
+                        </Text>
+                      </Flex>
+                      {selected === item.label ? (
+                        <Check color="$accent1" size="$icon.20" />
+                      ) : (
+                        <Flex height={iconSizes.icon20} width={iconSizes.icon20} />
+                      )}
+                    </Flex>
+                  </TouchableArea>
+                ))}
+              </Flex>
+            </ScrollView>
+          </Flex>
+        </Popover.Content>
+      </Popover>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsItemWithDropdown.tsx b/apps/extension/src/app/features/settings/SettingsItemWithDropdown.tsx
new file mode 100644
index 00000000000..a7f1c166cb4
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsItemWithDropdown.tsx
@@ -0,0 +1,33 @@
+import { SCREEN_ITEM_HORIZONTAL_PAD } from 'src/app/constants'
+import { SettingsDropdown, SettingsDropdownProps } from 'src/app/features/settings/SettingsDropdown'
+import { Flex, GeneratedIcon, Text, TouchableArea } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+
+type SettingsItemWithDropdownProps = {
+  Icon: GeneratedIcon
+  title: string
+  disableDropdown?: boolean
+  onDisabledDropdownPress?: () => void
+} & SettingsDropdownProps
+
+export function SettingsItemWithDropdown(props: SettingsItemWithDropdownProps): JSX.Element {
+  const { title, disableDropdown, Icon, onDisabledDropdownPress, ...dropdownProps } = props
+
+  const dropdown = <SettingsDropdown disableDropdown={disableDropdown} {...dropdownProps} />
+
+  return (
+    <Flex row alignItems="center" px={SCREEN_ITEM_HORIZONTAL_PAD} py="$spacing4">
+      <Flex fill row gap="$spacing12">
+        <Icon color="$neutral2" size={iconSizes.icon24} />
+        <Text color="$neutral1" variant="subheading2">
+          {title}
+        </Text>
+      </Flex>
+      {disableDropdown ? (
+        <TouchableArea onPress={() => onDisabledDropdownPress?.()}>{dropdown}</TouchableArea>
+      ) : (
+        dropdown
+      )}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsPrivacyScreen.tsx b/apps/extension/src/app/features/settings/SettingsPrivacyScreen.tsx
new file mode 100644
index 00000000000..03d2036640a
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsPrivacyScreen.tsx
@@ -0,0 +1,15 @@
+import { useTranslation } from 'react-i18next'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { Flex } from 'ui/src'
+import { AnalyticsToggleLineSwitch } from 'wallet/src/components/settings/AnalyticsToggleLineSwitch'
+
+export function SettingsPrivacyScreen(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Flex>
+      <ScreenHeader title={t('settings.setting.privacy.title')} />
+      <AnalyticsToggleLineSwitch />
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseVerify.tsx b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseVerify.tsx
new file mode 100644
index 00000000000..2f0fe5990e7
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseVerify.tsx
@@ -0,0 +1,141 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { PasswordInput } from 'src/app/components/PasswordInput'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { removeAllDappConnectionsFromExtension } from 'src/app/features/dapp/actions'
+import { SettingsRecoveryPhrase } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase'
+import { focusOrCreateOnboardingTab } from 'src/app/navigation/utils'
+import { useAppDispatch } from 'src/store/store'
+import { CheckBox, Flex, Text, inputStyles } from 'ui/src'
+import { TrashFilled } from 'ui/src/components/icons'
+import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { logger } from 'utilities/src/logger/logger'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+
+export function RemoveRecoveryPhraseVerify(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  const [password, setPassword] = useState('')
+  const [showPasswordError, setShowPasswordError] = useState(false)
+  const [hideInput, setHideInput] = useState(true)
+  const [checked, setChecked] = useState(false)
+
+  const onChangeText = (text: string): void => {
+    setPassword(text)
+    setShowPasswordError(false)
+  }
+
+  const onCheckPressed = (): void => {
+    setChecked(!checked)
+  }
+
+  const associatedAccounts = useSignerAccounts()
+
+  const onRemove = async (): Promise<void> => {
+    const accountsToRemove = associatedAccounts
+    const mnemonicId = accountsToRemove?.[0]?.mnemonicId
+    const accAddress = accountsToRemove?.[0]?.address
+
+    if (!accAddress) {
+      logger.error(new Error('No accounts to remove'), {
+        tags: { file: 'RemoveRecoveryPhraseVerify', function: 'onRemove' },
+      })
+      return
+    }
+
+    if (!mnemonicId) {
+      logger.error(new Error('mnemonicId does not exist'), {
+        tags: { file: 'RemoveRecoveryPhraseVerify', function: 'onRemove' },
+      })
+      return
+    }
+
+    await Keyring.removeMnemonic(mnemonicId)
+    await Keyring.removePassword()
+
+    await removeAllDappConnectionsFromExtension()
+
+    await dispatch(
+      editAccountActions.trigger({
+        type: EditAccountAction.Remove,
+        accounts: accountsToRemove,
+      }),
+    )
+
+    sendAnalyticsEvent(WalletEventName.WalletRemoved, {
+      wallets_removed: accountsToRemove.map((a) => a.address),
+    })
+
+    await focusOrCreateOnboardingTab()
+    window.close()
+  }
+
+  const checkPassword = async (): Promise<void> => {
+    if (!checked) {
+      return
+    }
+    const success = await Keyring.checkPassword(password)
+    if (!success) {
+      setShowPasswordError(true)
+      return
+    }
+    await onRemove()
+  }
+
+  const removeButtonEnabled = checked && !showPasswordError && password.length > 0
+
+  return (
+    <Flex grow backgroundColor="$surface1">
+      <ScreenHeader title={t('setting.recoveryPhrase.remove')} />
+      <SettingsRecoveryPhrase
+        icon={<TrashFilled color="$statusCritical" size="$icon.24" strokeWidth="$spacing2" />}
+        nextButtonEnabled={removeButtonEnabled}
+        nextButtonText={t('setting.recoveryPhrase.remove')}
+        nextButtonTheme="detrimental_Button"
+        subtitle={t('setting.recoveryPhrase.remove.subtitle')}
+        title={t('setting.recoveryPhrase.remove.title')}
+        onNextPressed={checkPassword}
+      >
+        <Flex grow justifyContent="space-between">
+          <Flex alignItems="center" gap="$spacing12">
+            <PasswordInput
+              autoFocus
+              backgroundColor={showPasswordError ? '$DEP_accentCriticalSoft' : '$surface1'}
+              focusStyle={inputStyles.inputFocus}
+              hideInput={hideInput}
+              placeholder={t('common.input.password.placeholder')}
+              value={password}
+              onChangeText={onChangeText}
+              onSubmitEditing={checkPassword}
+              onToggleHideInput={setHideInput}
+              {...(showPasswordError && { borderColor: '$statusCritical' })}
+            />
+            <Text color="$statusCritical" minHeight="$spacing24" textAlign="center" variant="body2">
+              {showPasswordError ? t('setting.recoveryPhrase.remove.password.error') : ''}
+            </Text>
+          </Flex>
+          <Flex pb="$spacing24">
+            <CheckBox
+              checked={checked}
+              text={
+                <Flex>
+                  <Text color="$neutral1" variant="body3">
+                    {t('setting.recoveryPhrase.remove.confirm.title')}
+                  </Text>
+                  <Text color="$neutral2" variant="body3">
+                    {t('setting.recoveryPhrase.remove.confirm.subtitle')}
+                  </Text>
+                </Flex>
+              }
+              onCheckPressed={onCheckPressed}
+            />
+          </Flex>
+        </Flex>
+      </SettingsRecoveryPhrase>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseWallets.tsx b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseWallets.tsx
new file mode 100644
index 00000000000..c6b25f871ba
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/RemoveRecoveryPhraseWallets.tsx
@@ -0,0 +1,111 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { SettingsRecoveryPhrase } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase'
+import { AppRoutes, RemoveRecoveryPhraseRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex, ScrollView, Text } from 'ui/src'
+import { AlertTriangle } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { NumberType } from 'utilities/src/format/types'
+import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
+import { useAccountList } from 'wallet/src/features/accounts/hooks'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+
+export function RemoveRecoveryPhraseWallets(): JSX.Element {
+  const { t } = useTranslation()
+  const { navigateTo } = useExtensionNavigation()
+
+  const accounts = useSignerAccounts()
+
+  return (
+    <Flex grow backgroundColor="$surface1">
+      <ScreenHeader title={t('setting.recoveryPhrase.remove')} />
+      <SettingsRecoveryPhrase
+        icon={<AlertTriangle color="$statusCritical" size="$icon.24" />}
+        nextButtonEnabled={true}
+        nextButtonText={t('common.button.continue')}
+        nextButtonTheme="secondary_Button"
+        subtitle={t('setting.recoveryPhrase.remove.initial.subtitle')}
+        title={t('setting.recoveryPhrase.remove.initial.title')}
+        onNextPressed={(): void => {
+          navigateTo(
+            `${AppRoutes.Settings}/${SettingsRoutes.RemoveRecoveryPhrase}/${RemoveRecoveryPhraseRoutes.Verify}`,
+          )
+        }}
+      >
+        <AssociatedAccountsList accounts={accounts} />
+      </SettingsRecoveryPhrase>
+    </Flex>
+  )
+}
+
+// TODO(@thomasthachil): merge this with mobile AccountList
+function AssociatedAccountsList({ accounts }: { accounts: Account[] }): JSX.Element {
+  const addresses = useMemo(() => accounts.map((account) => account.address), [accounts])
+  const { data, loading } = useAccountList({
+    addresses,
+    notifyOnNetworkStatusChange: true,
+  })
+
+  const sortedAddressesByBalance = addresses
+    .map((address) => {
+      const wallet = data?.portfolios?.find((portfolio) => portfolio?.ownerAddress === address)
+      return { address, balance: wallet?.tokensTotalDenominatedValue?.value }
+    })
+    .sort((a, b) => (b.balance ?? 0) - (a.balance ?? 0))
+
+  return (
+    <Flex borderColor="$surface3" borderRadius="$rounded20" borderWidth={1} px="$spacing12" width="100%">
+      <ScrollView bounces={false}>
+        {sortedAddressesByBalance.map(({ address, balance }, index) => (
+          <AssociatedAccountRow
+            address={address}
+            balance={balance}
+            index={index}
+            loading={loading}
+            totalCount={accounts.length}
+          />
+        ))}
+      </ScrollView>
+    </Flex>
+  )
+}
+
+function AssociatedAccountRow({
+  index,
+  address,
+  balance,
+  totalCount,
+  loading,
+}: {
+  index: number
+  address: string
+  balance: number | undefined
+  totalCount: number
+  loading: boolean
+}): JSX.Element {
+  const { convertFiatAmountFormatted } = useLocalizationContext()
+  const balanceFormatted = convertFiatAmountFormatted(balance, NumberType.PortfolioBalance)
+
+  return (
+    <Flex
+      key={address}
+      row
+      alignItems="center"
+      justifyContent="space-between"
+      pb={index !== totalCount - 1 ? '$spacing16' : undefined}
+      px="$spacing4"
+      py="$spacing12"
+    >
+      <Flex shrink>
+        <AddressDisplay address={address} captionVariant="body3" size={iconSizes.icon36} variant="body2" />
+      </Flex>
+      <Text color="$neutral2" loading={loading} numberOfLines={1} variant="body3">
+        {balanceFormatted}
+      </Text>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase.tsx b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase.tsx
new file mode 100644
index 00000000000..654fb831a27
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase.tsx
@@ -0,0 +1,52 @@
+import { Button, Flex, Square, Text } from 'ui/src'
+import { ThemeNames } from 'ui/src/theme'
+
+export type SettingsRecoveryPhraseProps = {
+  title: string
+  subtitle: string
+  icon: React.ReactNode
+  nextButtonEnabled: boolean
+  nextButtonText: string
+  nextButtonTheme: string
+  onNextPressed: () => void
+  children: React.ReactNode
+}
+export function SettingsRecoveryPhrase({
+  title,
+  subtitle,
+  icon,
+  nextButtonEnabled,
+  nextButtonText,
+  nextButtonTheme,
+  onNextPressed,
+  children,
+}: SettingsRecoveryPhraseProps): JSX.Element {
+  return (
+    <Flex grow justifyContent="space-between" p="$spacing4" pt="$spacing24">
+      <Flex alignItems="flex-start" gap="$spacing16">
+        <Square backgroundColor="$DEP_accentCriticalSoft" borderRadius="$rounded8" p="$spacing8">
+          {icon}
+        </Square>
+        <Flex gap="$spacing4" mb="$spacing24">
+          <Text color="$statusCritical" variant="subheading1">
+            {title}
+          </Text>
+          <Text color="$neutral2" variant="body3">
+            {subtitle}
+          </Text>
+        </Flex>
+      </Flex>
+      <Flex grow>{children}</Flex>
+      <Flex>
+        <Button
+          disabled={!nextButtonEnabled}
+          flexGrow={1}
+          theme={nextButtonTheme as ThemeNames}
+          onPress={onNextPressed}
+        >
+          {nextButtonText}
+        </Button>
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/ViewRecoveryPhraseScreen.tsx b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/ViewRecoveryPhraseScreen.tsx
new file mode 100644
index 00000000000..fa1c6d708d8
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsRecoveryPhraseScreen/ViewRecoveryPhraseScreen.tsx
@@ -0,0 +1,246 @@
+import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { LayoutChangeEvent } from 'react-native'
+import { CopyButton } from 'src/app/components/buttons/CopyButton'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { EnterPasswordModal } from 'src/app/features/settings/password/EnterPasswordModal'
+import { SettingsRecoveryPhrase } from 'src/app/features/settings/SettingsRecoveryPhraseScreen/SettingsRecoveryPhrase'
+import { AppRoutes, RemoveRecoveryPhraseRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { Button, Flex, Separator, Text } from 'ui/src'
+import { AlertTriangle, Eye, Key, Laptop } from 'ui/src/components/icons'
+import { spacing } from 'ui/src/theme'
+import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { logger } from 'utilities/src/logger/logger'
+import { useAsyncData } from 'utilities/src/react/hooks'
+import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+
+const enum ViewStep {
+  Warning,
+  Password,
+  Reveal,
+}
+
+export function SettingsViewRecoveryPhraseScreen(): JSX.Element {
+  const { t } = useTranslation()
+
+  const [viewStep, setViewStep] = useState(ViewStep.Warning)
+
+  const mnemonicAccounts = useSignerAccounts()
+  const mnemonicAccount = mnemonicAccounts[0]
+  if (!mnemonicAccount) {
+    throw new Error('Screen should not be accessed unless mnemonic account exists')
+  }
+
+  const placeholderWordArrayLength = 12
+
+  const recoveryPhraseString = useAsyncData(
+    useCallback(async () => Keyring.retrieveMnemonicUnlocked(mnemonicAccount.mnemonicId), [mnemonicAccount.mnemonicId]),
+  ).data
+  const recoveryPhraseArray = recoveryPhraseString?.split(' ') ?? Array(placeholderWordArrayLength).fill('')
+
+  const onCopyPress = async (): Promise<void> => {
+    try {
+      if (recoveryPhraseString) {
+        await setClipboard(recoveryPhraseString)
+      }
+    } catch (error) {
+      logger.error(error, {
+        tags: { file: 'SettingsViewRecoveryPhraseScreen.tsx', function: 'onCopyPress' },
+      })
+    }
+  }
+
+  const showPasswordModal = (): void => {
+    setViewStep(ViewStep.Password)
+  }
+
+  useEffect(() => {
+    sendAnalyticsEvent(WalletEventName.ViewRecoveryPhrase)
+
+    // Clear clipboard when the component unmounts
+    return () => {
+      navigator.clipboard.writeText('').catch((error) => {
+        logger.error(error, {
+          tags: { file: 'SettingsViewRecoveryPhraseScreen.tsx', function: 'maybeClearClipboard' },
+        })
+      })
+    }
+  }, [])
+
+  return (
+    <Flex grow backgroundColor="$surface1">
+      <ScreenHeader title={t('settings.setting.recoveryPhrase.title')} />
+      {viewStep !== ViewStep.Reveal ? (
+        <SettingsRecoveryPhrase
+          icon={<AlertTriangle color="$statusCritical" size="$icon.24" />}
+          nextButtonEnabled={true}
+          nextButtonText={t('common.button.continue')}
+          nextButtonTheme="secondary_Button"
+          subtitle={t('setting.recoveryPhrase.view.warning.message1')}
+          title={t('setting.recoveryPhrase.view.warning.title')}
+          onNextPressed={showPasswordModal}
+        >
+          {viewStep === ViewStep.Password && (
+            <EnterPasswordModal
+              onClose={() => setViewStep(ViewStep.Warning)}
+              onNext={() => setViewStep(ViewStep.Reveal)}
+            />
+          )}
+          <Flex
+            alignItems="flex-start"
+            borderColor="$surface3"
+            borderRadius="$rounded20"
+            borderWidth="$spacing1"
+            gap="$spacing24"
+            p="$spacing12"
+          >
+            <Flex row alignItems="center" gap="$spacing12">
+              <Flex p={6}>
+                <Eye color="$statusCritical" size="$icon.24" />
+              </Flex>
+              <Text textAlign="left" variant="body2">
+                {t('setting.recoveryPhrase.view.warning.message2')}
+              </Text>
+            </Flex>
+            <Flex row alignItems="center" gap="$spacing12" width="100%">
+              <Flex p={6}>
+                <Key color="$statusCritical" size="$icon.24" />
+              </Flex>
+              <Text textAlign="left" variant="body2">
+                {t('setting.recoveryPhrase.view.warning.message3')}
+              </Text>
+            </Flex>
+            <Flex row alignItems="center" gap="$spacing12">
+              <Flex p={6}>
+                <Laptop color="$statusCritical" size="$icon.24" />
+              </Flex>
+              <Text textAlign="left" variant="body2">
+                {t('setting.recoveryPhrase.view.warning.message4')}
+              </Text>
+            </Flex>
+          </Flex>
+        </SettingsRecoveryPhrase>
+      ) : (
+        <Flex fill gap="$spacing24" pt="$spacing36">
+          <Flex
+            backgroundColor="$surface2"
+            borderColor="$surface3"
+            borderRadius="$rounded16"
+            borderWidth={1}
+            gap="$spacing12"
+            width="100%"
+          >
+            <Flex fill row pb="$spacing24" pt="$spacing32" px="$spacing24">
+              <SeedPhraseColumnGroup recoveryPhraseArray={recoveryPhraseArray} />
+            </Flex>
+            <Flex alignItems="center" position="absolute" top={-1 * spacing.spacing16} width="100%">
+              <CopyButton onCopyPress={onCopyPress} />
+            </Flex>
+          </Flex>
+          <Flex alignItems="center" gap="$spacing8">
+            <Text color="$neutral2" textAlign="center" variant="body3">
+              {t('setting.recoveryPhrase.warning.view.message')}
+            </Text>
+          </Flex>
+          <Flex fill justifyContent="flex-end">
+            <Button
+              theme="detrimental"
+              onPress={(): void =>
+                navigate(
+                  `${AppRoutes.Settings}/${SettingsRoutes.RemoveRecoveryPhrase}/${RemoveRecoveryPhraseRoutes.Wallets}`,
+                  { replace: true },
+                )
+              }
+            >
+              {t('setting.recoveryPhrase.remove')}
+            </Button>
+          </Flex>
+        </Flex>
+      )}
+    </Flex>
+  )
+}
+
+function SeedPhraseColumnGroup({ recoveryPhraseArray }: { recoveryPhraseArray: string[] }): JSX.Element {
+  const [largestIndexWidth, setLargestIndexWidth] = useState(0)
+
+  const halfLength = recoveryPhraseArray.length / 2
+  const firstHalfWords = recoveryPhraseArray.slice(0, halfLength)
+  const secondHalfWords = recoveryPhraseArray.slice(halfLength)
+
+  const onIndexLayout = (event: LayoutChangeEvent): void => {
+    const { width } = event.nativeEvent.layout
+    if (width > largestIndexWidth) {
+      setLargestIndexWidth(width)
+    }
+  }
+
+  return (
+    <Flex grow row gap="$spacing16" justifyContent="space-between">
+      <SeedPhraseColumn
+        indexOffset={1}
+        largestIndexWidth={largestIndexWidth}
+        words={firstHalfWords}
+        onIndexLayout={onIndexLayout}
+      />
+      <Separator vertical borderWidth="$spacing1" />
+      <SeedPhraseColumn
+        indexOffset={halfLength + 1}
+        largestIndexWidth={largestIndexWidth}
+        words={secondHalfWords}
+        onIndexLayout={onIndexLayout}
+      />
+    </Flex>
+  )
+}
+
+function SeedPhraseColumn({
+  words,
+  indexOffset,
+  largestIndexWidth,
+  onIndexLayout,
+}: {
+  words: string[]
+  indexOffset: number
+  largestIndexWidth: number
+  onIndexLayout: (event: LayoutChangeEvent) => void
+}): JSX.Element {
+  return (
+    <Flex fill gap="$spacing16">
+      {words.map((word, index) => (
+        <SeedPhraseWord
+          key={index}
+          index={index + indexOffset}
+          indexMinWidth={largestIndexWidth}
+          word={word}
+          onIndexLayout={onIndexLayout}
+        />
+      ))}
+    </Flex>
+  )
+}
+
+function SeedPhraseWord({
+  index,
+  word,
+  indexMinWidth,
+  onIndexLayout,
+}: {
+  index: number
+  word: string
+  indexMinWidth: number
+  onIndexLayout: (event: LayoutChangeEvent) => void
+}): JSX.Element {
+  return (
+    <Flex key={index} row gap="$spacing12">
+      <Text color="$neutral3" minWidth={indexMinWidth} variant="body2" onLayout={onIndexLayout}>
+        {index}
+      </Text>
+      <Text variant="body2">{word}</Text>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsScreen.tsx b/apps/extension/src/app/features/settings/SettingsScreen.tsx
new file mode 100644
index 00000000000..65d3c01317c
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsScreen.tsx
@@ -0,0 +1,284 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Link } from 'react-router-dom'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { SCREEN_ITEM_HORIZONTAL_PAD } from 'src/app/constants'
+import { SettingsItemWithDropdown } from 'src/app/features/settings/SettingsItemWithDropdown'
+import { AppRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { useAppDispatch } from 'src/store/store'
+import {
+  Button,
+  ColorTokens,
+  Flex,
+  GeneratedIcon,
+  ScrollView,
+  Separator,
+  Text,
+  TouchableArea,
+  useSporeColors,
+} from 'ui/src'
+import {
+  Chart,
+  Coins,
+  Feedback,
+  FileListLock,
+  HelpCenter,
+  Key,
+  Language,
+  LineChartDots,
+  Lock,
+  RotatableChevron,
+  Settings,
+  ShieldQuestion,
+} from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { FeatureFlags } from 'uniswap/src/features/gating/flags'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import { isDevEnv } from 'utilities/src/environment'
+import noop from 'utilities/src/react/noop'
+import { WebSwitch } from 'wallet/src/components/buttons/Switch'
+import { SettingsLanguageModal } from 'wallet/src/components/settings/language/SettingsLanguageModal'
+import { authActions } from 'wallet/src/features/auth/saga'
+import { AuthActionType } from 'wallet/src/features/auth/types'
+import { FiatCurrency, ORDERED_CURRENCIES } from 'wallet/src/features/fiatCurrency/constants'
+import { getFiatCurrencyName, useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import { setCurrentFiatCurrency } from 'wallet/src/features/fiatCurrency/slice'
+import { useCurrentLanguageInfo } from 'wallet/src/features/language/hooks'
+import { useHideSmallBalancesSetting, useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
+import { setHideSmallBalances, setHideSpamTokens } from 'wallet/src/features/wallet/slice'
+
+const manifestVersion = chrome.runtime.getManifest().version
+
+export function SettingsScreen(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const { navigateTo, navigateBack } = useExtensionNavigation()
+  const currentLanguageInfo = useCurrentLanguageInfo()
+  const appFiatCurrencyInfo = useAppFiatCurrencyInfo()
+  const isExtensionFeedbackEnabled = useFeatureFlag(FeatureFlags.ExtensionBetaFeedbackPrompt)
+
+  const [isLanguageModalOpen, setIsLanguageModalOpen] = useState(false)
+
+  const onPressLockWallet = async (): Promise<void> => {
+    navigateBack()
+    await dispatch(authActions.trigger({ type: AuthActionType.Lock }))
+  }
+
+  const hideSpamTokens = useHideSpamTokensSetting()
+  const handleSpamTokensToggle = async (): Promise<void> => {
+    await dispatch(setHideSpamTokens(!hideSpamTokens))
+  }
+
+  const hideSmallBalances = useHideSmallBalancesSetting()
+  const handleSmallBalancesToggle = async (): Promise<void> => {
+    await dispatch(setHideSmallBalances(!hideSmallBalances))
+  }
+
+  return (
+    <>
+      {isLanguageModalOpen ? <SettingsLanguageModal onClose={() => setIsLanguageModalOpen(false)} /> : undefined}
+      <Flex fill backgroundColor="$surface1" gap="$spacing8">
+        <ScreenHeader title={t('settings.title')} />
+        <ScrollView showsVerticalScrollIndicator={false}>
+          <SettingsSection title={t('settings.section.preferences')}>
+            <>
+              {isDevEnv() && (
+                <SettingsItem
+                  Icon={Settings}
+                  title="Developer Settings"
+                  onPress={(): void => navigateTo(`${AppRoutes.Settings}/${SettingsRoutes.DevMenu}`)}
+                />
+              )}
+            </>
+            <SettingsItemWithDropdown
+              Icon={Language}
+              disableDropdown={true}
+              items={[]}
+              selected={currentLanguageInfo.displayName}
+              title={t('settings.setting.language.title')}
+              onDisabledDropdownPress={() => {
+                setIsLanguageModalOpen(true)
+              }}
+              onSelect={noop}
+            />
+            <SettingsItemWithDropdown
+              Icon={Coins}
+              items={ORDERED_CURRENCIES.map((currency) => {
+                return {
+                  label: getFiatCurrencyName(t, currency).shortName,
+                  value: currency,
+                }
+              })}
+              selected={appFiatCurrencyInfo.shortName}
+              title={t('settings.setting.currency.title')}
+              onSelect={(value) => {
+                const currency = value as FiatCurrency
+                dispatch(setCurrentFiatCurrency(currency))
+              }}
+            />
+            <SettingsToggleRow
+              Icon={Chart}
+              title={t('settings.setting.smallBalances.title')}
+              value={hideSmallBalances}
+              onValueChange={handleSmallBalancesToggle}
+            />
+            <SettingsToggleRow
+              Icon={ShieldQuestion}
+              title={t('settings.setting.unknownTokens.title')}
+              value={hideSpamTokens}
+              onValueChange={handleSpamTokensToggle}
+            />
+            <SettingsItem
+              Icon={LineChartDots}
+              title={t('settings.setting.privacy.title')}
+              onPress={(): void => navigateTo(`${AppRoutes.Settings}/${SettingsRoutes.Privacy}`)}
+            />
+          </SettingsSection>
+          <SettingsSectionSeparator />
+          <SettingsSection title={t('settings.section.security')}>
+            <SettingsItem
+              Icon={Key}
+              title={t('settings.setting.password.title')}
+              onPress={(): void => navigateTo(`${AppRoutes.Settings}/${SettingsRoutes.ChangePassword}`)}
+            />
+            <SettingsItem
+              Icon={FileListLock}
+              title={t('settings.setting.recoveryPhrase.title')}
+              onPress={(): void => navigateTo(`${AppRoutes.Settings}/${SettingsRoutes.ViewRecoveryPhrase}`)}
+            />
+          </SettingsSection>
+          <SettingsSectionSeparator />
+          <SettingsSection title={t('settings.section.support')}>
+            <SettingsItem
+              Icon={HelpCenter}
+              title={t('settings.setting.helpCenter.title')}
+              url={uniswapUrls.helpArticleUrls.extensionHelp}
+            />
+            {isExtensionFeedbackEnabled ? (
+              <SettingsItem
+                Icon={Feedback}
+                title={t('settings.setting.giveFeedback.title')}
+                url={uniswapUrls.extensionFeedbackFormUrl}
+              />
+            ) : (
+              <></>
+            )}
+            <Text color="$neutral3" px="$spacing12" py="$spacing4" variant="body4">{`Version ${manifestVersion}`}</Text>
+          </SettingsSection>
+        </ScrollView>
+        <Button icon={<Lock />} theme="secondary" onPress={onPressLockWallet}>
+          {t('settings.action.lock')}
+        </Button>
+      </Flex>
+    </>
+  )
+}
+
+function SettingsItem({
+  Icon,
+  title,
+  onPress,
+  iconProps,
+  themeProps,
+  url,
+}: {
+  Icon: GeneratedIcon
+  title: string
+  onPress?: () => void
+  iconProps?: { strokeWidth?: number }
+  // TODO: do this with a wrapping Theme, "detrimental" wasn't working
+  themeProps?: { color?: string; hoverColor?: string }
+  url?: string
+}): JSX.Element {
+  const colors = useSporeColors()
+  const hoverColor = themeProps?.hoverColor ?? colors.surface2.val
+
+  const content = (
+    <TouchableArea
+      alignItems="center"
+      borderRadius="$rounded12"
+      flexDirection="row"
+      flexGrow={1}
+      gap="$spacing16"
+      hoverStyle={{
+        backgroundColor: hoverColor as ColorTokens,
+      }}
+      justifyContent="space-between"
+      px="$spacing12"
+      py="$spacing8"
+      onPress={onPress}
+    >
+      <Flex row gap="$spacing12">
+        <Icon
+          color={themeProps?.color ?? '$neutral2'}
+          size={iconSizes.icon24}
+          strokeWidth={iconProps?.strokeWidth ?? undefined}
+        />
+        <Text style={{ color: themeProps?.color ?? colors.neutral1.val }} variant="subheading2">
+          {title}
+        </Text>
+      </Flex>
+      <RotatableChevron color="$neutral3" direction="end" height={iconSizes.icon20} width={iconSizes.icon20} />
+    </TouchableArea>
+  )
+
+  if (url) {
+    return (
+      <Link style={{ textDecoration: 'none' }} target="_blank" to={url}>
+        {content}
+      </Link>
+    )
+  }
+
+  return content
+}
+
+function SettingsToggleRow({
+  Icon,
+  title,
+  value,
+  onValueChange,
+}: {
+  title: string
+  Icon: GeneratedIcon
+  value: boolean
+  onValueChange: (value: boolean) => void
+}): JSX.Element {
+  return (
+    <Flex
+      alignItems="center"
+      flexDirection="row"
+      gap="$spacing16"
+      justifyContent="space-between"
+      px={SCREEN_ITEM_HORIZONTAL_PAD}
+      py="$spacing4"
+    >
+      <Flex row gap="$spacing12">
+        <Icon color="$neutral2" size={iconSizes.icon24} />
+        <Text>{title}</Text>
+      </Flex>
+      <WebSwitch value={value} onValueChange={onValueChange} />
+    </Flex>
+  )
+}
+
+function SettingsSection({ title, children }: { title: string; children: JSX.Element | JSX.Element[] }): JSX.Element {
+  return (
+    <Flex flexDirection="column" gap="$spacing4">
+      <Text color="$neutral2" px={SCREEN_ITEM_HORIZONTAL_PAD} variant="subheading2">
+        {title}
+      </Text>
+      {children}
+    </Flex>
+  )
+}
+
+function SettingsSectionSeparator(): JSX.Element {
+  return (
+    <Flex mx="$spacing8">
+      <Separator my="$spacing16" width="100%" />
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/SettingsScreenWrapper.tsx b/apps/extension/src/app/features/settings/SettingsScreenWrapper.tsx
new file mode 100644
index 00000000000..eaeb5f208f4
--- /dev/null
+++ b/apps/extension/src/app/features/settings/SettingsScreenWrapper.tsx
@@ -0,0 +1,13 @@
+import { Outlet } from 'react-router-dom'
+import { Flex } from 'ui/src'
+
+/**
+ * SettingsScreenWrapper is a wrapper used by all settings screens.
+ */
+export function SettingsScreenWrapper(): JSX.Element {
+  return (
+    <Flex fill backgroundColor="$surface1" pb="$spacing12" pt="$spacing8" px="$spacing12">
+      <Outlet />
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/password/ChangePasswordForm.tsx b/apps/extension/src/app/features/settings/password/ChangePasswordForm.tsx
new file mode 100644
index 00000000000..f6e0af28254
--- /dev/null
+++ b/apps/extension/src/app/features/settings/password/ChangePasswordForm.tsx
@@ -0,0 +1,75 @@
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { PADDING_STRENGTH_INDICATOR, PasswordInput } from 'src/app/components/PasswordInput'
+import { useAppDispatch } from 'src/store/store'
+import { Button, Flex, Text } from 'ui/src'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { usePasswordForm } from 'wallet/src/utils/password'
+
+export function ChangePasswordForm({ onNext }: { onNext: () => void }): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  const {
+    enableNext,
+    hideInput,
+    debouncedPasswordStrength,
+    password,
+    onPasswordBlur,
+    onChangePassword,
+    confirmPassword,
+    onChangeConfirmPassword,
+    setHideInput,
+    errorText,
+    checkSubmit,
+  } = usePasswordForm()
+
+  const onSubmit = useCallback(async () => {
+    if (checkSubmit()) {
+      await Keyring.changePassword(password)
+      onNext()
+      dispatch(pushNotification({ type: AppNotificationType.PasswordChanged }))
+      sendAnalyticsEvent(ExtensionEventName.PasswordChanged)
+    }
+  }, [checkSubmit, password, onNext, dispatch])
+
+  return (
+    <Flex grow pt="$spacing24">
+      <Flex grow alignItems="center" gap="$spacing16" px="$spacing12">
+        <PasswordInput
+          autoFocus
+          large
+          backgroundColor="$surface2"
+          hideInput={hideInput}
+          passwordStrength={debouncedPasswordStrength}
+          placeholder={t('common.input.password.new')}
+          pr={PADDING_STRENGTH_INDICATOR}
+          value={password}
+          onBlur={onPasswordBlur}
+          onChangeText={onChangePassword}
+        />
+        <PasswordInput
+          large
+          backgroundColor="$surface2"
+          hideInput={hideInput}
+          placeholder={t('common.input.password.confirm')}
+          pr="$spacing48"
+          value={confirmPassword}
+          onChangeText={onChangeConfirmPassword}
+          onSubmitEditing={onSubmit}
+          onToggleHideInput={setHideInput}
+        />
+        <Text color="$statusCritical" opacity={errorText ? 1 : 0} textAlign="center" variant="body2">
+          {errorText || 'Placeholder text'}
+        </Text>
+      </Flex>
+      <Button disabled={!enableNext} theme="tertiary" onPress={onSubmit}>
+        {t('common.button.save')}
+      </Button>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/password/EnterPasswordForm.tsx b/apps/extension/src/app/features/settings/password/EnterPasswordForm.tsx
new file mode 100644
index 00000000000..bb83e733f23
--- /dev/null
+++ b/apps/extension/src/app/features/settings/password/EnterPasswordForm.tsx
@@ -0,0 +1,80 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { PasswordInput } from 'src/app/components/PasswordInput'
+import { Button, Flex, Text } from 'ui/src'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+
+function useEnterPasswordForm(): {
+  password: string
+  submitEnabled: boolean
+  error: string
+  onInputChange: (input: string) => void
+  onSubmit: () => Promise<boolean>
+} {
+  const { t } = useTranslation()
+  const [password, setPassword] = useState('')
+  const [submitEnabled, setSubmitEnabled] = useState(false)
+  const [error, setError] = useState('')
+
+  const onInputChange = function onInputChange(input: string): void {
+    setPassword(input)
+    setSubmitEnabled(!!input)
+    setError('')
+  }
+
+  const onSubmit = async function onSubmit(): Promise<boolean> {
+    const success = await Keyring.checkPassword(password)
+    if (!success) {
+      setError(t('extension.settings.password.error.wrong'))
+    }
+    return success
+  }
+
+  return {
+    password,
+    submitEnabled,
+    error,
+    onInputChange,
+    onSubmit,
+  }
+}
+
+export function EnterPasswordForm({ onNext }: { onNext: () => void }): JSX.Element {
+  const { t } = useTranslation()
+  const [hideInput, setHideInput] = useState(true)
+  const { password, submitEnabled, error, onInputChange, onSubmit } = useEnterPasswordForm()
+
+  const onContinue = async (): Promise<void> => {
+    const success = await onSubmit()
+    if (success) {
+      onNext()
+    }
+  }
+
+  return (
+    <Flex grow>
+      <Flex grow alignItems="center" gap="$spacing8" px="$spacing12">
+        <Text color="$neutral2" pb="$spacing8" pt="$spacing32" variant="body2">
+          {t('extension.settings.password.enter.title')}
+        </Text>
+        <PasswordInput
+          autoFocus
+          hideInput={hideInput}
+          placeholder={t('extension.settings.password.placeholder')}
+          value={password}
+          onChangeText={onInputChange}
+          onSubmitEditing={onContinue}
+          onToggleHideInput={setHideInput}
+        />
+        {error && (
+          <Text color="$statusCritical" variant="body3">
+            {error}
+          </Text>
+        )}
+      </Flex>
+      <Button disabled={!submitEnabled} theme="tertiary" onPress={onContinue}>
+        {t('common.button.continue')}
+      </Button>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/password/EnterPasswordModal.tsx b/apps/extension/src/app/features/settings/password/EnterPasswordModal.tsx
new file mode 100644
index 00000000000..de9c21fbf3a
--- /dev/null
+++ b/apps/extension/src/app/features/settings/password/EnterPasswordModal.tsx
@@ -0,0 +1,69 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { PasswordInput } from 'src/app/components/PasswordInput'
+import { Button, Flex, Square, Text, inputStyles, useSporeColors } from 'ui/src'
+import { Lock } from 'ui/src/components/icons'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+
+export function EnterPasswordModal({ onNext, onClose }: { onNext: () => void; onClose: () => void }): JSX.Element {
+  const { t } = useTranslation()
+  const colors = useSporeColors()
+
+  const [password, setPassword] = useState('')
+  const [showPasswordError, setShowPasswordError] = useState(false)
+  const [hideInput, setHideInput] = useState(true)
+
+  const onChangeText = (text: string): void => {
+    setPassword(text)
+    setShowPasswordError(false)
+  }
+
+  const checkPassword = async (): Promise<void> => {
+    const success = await Keyring.checkPassword(password)
+    if (!success) {
+      setShowPasswordError(true)
+      return
+    }
+    onNext()
+  }
+
+  return (
+    <BottomSheetModal
+      alignment="center"
+      backgroundColor={colors.surface1.get()}
+      hideHandlebar={true}
+      isDismissible={true}
+      name={ModalName.EnterPassword}
+      onClose={onClose}
+    >
+      <Flex centered gap="$spacing12" pt="$spacing20">
+        <Square backgroundColor="$surface2" borderRadius="$rounded12" size="$spacing48">
+          <Lock color="$neutral1" size="$icon.24" />
+        </Square>
+        <Text py="$spacing4" textAlign="center" variant="subheading2">
+          {t('settings.setting.recoveryPhrase.password.title')}
+        </Text>
+        <PasswordInput
+          autoFocus
+          backgroundColor={showPasswordError ? '$DEP_accentCriticalSoft' : '$surface1'}
+          focusStyle={inputStyles.inputFocus}
+          hideInput={hideInput}
+          placeholder={t('common.input.password.placeholder')}
+          value={password}
+          onChangeText={onChangeText}
+          onSubmitEditing={checkPassword}
+          onToggleHideInput={setHideInput}
+          {...(showPasswordError && { borderColor: '$statusCritical' })}
+        />
+        <Text color="$statusCritical" minHeight="$spacing24" textAlign="center" variant="body2">
+          {showPasswordError ? t('setting.recoveryPhrase.remove.password.error') : ''}
+        </Text>
+        <Button disabled={!password.length} theme="secondary" width="100%" onPress={checkPassword}>
+          {t('common.button.continue')}
+        </Button>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
diff --git a/apps/extension/src/app/features/settings/password/SettingsChangePasswordScreen.tsx b/apps/extension/src/app/features/settings/password/SettingsChangePasswordScreen.tsx
new file mode 100644
index 00000000000..67ca27a0306
--- /dev/null
+++ b/apps/extension/src/app/features/settings/password/SettingsChangePasswordScreen.tsx
@@ -0,0 +1,34 @@
+import { t } from 'i18next'
+import { useState } from 'react'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { ChangePasswordForm } from 'src/app/features/settings/password/ChangePasswordForm'
+import { EnterPasswordForm } from 'src/app/features/settings/password/EnterPasswordForm'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex } from 'ui/src'
+
+enum Step {
+  EnterPassword,
+  ChangePassword,
+}
+
+export function SettingsChangePasswordScreen(): JSX.Element {
+  const [currentStep, setCurrentStep] = useState(Step.EnterPassword)
+  const { navigateBack } = useExtensionNavigation()
+
+  let formContent
+  switch (currentStep) {
+    case Step.EnterPassword:
+      formContent = <EnterPasswordForm onNext={(): void => setCurrentStep(Step.ChangePassword)} />
+      break
+    case Step.ChangePassword:
+      formContent = <ChangePasswordForm onNext={(): void => navigateBack()} />
+      break
+  }
+
+  return (
+    <Flex grow backgroundColor="$surface1" gap="$none">
+      <ScreenHeader title={t('settings.setting.password.title')} />
+      {formContent}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/swap/SwapFlowScreen.tsx b/apps/extension/src/app/features/swap/SwapFlowScreen.tsx
new file mode 100644
index 00000000000..a1cee3a6d50
--- /dev/null
+++ b/apps/extension/src/app/features/swap/SwapFlowScreen.tsx
@@ -0,0 +1,16 @@
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex } from 'ui/src'
+import { SwapFlow } from 'wallet/src/features/transactions/swap/SwapFlow'
+import { useSwapPrefilledState } from 'wallet/src/features/transactions/swap/hooks/useSwapPrefilledState'
+
+export function SwapFlowScreen(): JSX.Element {
+  const { navigateBack, locationState } = useExtensionNavigation()
+
+  const swapPrefilledState = useSwapPrefilledState(locationState?.initialTransactionState)
+
+  return (
+    <Flex fill p="$spacing12">
+      <SwapFlow prefilledState={swapPrefilledState} walletNeedsRestore={false} onClose={navigateBack} />
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendFormScreen/AmountSelector.tsx b/apps/extension/src/app/features/transfer/SendFormScreen/AmountSelector.tsx
new file mode 100644
index 00000000000..f1b1bef06f8
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendFormScreen/AmountSelector.tsx
@@ -0,0 +1,3 @@
+export function AmountSelector(): JSX.Element {
+  return <>Amount Input + Quick Chips</>
+}
diff --git a/apps/extension/src/app/features/transfer/SendFormScreen/GasFeeRow.tsx b/apps/extension/src/app/features/transfer/SendFormScreen/GasFeeRow.tsx
new file mode 100644
index 00000000000..a885d265afe
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendFormScreen/GasFeeRow.tsx
@@ -0,0 +1,55 @@
+import { t } from 'i18next'
+import { FadeIn } from 'react-native-reanimated'
+import { Flex, SpinningLoader, Text } from 'ui/src'
+import { Gas } from 'ui/src/components/icons'
+import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
+import { iconSizes } from 'ui/src/theme'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { NumberType } from 'utilities/src/format/types'
+import { useUSDValue } from 'wallet/src/features/gas/hooks'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { NetworkFeeWarning } from 'wallet/src/features/transactions/swap/modals/NetworkFeeWarning'
+
+type GasFeeRowProps = {
+  gasFee: GasFeeResult
+  chainId: WalletChainId
+}
+
+export function GasFeeRow({ gasFee, chainId }: GasFeeRowProps): JSX.Element | null {
+  const { convertFiatAmountFormatted } = useLocalizationContext()
+
+  const gasFeeUSD = useUSDValue(chainId, gasFee.value ?? undefined)
+  const gasFeeFormatted = convertFiatAmountFormatted(gasFeeUSD, NumberType.FiatTokenPrice)
+
+  if (!gasFeeUSD) {
+    return null
+  }
+
+  return (
+    <Flex centered row justifyContent="space-between" px="$spacing8">
+      <Text color="$neutral2" flexShrink={1} variant="body3">
+        {t('send.gas.networkCost.title')}
+      </Text>
+      {gasFee.loading ? (
+        <SpinningLoader size={iconSizes.icon16} />
+      ) : gasFee.error ? (
+        <Text color="$neutral2" variant="body3">
+          {t('send.gas.error.title')}
+        </Text>
+      ) : (
+        <NetworkFeeWarning
+          placement="bottom"
+          tooltipTrigger={
+            <AnimatedFlex centered row entering={FadeIn} gap="$spacing4">
+              <Text color="$neutral2" variant="body3">
+                {gasFeeFormatted}
+              </Text>
+              <Gas color="$neutral2" size="$icon.16" />
+            </AnimatedFlex>
+          }
+        />
+      )}
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendFormScreen/RecipientPanel.tsx b/apps/extension/src/app/features/transfer/SendFormScreen/RecipientPanel.tsx
new file mode 100644
index 00000000000..f486c1a0ee7
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendFormScreen/RecipientPanel.tsx
@@ -0,0 +1,106 @@
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useTransferContext } from 'src/app/features/transfer/TransferContext'
+import { Flex, Separator, Text, TouchableArea } from 'ui/src'
+import { RotatableChevron, WalletFilled } from 'ui/src/components/icons'
+import { iconSizes, spacing } from 'ui/src/theme'
+import { RecipientList } from 'wallet/src/components/RecipientSearch/RecipientList'
+import { useFilteredRecipientSections } from 'wallet/src/components/RecipientSearch/hooks'
+import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
+import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
+import { selectRecipient } from 'wallet/src/features/transactions/transactionState/transactionState'
+import {
+  useOnToggleShowRecipientSelector,
+  useSetShowRecipientSelector,
+} from 'wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector'
+
+export function RecipientPanel(): JSX.Element {
+  const { t } = useTranslation()
+
+  const [pattern, setPattern] = useState('')
+  const { recipient, dispatch, showRecipientSelector } = useTransferContext()
+  const onToggleShowRecipientSelector = useOnToggleShowRecipientSelector(dispatch)
+  const setShowRecipientSelector = useSetShowRecipientSelector(dispatch)
+  const sections = useFilteredRecipientSections(pattern)
+
+  const onSelectRecipient = useCallback(
+    (newRecipient: string) => {
+      dispatch(selectRecipient({ recipient: newRecipient }))
+      setShowRecipientSelector(false)
+    },
+    [dispatch, setShowRecipientSelector],
+  )
+
+  const onClose = (): void => {
+    setShowRecipientSelector(false)
+  }
+
+  const noPatternOrFavorites = !pattern && sections.length === 0
+
+  return showRecipientSelector || !recipient ? (
+    <Flex gap="$spacing12">
+      <Flex gap="$none">
+        <Text color="$neutral2" variant="body3">
+          {t('common.text.recipient')}
+        </Text>
+        <Flex centered row pb="$spacing4">
+          <Flex grow>
+            <SearchTextInput
+              autoFocus={showRecipientSelector || !recipient} // Only auto focus if panel is expanded
+              backgroundColor="transparent"
+              hideIcon={true}
+              minHeight={spacing.spacing36}
+              placeholder={t('send.search.placeholder')}
+              px="$none"
+              py="$none"
+              value={pattern ?? ''}
+              onChangeText={setPattern}
+              onFocus={() => setShowRecipientSelector(true)}
+            />
+          </Flex>
+          {showRecipientSelector && (
+            <TouchableArea onPress={onClose}>
+              <RotatableChevron
+                color="$neutral3"
+                direction="up"
+                flexShrink={1}
+                height={iconSizes.icon20}
+                width={iconSizes.icon20}
+              />
+            </TouchableArea>
+          )}
+        </Flex>
+        {showRecipientSelector && <Separator />}
+      </Flex>
+      {showRecipientSelector &&
+        (noPatternOrFavorites ? (
+          <Flex centered gap="$spacing12" mt="$spacing48" px="$spacing12">
+            <WalletFilled color="$neutral3" size="$icon.40" />
+            <Flex centered gap="$spacing8">
+              <Text variant="subheading2">{t('send.recipientSelect.search.empty.title')}</Text>
+              <Text color="$neutral3" textAlign="center" variant="body3">
+                {t('send.recipientSelect.search.empty.message')}
+              </Text>
+            </Flex>
+          </Flex>
+        ) : !sections.length ? (
+          <Flex centered gap="$spacing12" mt="$spacing24" px="$spacing24">
+            <Text variant="buttonLabel2">{t('send.search.empty.title')}</Text>
+            <Text color="$neutral3" textAlign="center" variant="body1">
+              {t('send.search.empty.subtitle')}
+            </Text>
+          </Flex>
+        ) : (
+          // Show either suggested recipients or filtered sections based on query
+          <RecipientList sections={sections} onPress={onSelectRecipient} />
+        ))}
+    </Flex>
+  ) : (
+    <TouchableArea onPress={onToggleShowRecipientSelector}>
+      <Flex centered row justifyContent="space-between">
+        <AddressDisplay address={recipient} size={iconSizes.icon36} />
+        <RotatableChevron color="$neutral3" direction="down" height={iconSizes.icon20} width={iconSizes.icon20} />
+      </Flex>
+    </TouchableArea>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendFormScreen/ReviewButton.tsx b/apps/extension/src/app/features/transfer/SendFormScreen/ReviewButton.tsx
new file mode 100644
index 00000000000..e609f9f9779
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendFormScreen/ReviewButton.tsx
@@ -0,0 +1,52 @@
+import { useTranslation } from 'react-i18next'
+import { useTransferContext } from 'src/app/features/transfer/TransferContext'
+import { Button, Flex, Text, isWeb } from 'ui/src'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ElementName } from 'uniswap/src/features/telemetry/constants'
+import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
+import { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
+
+type ReviewButtonProps = {
+  onPress: () => void
+  disabled?: boolean
+}
+
+export function ReviewButton({ onPress, disabled }: ReviewButtonProps): JSX.Element {
+  const { t } = useTranslation()
+
+  const {
+    warnings,
+    derivedTransferInfo: { chainId },
+  } = useTransferContext()
+
+  const nativeCurrencySymbol = NativeCurrency.onChain(chainId).symbol
+
+  const insufficientGasFunds = warnings.warnings.some((warning) => warning.type === WarningLabel.InsufficientGasFunds)
+
+  const disableReviewButton = !!warnings.blockingWarning || disabled
+
+  const buttonText = insufficientGasFunds
+    ? t('send.warning.insufficientFunds.title', {
+        currencySymbol: nativeCurrencySymbol,
+      })
+    : t('common.button.review')
+
+  return (
+    <Flex gap="$spacing16">
+      <Trace logPress element={ElementName.SendReview}>
+        <Button
+          backgroundColor="$accent1"
+          disabled={disableReviewButton}
+          size={isWeb ? 'medium' : 'large'}
+          testID={TestID.SendReview}
+          onPress={onPress}
+        >
+          <Text color="white" variant="buttonLabel1">
+            {buttonText}
+          </Text>
+        </Button>
+      </Trace>
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendFormScreen/SendFormScreen.tsx b/apps/extension/src/app/features/transfer/SendFormScreen/SendFormScreen.tsx
new file mode 100644
index 00000000000..0a93dd7a5cd
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendFormScreen/SendFormScreen.tsx
@@ -0,0 +1,186 @@
+import { useCallback, useState } from 'react'
+import { GasFeeRow } from 'src/app/features/transfer/SendFormScreen/GasFeeRow'
+import { RecipientPanel } from 'src/app/features/transfer/SendFormScreen/RecipientPanel'
+import { ReviewButton } from 'src/app/features/transfer/SendFormScreen/ReviewButton'
+import { SendReviewScreen } from 'src/app/features/transfer/SendReviewScreen/SendReviewScreen'
+import { TransferScreen, useTransferContext } from 'src/app/features/transfer/TransferContext'
+import { Flex, Separator, useSporeColors } from 'ui/src'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ModalName, SectionName } from 'uniswap/src/features/telemetry/constants'
+import { InsufficientNativeTokenWarning } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning'
+import { useTokenFormActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenFormActionHandlers'
+import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
+import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { useUSDTokenUpdater } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDTokenUpdater'
+import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { TokenSelectorPanel } from 'wallet/src/features/transactions/transfer/TokenSelectorPanel'
+import { TransferAmountInput } from 'wallet/src/features/transactions/transfer/TransferAmountInput'
+import { TransferFormSpeedbumps } from 'wallet/src/features/transactions/transfer/TransferFormWarnings'
+import { useShowSendNetworkNotification } from 'wallet/src/features/transactions/transfer/hooks/useShowSendNetworkNotification'
+import { TokenSelectorFlow, TransferSpeedbump } from 'wallet/src/features/transactions/transfer/types'
+import { createTransactionId } from 'wallet/src/features/transactions/utils'
+import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
+import { useIsBlocked, useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
+
+export function SendFormScreen(): JSX.Element {
+  const colors = useSporeColors()
+  const {
+    dispatch,
+    derivedTransferInfo,
+    selectingCurrencyField,
+    exactAmountToken,
+    exactAmountFiat,
+    isFiatInput,
+    warnings,
+    gasFee,
+    showRecipientSelector,
+    screen,
+    setScreen,
+    recipient,
+  } = useTransferContext()
+
+  const { currencyInInfo, currencyBalances, currencyAmounts, chainId } = derivedTransferInfo
+
+  useShowSendNetworkNotification({ chainId: currencyInInfo?.currency.chainId })
+
+  const { onSetExactAmount, onSetMax, onToggleFiatInput } = useTokenFormActionHandlers(dispatch)
+  const { onSelectCurrency, onHideTokenSelector, onShowTokenSelector } = useTokenSelectorActionHandlers(
+    dispatch,
+    TokenSelectorFlow.Transfer,
+  )
+
+  const currencyUSDValue = useUSDCValue(currencyAmounts[CurrencyField.INPUT])
+
+  // Sync fiat and token amounts
+  useUSDTokenUpdater(dispatch, Boolean(isFiatInput), exactAmountToken, exactAmountFiat ?? '', currencyInInfo?.currency)
+
+  const exactValue = isFiatInput ? exactAmountFiat : exactAmountToken
+
+  const showTokenSelector = selectingCurrencyField === CurrencyField.INPUT
+
+  // warnings
+  const [showSpeedbumpModal, setShowSpeedbumpModal] = useState(false)
+  const [transferSpeedbump, setTransferSpeedbump] = useState<TransferSpeedbump>({
+    loading: true,
+    hasWarning: false,
+  })
+
+  // blocked addresses
+  const { isBlocked: isActiveBlocked, isBlockedLoading: isActiveBlockedLoading } = useIsBlockedActiveAddress()
+  const { isBlocked: isRecipientBlocked, isBlockedLoading: isRecipientBlockedLoading } = useIsBlocked(recipient)
+  const isBlocked = isActiveBlocked || isRecipientBlocked
+  const isBlockedLoading = isActiveBlockedLoading || isRecipientBlockedLoading
+
+  const onShowReviewScreen = useCallback(() => {
+    setShowSpeedbumpModal(false)
+    const txId = createTransactionId()
+    dispatch(transactionStateActions.setTxId(txId))
+    setScreen(TransferScreen.SendReview)
+  }, [dispatch, setScreen])
+
+  const onPressReview = useCallback(() => {
+    if (transferSpeedbump.hasWarning) {
+      setShowSpeedbumpModal(true)
+    } else {
+      onShowReviewScreen()
+    }
+  }, [onShowReviewScreen, transferSpeedbump.hasWarning])
+
+  const inputShadowProps = {
+    shadowColor: colors.surface3.val,
+    shadowRadius: 10,
+    shadowOpacity: 0.04,
+    zIndex: 1,
+  }
+
+  return (
+    <Trace logImpression section={SectionName.TransferForm}>
+      {screen === TransferScreen.SendReview && (
+        <BottomSheetModal alignment="top" name={ModalName.SendReview}>
+          <SendReviewScreen />
+        </BottomSheetModal>
+      )}
+      <TransferFormSpeedbumps
+        chainId={chainId}
+        recipient={recipient}
+        setShowSpeedbumpModal={setShowSpeedbumpModal}
+        setTransferSpeedbump={setTransferSpeedbump}
+        showSpeedbumpModal={showSpeedbumpModal}
+        onNext={onShowReviewScreen}
+      />
+      <Flex fill gap="$spacing12">
+        <Flex
+          borderColor="$surface3"
+          borderRadius="$rounded20"
+          borderWidth="$spacing1"
+          flexGrow={showTokenSelector ? 1 : 0}
+          overflow="hidden"
+          {...inputShadowProps}
+        >
+          <TokenSelectorPanel
+            currencyAmount={currencyAmounts[CurrencyField.INPUT]}
+            currencyBalance={currencyBalances[CurrencyField.INPUT]}
+            currencyInfo={currencyInInfo}
+            showTokenSelector={showTokenSelector}
+            onHideTokenSelector={onHideTokenSelector}
+            onSelectCurrency={onSelectCurrency}
+            onSetMax={onSetMax}
+            onShowTokenSelector={() => onShowTokenSelector(CurrencyField.INPUT)}
+          />
+          {!showTokenSelector && (
+            <>
+              <Separator />
+              <TransferAmountInput
+                currencyAmount={currencyAmounts[CurrencyField.INPUT]}
+                currencyInfo={currencyInInfo}
+                isFiatInput={Boolean(isFiatInput)}
+                py="$spacing48"
+                usdValue={currencyUSDValue}
+                value={exactValue}
+                warnings={warnings}
+                onSetExactAmount={onSetExactAmount}
+                onToggleIsFiatMode={onToggleFiatInput}
+              />
+            </>
+          )}
+        </Flex>
+        {!showTokenSelector && (
+          <>
+            <Flex
+              borderColor="$surface3"
+              borderRadius="$rounded20"
+              borderWidth="$spacing1"
+              flexGrow={showRecipientSelector ? 1 : 0}
+              overflow="hidden"
+              px="$spacing16"
+              py="$spacing12"
+              {...inputShadowProps}
+            >
+              <RecipientPanel />
+            </Flex>
+            {!showRecipientSelector && (
+              <>
+                {isBlocked && (
+                  <BlockedAddressWarning
+                    row
+                    alignItems="center"
+                    backgroundColor="$surface2"
+                    borderRadius="$rounded16"
+                    isRecipientBlocked={isRecipientBlocked}
+                    px="$spacing16"
+                    py="$spacing12"
+                  />
+                )}
+                <ReviewButton disabled={isBlocked || isBlockedLoading} onPress={onPressReview} />
+                <GasFeeRow chainId={chainId} gasFee={gasFee} />
+                <InsufficientNativeTokenWarning flow="send" gasFee={gasFee} warnings={warnings.warnings} />
+              </>
+            )}
+          </>
+        )}
+      </Flex>
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendReviewScreen/SendDetails.tsx b/apps/extension/src/app/features/transfer/SendReviewScreen/SendDetails.tsx
new file mode 100644
index 00000000000..00aa11f426b
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendReviewScreen/SendDetails.tsx
@@ -0,0 +1,198 @@
+import { providers } from 'ethers'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Button, Flex, Separator, Text, useSporeColors } from 'ui/src'
+import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
+import { iconSizes } from 'ui/src/theme'
+import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
+import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
+import { NumberType } from 'utilities/src/format/types'
+import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
+import { Arrow } from 'wallet/src/components/icons/Arrow'
+import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { NFTTransfer } from 'wallet/src/components/nfts/NFTTransfer'
+import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { TransactionDetails } from 'wallet/src/features/transactions/TransactionDetails/TransactionDetails'
+import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
+import { ParsedWarnings } from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
+import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
+import { AccountType } from 'wallet/src/features/wallet/accounts/types'
+import { useActiveAccountWithThrow, useAvatar } from 'wallet/src/features/wallet/hooks'
+
+interface TransferFormProps {
+  derivedTransferInfo: DerivedTransferInfo
+  txRequest?: providers.TransactionRequest
+  gasFee: GasFeeResult
+  onReviewSubmit: () => void
+  warnings: ParsedWarnings
+}
+
+/**
+ * TODO: MOB-2563 https://linear.app/uniswap/issue/MOB-2563/consolidate-all-transfer-logic-ext-mob
+ * Re-use this component when implemting shared review UI on mobile, and move to shared package.
+ */
+export function SendDetails({
+  derivedTransferInfo,
+  gasFee,
+  onReviewSubmit,
+  txRequest,
+  warnings,
+}: TransferFormProps): JSX.Element | null {
+  const { t } = useTranslation()
+  const { fullHeight } = useDeviceDimensions()
+  const colors = useSporeColors()
+
+  const { formatCurrencyAmount, formatNumberOrString, convertFiatAmountFormatted } = useLocalizationContext()
+
+  const account = useActiveAccountWithThrow()
+
+  const [showWarningModal, setShowWarningModal] = useState(false)
+  const currency = useAppFiatCurrencyInfo()
+
+  const onShowWarning = (): void => {
+    setShowWarningModal(true)
+  }
+
+  const onCloseWarning = (): void => {
+    setShowWarningModal(false)
+  }
+
+  const {
+    currencyAmounts,
+    recipient,
+    isFiatInput = false,
+    currencyInInfo,
+    nftIn,
+    chainId,
+    exactAmountFiat,
+  } = derivedTransferInfo
+
+  const { avatar } = useAvatar(recipient)
+
+  const inputCurrencyUSDValue = useUSDCValue(currencyAmounts[CurrencyField.INPUT])
+
+  const { blockingWarning } = warnings
+
+  const actionButtonDisabled =
+    !!blockingWarning || !gasFee.value || !!gasFee.error || !txRequest || account.type === AccountType.Readonly
+
+  const actionButtonProps = {
+    disabled: actionButtonDisabled,
+    label: t('send.review.summary.button.title'),
+    name: ElementName.Send,
+    onPress: onReviewSubmit,
+  }
+
+  const transferWarning = warnings.warnings.find((warning) => warning.severity >= WarningSeverity.Medium)
+
+  const formattedCurrencyAmount = formatCurrencyAmount({
+    value: currencyAmounts[CurrencyField.INPUT],
+    type: NumberType.TokenTx,
+  })
+  const formattedAmountIn = isFiatInput
+    ? formatNumberOrString({
+        value: exactAmountFiat,
+        type: NumberType.FiatTokenQuantity,
+        currencyCode: currency.code,
+      })
+    : formattedCurrencyAmount
+
+  const formattedInputFiatValue = convertFiatAmountFormatted(
+    inputCurrencyUSDValue?.toExact(),
+    NumberType.FiatTokenQuantity,
+  )
+
+  if (!recipient) {
+    throw new Error('Invalid render of SendDetails with no recipient')
+  }
+
+  return (
+    <>
+      {showWarningModal && transferWarning?.title && (
+        <WarningModal
+          caption={transferWarning.message}
+          closeText={blockingWarning ? undefined : t('send.warning.modal.button.cta.cancel')}
+          confirmText={
+            blockingWarning ? t('send.warning.modal.button.cta.blocking') : t('send.warning.modal.button.cta.confirm')
+          }
+          modalName={ModalName.SendWarning}
+          severity={transferWarning.severity}
+          title={transferWarning.title}
+          onCancel={onCloseWarning}
+          onClose={onCloseWarning}
+          onConfirm={onCloseWarning}
+        />
+      )}
+      <Flex gap="$spacing16" px="$spacing8">
+        {currencyInInfo ? (
+          <Flex row alignItems="center">
+            <Flex fill>
+              <Flex centered row justifyContent="space-between">
+                <Text color="$neutral1" variant="heading3">
+                  {formattedAmountIn} {!isFiatInput ? currencyInInfo.currency.symbol : ''}
+                </Text>
+              </Flex>
+              {isFiatInput ? (
+                <Text color="$neutral2" variant="body3">
+                  {formattedCurrencyAmount} {currencyInInfo.currency.symbol}
+                </Text>
+              ) : (
+                inputCurrencyUSDValue && (
+                  <Text color="$neutral2" variant="body3">
+                    {formattedInputFiatValue}
+                  </Text>
+                )
+              )}
+            </Flex>
+            <CurrencyLogo currencyInfo={currencyInInfo} size={iconSizes.icon36} />
+          </Flex>
+        ) : (
+          nftIn && (
+            <Flex mt="$spacing60">
+              <NFTTransfer asset={nftIn} nftSize={fullHeight / 5} />
+            </Flex>
+          )
+        )}
+        <Flex alignItems="flex-start">
+          <Arrow color={colors.neutral3.val} direction="s" />
+        </Flex>
+        {recipient && (
+          <Flex centered row justifyContent="space-between">
+            <AddressDisplay
+              address={recipient}
+              captionVariant="body3"
+              showAccountIcon={false}
+              textAlign="flex-start"
+              variant="heading3"
+            />
+            <AccountIcon address={recipient} avatarUri={avatar} size={iconSizes.icon36} />
+          </Flex>
+        )}
+      </Flex>
+      <Separator backgroundColor="$surface3" mx="$spacing8" my="$spacing16" />
+      <Flex pb="$spacing16">
+        <TransactionDetails
+          chainId={chainId}
+          gasFee={gasFee}
+          showWarning={Boolean(transferWarning)}
+          warning={transferWarning}
+          onShowWarning={onShowWarning}
+        />
+      </Flex>
+      <Button
+        fill
+        disabled={actionButtonProps.disabled}
+        size="medium"
+        testID={actionButtonProps.name}
+        onPress={actionButtonProps.onPress}
+      >
+        {actionButtonProps.label}
+      </Button>
+    </>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/SendReviewScreen/SendReviewScreen.tsx b/apps/extension/src/app/features/transfer/SendReviewScreen/SendReviewScreen.tsx
new file mode 100644
index 00000000000..7fe565e97bb
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/SendReviewScreen/SendReviewScreen.tsx
@@ -0,0 +1,107 @@
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useDispatch } from 'react-redux'
+import { SendDetails } from 'src/app/features/transfer/SendReviewScreen/SendDetails'
+import { TransferScreen, useTransferContext } from 'src/app/features/transfer/TransferContext'
+import { Flex, Text, TouchableArea } from 'ui/src'
+import { X } from 'ui/src/components/icons'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { SectionName } from 'uniswap/src/features/telemetry/constants'
+import { currencyAddress } from 'uniswap/src/utils/currencyId'
+import { logger } from 'utilities/src/logger/logger'
+import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import {
+  useTransferERC20Callback,
+  useTransferNFTCallback,
+} from 'wallet/src/features/transactions/transfer/hooks/useTransferCallback'
+
+export function SendReviewScreen(): JSX.Element {
+  const dispatch = useDispatch()
+  const { t } = useTranslation()
+
+  const { navigateToAccountActivityList } = useWalletNavigation()
+
+  const { derivedTransferInfo, warnings, txRequest, gasFee, setScreen } = useTransferContext()
+  const { txId, chainId, recipient, currencyInInfo, currencyAmounts, nftIn } = derivedTransferInfo
+
+  const triggerTransferPendingNotification = useCallback(() => {
+    if (!currencyInInfo) {
+      // This should never happen. Just keeping TS happy.
+      logger.error(new Error('Missing `currencyInInfo` when triggering transfer pending notification'), {
+        tags: { file: 'SendReviewScreen.tsx', function: 'triggerTransferPendingNotification' },
+      })
+    } else {
+      dispatch(
+        pushNotification({
+          type: AppNotificationType.TransferCurrencyPending,
+          currencyInfo: currencyInInfo,
+        }),
+      )
+    }
+  }, [currencyInInfo, dispatch])
+
+  const onNext = useCallback((): void => {
+    triggerTransferPendingNotification()
+    navigateToAccountActivityList()
+  }, [navigateToAccountActivityList, triggerTransferPendingNotification])
+
+  const transferERC20Callback = useTransferERC20Callback(
+    txId,
+    chainId,
+    recipient,
+    currencyInInfo ? currencyAddress(currencyInInfo.currency) : undefined,
+    currencyAmounts[CurrencyField.INPUT]?.quotient.toString(),
+    txRequest,
+    onNext,
+  )
+
+  const transferNFTCallback = useTransferNFTCallback(
+    txId,
+    chainId,
+    recipient,
+    nftIn?.nftContract?.address,
+    nftIn?.tokenId,
+    txRequest,
+    onNext,
+  )
+
+  const onTransfer = (): void => {
+    nftIn ? transferNFTCallback?.() : transferERC20Callback?.()
+  }
+
+  const onPrev = (): void => {
+    setScreen(TransferScreen.SendForm)
+  }
+
+  return (
+    <Trace logImpression section={SectionName.TransferReview}>
+      <Flex
+        centered
+        fill
+        row
+        alignItems="center"
+        justifyContent="space-between"
+        pb="$spacing12"
+        pt="$spacing8"
+        px="$spacing8"
+      >
+        <Text color="$neutral2" variant="body2">
+          {t('send.review.modal.title')}
+        </Text>
+        <TouchableArea onPress={onPrev}>
+          <X color="$neutral2" size="$icon.20" />
+        </TouchableArea>
+      </Flex>
+      <SendDetails
+        derivedTransferInfo={derivedTransferInfo}
+        gasFee={gasFee}
+        txRequest={txRequest}
+        warnings={warnings}
+        onReviewSubmit={onTransfer}
+      />
+    </Trace>
+  )
+}
diff --git a/apps/extension/src/app/features/transfer/TransferContext.tsx b/apps/extension/src/app/features/transfer/TransferContext.tsx
new file mode 100644
index 00000000000..a674001db0d
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/TransferContext.tsx
@@ -0,0 +1,114 @@
+import { TransactionRequest } from '@ethersproject/providers'
+import { providers } from 'ethers'
+import React, { createContext, ReactNode, useContext, useMemo, useReducer, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { AnyAction } from 'redux'
+import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
+import { GasFeeResult, GasSpeed } from 'wallet/src/features/gas/types'
+import {
+  ParsedWarnings,
+  useParsedSendWarnings,
+} from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
+import { useTransactionGasWarning } from 'wallet/src/features/transactions/hooks/useTransactionGasWarning'
+import {
+  INITIAL_TRANSACTION_STATE,
+  transactionStateReducer,
+} from 'wallet/src/features/transactions/transactionState/transactionState'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
+import { useDerivedTransferInfo } from 'wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo'
+import { useTransferTransactionRequest } from 'wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest'
+import { useTransferWarnings } from 'wallet/src/features/transactions/transfer/hooks/useTransferWarnings'
+import { WarningAction } from 'wallet/src/features/transactions/WarningModal/types'
+
+export enum TransferScreen {
+  SendForm,
+  SendReview,
+}
+
+export enum TransferEntryType {
+  Fiat,
+  Crypto,
+}
+
+type TransferContextState = {
+  screen: TransferScreen
+  setScreen: (newScreen: TransferScreen) => void
+  dispatch: React.Dispatch<AnyAction>
+  derivedTransferInfo: ReturnType<typeof useDerivedTransferInfo>
+  gasFee: GasFeeResult
+  warnings: ParsedWarnings
+  txRequest: TransactionRequest | undefined
+} & TransactionState
+
+export const TransferContext = createContext<TransferContextState | undefined>(undefined)
+
+export function TransferContextProvider({
+  prefilledTransactionState,
+  children,
+}: {
+  prefilledTransactionState?: TransactionState
+  children: ReactNode
+}): JSX.Element {
+  const { t } = useTranslation()
+
+  // state and reducers
+  const [transferFormState, dispatch] = useReducer(transactionStateReducer, {
+    ...(prefilledTransactionState ?? INITIAL_TRANSACTION_STATE),
+    showRecipientSelector: false,
+  })
+  const [screen, setScreen] = useState<TransferScreen>(TransferScreen.SendForm)
+
+  // derived info based on transfer state
+  const derivedTransferInfo = useDerivedTransferInfo(transferFormState)
+
+  const warnings = useTransferWarnings(t, derivedTransferInfo)
+
+  const txRequest = useTransferTransactionRequest(derivedTransferInfo)
+
+  const gasFee = useTransactionGasFee(
+    txRequest,
+    GasSpeed.Urgent,
+    warnings.some((warning) => warning.action === WarningAction.DisableReview),
+  )
+
+  const txRequestWithGasSettings = useMemo(
+    (): providers.TransactionRequest => ({ ...txRequest, ...gasFee.params }),
+    [gasFee.params, txRequest],
+  )
+
+  const gasWarning = useTransactionGasWarning({
+    derivedInfo: derivedTransferInfo,
+    gasFee: gasFee?.value,
+  })
+
+  const allSendWarnings = useMemo(() => {
+    return !gasWarning ? warnings : [...warnings, gasWarning]
+  }, [warnings, gasWarning])
+
+  const parsedSendWarnings = useParsedSendWarnings(allSendWarnings)
+
+  const state: TransferContextState = useMemo(() => {
+    return {
+      derivedTransferInfo,
+      screen,
+      setScreen,
+      dispatch,
+      gasFee,
+      warnings: parsedSendWarnings,
+      txRequest: txRequestWithGasSettings,
+      ...transferFormState,
+    }
+  }, [derivedTransferInfo, gasFee, parsedSendWarnings, screen, transferFormState, txRequestWithGasSettings])
+
+  return <TransferContext.Provider value={state}>{children}</TransferContext.Provider>
+}
+
+export const useTransferContext = (): TransferContextState => {
+  const transferContext = useContext(TransferContext)
+
+  if (transferContext === undefined) {
+    throw new Error('`useTransferContext` must be used inside of `TransferContextProvider`')
+  }
+
+  return transferContext
+}
diff --git a/apps/extension/src/app/features/transfer/TransferFlowScreen.tsx b/apps/extension/src/app/features/transfer/TransferFlowScreen.tsx
new file mode 100644
index 00000000000..6a8a3daba90
--- /dev/null
+++ b/apps/extension/src/app/features/transfer/TransferFlowScreen.tsx
@@ -0,0 +1,26 @@
+import { useTranslation } from 'react-i18next'
+import { ScreenHeader } from 'src/app/components/layout/ScreenHeader'
+import { SCREEN_ITEM_HORIZONTAL_PAD } from 'src/app/constants'
+import { SendFormScreen } from 'src/app/features/transfer/SendFormScreen/SendFormScreen'
+import { TransferContextProvider } from 'src/app/features/transfer/TransferContext'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { Flex } from 'ui/src'
+import { X } from 'ui/src/components/icons'
+
+export function TransferFlowScreen(): JSX.Element {
+  const { t } = useTranslation()
+  const { navigateBack, locationState } = useExtensionNavigation()
+
+  return (
+    <TransferContextProvider prefilledTransactionState={locationState?.initialTransactionState}>
+      <Flex fill py="$spacing8">
+        <Flex px="$spacing8">
+          <ScreenHeader Icon={X} title={t('send.title')} onBackClick={navigateBack} />
+        </Flex>
+        <Flex fill grow pt="$spacing8" px={SCREEN_ITEM_HORIZONTAL_PAD}>
+          <SendFormScreen />
+        </Flex>
+      </Flex>
+    </TransferContextProvider>
+  )
+}
diff --git a/apps/extension/src/app/features/warnings/StorageWarningModal.tsx b/apps/extension/src/app/features/warnings/StorageWarningModal.tsx
new file mode 100644
index 00000000000..dc7c3f5e642
--- /dev/null
+++ b/apps/extension/src/app/features/warnings/StorageWarningModal.tsx
@@ -0,0 +1,42 @@
+import { useTranslation } from 'react-i18next'
+import { ONBOARDING_CONTENT_WIDTH } from 'src/app/features/onboarding/utils'
+import { useCheckLowStorage } from 'src/app/features/warnings/useCheckLowStorage'
+import { AppRoutes, SettingsRoutes } from 'src/app/navigation/constants'
+import { useExtensionNavigation } from 'src/app/navigation/utils'
+import { spacing } from 'ui/src/theme'
+import { ModalName } from 'uniswap/src/features/telemetry/constants'
+import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
+
+export type StorageWarningModalProps = {
+  isOnboarding: boolean
+}
+export function StorageWarningModal({ isOnboarding }: StorageWarningModalProps): JSX.Element | null {
+  const { t } = useTranslation()
+  const { navigateTo } = useExtensionNavigation()
+  const { showStorageWarning, onStorageWarningClose } = useCheckLowStorage({ isOnboarding })
+
+  if (!showStorageWarning) {
+    return null
+  }
+  return (
+    <WarningModal
+      caption={t('extension.warning.storage.message')}
+      closeText={t('common.button.close')}
+      confirmText={isOnboarding ? undefined : t('extension.warning.storage.button')}
+      maxWidth={isOnboarding ? ONBOARDING_CONTENT_WIDTH - spacing.spacing16 * 2 : undefined}
+      modalName={ModalName.StorageWarning}
+      severity={WarningSeverity.High}
+      title={t('extension.warning.storage.title')}
+      onClose={onStorageWarningClose}
+      onConfirm={
+        isOnboarding
+          ? undefined
+          : (): void => {
+              onStorageWarningClose()
+              navigateTo(`${AppRoutes.Settings}/${SettingsRoutes.ViewRecoveryPhrase}`)
+            }
+      }
+    />
+  )
+}
diff --git a/apps/extension/src/app/features/warnings/useCheckLowStorage.ts b/apps/extension/src/app/features/warnings/useCheckLowStorage.ts
new file mode 100644
index 00000000000..3207d917f53
--- /dev/null
+++ b/apps/extension/src/app/features/warnings/useCheckLowStorage.ts
@@ -0,0 +1,48 @@
+import { useCallback, useEffect, useState } from 'react'
+import { GlobalErrorEvent } from 'src/app/events/constants'
+import { globalEventEmitter } from 'src/app/events/global'
+import { logger } from 'utilities/src/logger/logger'
+
+export const REMAINING_STORAGE_THRESHOLD_BYTES = 500000 // 500KB
+
+export function useCheckLowStorage({ isOnboarding }: { isOnboarding: boolean }): {
+  showStorageWarning: boolean
+  onStorageWarningClose: () => void
+} {
+  const [hasShownWarning, setHasShownWarning] = useState(false)
+  const [showStorageWarning, setShowStorageWarning] = useState(false)
+
+  const onStorageWarningClose = useCallback(() => setShowStorageWarning(false), [])
+  const triggerStorageWarning = useCallback((): void => {
+    if (!hasShownWarning) {
+      setShowStorageWarning(true)
+      setHasShownWarning(true)
+    }
+  }, [hasShownWarning])
+
+  useEffect(() => {
+    if (!isOnboarding) {
+      navigator.storage
+        .estimate()
+        .then(({ quota }) => {
+          if (quota && quota < REMAINING_STORAGE_THRESHOLD_BYTES) {
+            triggerStorageWarning()
+            logger.info('useCheckLowStorage.ts', 'useCheckLowStorage', 'Low storage warning shown')
+          }
+        })
+        .catch(() => {})
+    }
+  }, [isOnboarding, triggerStorageWarning])
+
+  useEffect(() => {
+    const listener = (): void => {
+      triggerStorageWarning()
+    }
+    globalEventEmitter.addListener(GlobalErrorEvent.ReduxStorageExceeded, listener)
+    return () => {
+      globalEventEmitter.removeListener(GlobalErrorEvent.ReduxStorageExceeded, listener)
+    }
+  }, [hasShownWarning, triggerStorageWarning])
+
+  return { showStorageWarning, onStorageWarningClose }
+}
diff --git a/apps/extension/src/app/hooks/useIsWalletUnlocked.ts b/apps/extension/src/app/hooks/useIsWalletUnlocked.ts
new file mode 100644
index 00000000000..15dc368a865
--- /dev/null
+++ b/apps/extension/src/app/hooks/useIsWalletUnlocked.ts
@@ -0,0 +1,59 @@
+import { useCallback, useEffect, useState } from 'react'
+import { logger } from 'utilities/src/logger/logger'
+import { useAsyncData } from 'utilities/src/react/hooks'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { ENCRYPTION_KEY_STORAGE_KEY, PersistedStorage } from 'wallet/src/utils/persistedStorage'
+
+/**
+ * In order to speed up the initial load of the app and avoid a half a second loading spinner every time the sidebar opens,
+ * we will first do a quick light check to see if the wallet *might* be unlocked by simply checking if the encryption key
+ * exists in local storage, but without actually verifying that this key is valid.
+ *
+ * After the React app fully loads, we will then do a more thorough check to see if the wallet is actually unlocked.
+ */
+
+// exported to be used in saga's
+export let isWalletUnlocked: boolean | null = null
+
+const sessionStorage = new PersistedStorage('session')
+
+sessionStorage
+  .getItem(ENCRYPTION_KEY_STORAGE_KEY)
+  .then((val) => {
+    isWalletUnlocked = val !== undefined
+  })
+  .catch((err) => {
+    logger.error(err, {
+      tags: {
+        file: 'useIsWalletUnlocked.ts',
+        function: 'sessionStorage.getItem',
+      },
+    })
+  })
+
+export function useIsWalletUnlocked(): boolean | null {
+  const [isUnlocked, setIsUnlocked] = useState<boolean | null>(isWalletUnlocked)
+
+  const checkWalletStatus = useCallback(async () => {
+    isWalletUnlocked = await Keyring.isUnlocked()
+    setIsUnlocked(isWalletUnlocked)
+  }, [])
+
+  useEffect(() => {
+    const listener: Parameters<typeof chrome.storage.onChanged.addListener>[0] = async (changes, namespace) => {
+      if (namespace === 'session' && changes[ENCRYPTION_KEY_STORAGE_KEY]) {
+        await checkWalletStatus()
+      }
+    }
+
+    chrome.storage.onChanged.addListener(listener)
+
+    return () => {
+      chrome.storage.onChanged.removeListener(listener)
+    }
+  }, [checkWalletStatus])
+
+  useAsyncData(checkWalletStatus)
+
+  return isUnlocked
+}
diff --git a/apps/extension/src/app/hooks/useOnCopyToClipboard.tsx b/apps/extension/src/app/hooks/useOnCopyToClipboard.tsx
new file mode 100644
index 00000000000..dd8f43ed0d4
--- /dev/null
+++ b/apps/extension/src/app/hooks/useOnCopyToClipboard.tsx
@@ -0,0 +1,39 @@
+import { useCallback } from 'react'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { useAppDispatch } from 'wallet/src/state'
+
+export function useCopyToClipboard(): ({
+  textToCopy,
+  copyType,
+}: {
+  textToCopy: string
+  copyType: CopyNotificationType
+}) => Promise<void> {
+  const dispatch = useAppDispatch()
+
+  const copyToClipboard = useCallback(
+    async ({ textToCopy, copyType }: { textToCopy: string; copyType: CopyNotificationType }) => {
+      try {
+        await navigator.clipboard.writeText(textToCopy)
+
+        dispatch(
+          pushNotification({
+            type: AppNotificationType.Copied,
+            copyType,
+          }),
+        )
+      } catch (e) {
+        dispatch(
+          pushNotification({
+            type: AppNotificationType.CopyFailed,
+            copyType,
+          }),
+        )
+      }
+    },
+    [dispatch],
+  )
+
+  return copyToClipboard
+}
diff --git a/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.test.ts b/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.test.ts
new file mode 100644
index 00000000000..96801e62898
--- /dev/null
+++ b/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.test.ts
@@ -0,0 +1,154 @@
+import { State, useOpeningKeyboardShortCut } from 'src/app/hooks/useOpeningKeyboardShortCut'
+import * as isAppleDeviceDep from 'src/app/utils/isAppleDevice'
+import { act, renderHook } from 'src/test/test-utils'
+
+jest.mock('src/app/utils/isAppleDevice', () => ({
+  isAppleDevice: jest.fn(),
+}))
+
+const isAppleDevice = isAppleDeviceDep.isAppleDevice as jest.MockedFunction<
+  typeof isAppleDeviceDep.isAppleDevice
+>
+
+describe('useOpeningKeyboardShortCut', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should initialize with the correct keys for an Apple device', () => {
+    isAppleDevice.mockReturnValue(true)
+    const { result } = renderHook(() => useOpeningKeyboardShortCut(false))
+
+    expect(result.current).toEqual([
+      {
+        fontSize: 28,
+        px: '$spacing28',
+        title: 'Shift',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing16',
+        title: 'Meta',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing24',
+        title: 'U',
+        state: State.KeyUp,
+      },
+    ])
+  })
+
+  it('should initialize with the correct keys for a non-Apple device', () => {
+    isAppleDevice.mockReturnValue(false)
+    const { result } = renderHook(() => useOpeningKeyboardShortCut(false))
+
+    expect(result.current).toEqual([
+      {
+        fontSize: 28,
+        px: '$spacing28',
+        title: 'Shift',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 28,
+        px: '$spacing12',
+        title: 'Crtl',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing24',
+        title: 'U',
+        state: State.KeyUp,
+      },
+    ])
+  })
+
+  it('should handle keyDown and keyUp events', () => {
+    isAppleDevice.mockReturnValue(false)
+    const { result } = renderHook(() => useOpeningKeyboardShortCut(false))
+
+    act(() => {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: 'Shift' }))
+    })
+
+    expect(result.current).toEqual([
+      {
+        fontSize: 28,
+        px: '$spacing28',
+        title: 'Shift',
+        state: State.KeyDown,
+      },
+      {
+        fontSize: 28,
+        px: '$spacing12',
+        title: 'Crtl',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing24',
+        title: 'U',
+        state: State.KeyUp,
+      },
+    ])
+
+    act(() => {
+      window.dispatchEvent(new KeyboardEvent('keyup', { key: 'Shift' }))
+    })
+
+    expect(result.current).toEqual([
+      {
+        fontSize: 28,
+        px: '$spacing28',
+        title: 'Shift',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 28,
+        px: '$spacing12',
+        title: 'Crtl',
+        state: State.KeyUp,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing24',
+        title: 'U',
+        state: State.KeyUp,
+      },
+    ])
+  })
+
+  it('should highlight keys when shortCutPressed is true', () => {
+    isAppleDevice.mockReturnValue(false)
+    const { result, rerender } = renderHook((props) => useOpeningKeyboardShortCut(props), {
+      initialProps: false,
+    })
+
+    rerender(true)
+
+    expect(result.current).toEqual([
+      {
+        fontSize: 28,
+        px: '$spacing28',
+        title: 'Shift',
+        state: State.Highlighted,
+      },
+      {
+        fontSize: 28,
+        px: '$spacing12',
+        title: 'Crtl',
+        state: State.Highlighted,
+      },
+      {
+        fontSize: 41,
+        px: '$spacing24',
+        title: 'U',
+        state: State.Highlighted,
+      },
+    ])
+  })
+})
diff --git a/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.ts b/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.ts
new file mode 100644
index 00000000000..87433f2d9c0
--- /dev/null
+++ b/apps/extension/src/app/hooks/useOpeningKeyboardShortCut.ts
@@ -0,0 +1,77 @@
+import { useEffect, useReducer } from 'react'
+import { KeyboardKeyProps } from 'src/app/features/onboarding/KeyboardKey'
+import { isAppleDevice } from 'src/app/utils/isAppleDevice'
+
+const KEY_LONG_TEXT_FONT_SIZE = 28
+const KEY_SHORT_TEXT_FONT_SIZE = 41
+
+// export for tests
+export enum State {
+  KeyUp,
+  KeyDown,
+  Highlighted,
+}
+
+type ReducerAction = { type: 'keyUp' | 'keyDown' | 'highlight'; key: string } | { type: 'highlight' }
+
+export const useOpeningKeyboardShortCut = (shortCutPressed: boolean): KeyboardKeyProps[] => {
+  const reducer = (state: KeyboardKeyProps[], action: ReducerAction): KeyboardKeyProps[] => {
+    switch (action.type) {
+      case 'keyDown':
+        return state.map((key) => (key.title.toLowerCase() === action.key ? { ...key, state: State.KeyDown } : key))
+      case 'keyUp':
+        return state.map((key) =>
+          key.title.toLowerCase() === action.key ||
+          // after pressing Cmd+<letter> keyUp event would only be fired for Cmd, this would "simulate" keyDown for letter
+          // context: https://github.com/electron/electron/issues/5188
+          (action.key === 'meta' && key.title.length === 1)
+            ? { ...key, state: shortCutPressed ? State.Highlighted : State.KeyUp }
+            : key,
+        )
+      case 'highlight':
+        return state.map((key) => ({ ...key, state: State.Highlighted }))
+    }
+  }
+
+  const [keys, dispatch] = useReducer(reducer, [
+    {
+      fontSize: KEY_LONG_TEXT_FONT_SIZE,
+      px: '$spacing28',
+      title: 'Shift',
+      state: State.KeyUp,
+    },
+    isAppleDevice()
+      ? {
+          fontSize: KEY_SHORT_TEXT_FONT_SIZE,
+          px: '$spacing16',
+          title: 'Meta',
+          state: State.KeyUp,
+        }
+      : {
+          fontSize: KEY_LONG_TEXT_FONT_SIZE,
+          px: '$spacing12',
+          title: 'Crtl',
+          state: State.KeyUp,
+        },
+    { fontSize: KEY_SHORT_TEXT_FONT_SIZE, px: '$spacing24', title: 'U', state: State.KeyUp },
+  ])
+
+  useEffect(() => {
+    if (shortCutPressed) {
+      dispatch({ type: 'highlight' })
+    }
+  }, [shortCutPressed])
+
+  useEffect(() => {
+    const keyDownHandler = (event: KeyboardEvent): void => dispatch({ type: 'keyDown', key: event.key.toLowerCase() })
+    const keyUpHandler = (event: KeyboardEvent): void => dispatch({ type: 'keyUp', key: event.key.toLowerCase() })
+    window.addEventListener('keydown', keyDownHandler)
+    window.addEventListener('keyup', keyUpHandler)
+
+    return () => {
+      window.removeEventListener('keydown', keyDownHandler)
+      window.removeEventListener('keyup', keyUpHandler)
+    }
+  }, [])
+  return keys
+}
diff --git a/apps/extension/src/app/hooks/useOptimizedSearchParams.tsx b/apps/extension/src/app/hooks/useOptimizedSearchParams.tsx
new file mode 100644
index 00000000000..083985c2466
--- /dev/null
+++ b/apps/extension/src/app/hooks/useOptimizedSearchParams.tsx
@@ -0,0 +1,30 @@
+import { useEffect, useState } from 'react'
+import { createSearchParams } from 'react-router-dom'
+import { getRouter } from 'src/app/navigation/state'
+import { sleep } from 'utilities/src/time/timing'
+
+const getSearchParams = (): URLSearchParams => createSearchParams(new URLSearchParams(window.location.hash.slice(2)))
+
+/**
+ * It's just like useSearchParams but avoids re-rendering on every page navigation
+ */
+
+export function useOptimizedSearchParams(): URLSearchParams {
+  const [searchParams, setSearchParams] = useState(getSearchParams)
+
+  useEffect(() => {
+    return getRouter().subscribe(async () => {
+      // react-router-dom calls this before it actually updates the url bar :/
+      await sleep(0)
+      setSearchParams((prev) => {
+        const next = getSearchParams()
+        if (prev.toString() !== next.toString()) {
+          return next
+        }
+        return prev
+      })
+    })
+  }, [])
+
+  return searchParams
+}
diff --git a/apps/extension/src/app/hooks/useSagaStatus.ts b/apps/extension/src/app/hooks/useSagaStatus.ts
new file mode 100644
index 00000000000..b72120875ec
--- /dev/null
+++ b/apps/extension/src/app/hooks/useSagaStatus.ts
@@ -0,0 +1,39 @@
+import { useEffect } from 'react'
+import { monitoredSagas } from 'src/app/saga'
+import { useAppDispatch, useAppSelector } from 'src/store/store'
+import { SagaState, SagaStatus } from 'wallet/src/utils/saga'
+
+// Convenience hook to get the status + error of an active saga
+export function useSagaStatus(sagaName: string, onSuccess?: () => void, resetSagaOnSuccess = true): SagaState {
+  const dispatch = useAppDispatch()
+  const sagaState = useAppSelector((s): SagaState | undefined => s.saga[sagaName])
+  if (!sagaState) {
+    throw new Error(`No saga state found, is sagaName valid? Name: ${sagaName}`)
+  }
+
+  const saga = monitoredSagas[sagaName]
+  if (!saga) {
+    throw new Error(`No saga found, is sagaName valid? Name: ${sagaName}`)
+  }
+
+  const { status, error } = sagaState
+
+  useEffect(() => {
+    if (status === SagaStatus.Success) {
+      if (resetSagaOnSuccess) {
+        dispatch(saga.actions.reset()).catch(() => undefined)
+      }
+      onSuccess?.()
+    }
+  }, [saga, status, error, onSuccess, resetSagaOnSuccess, dispatch])
+
+  useEffect(() => {
+    return () => {
+      if (resetSagaOnSuccess) {
+        dispatch(saga.actions.reset()).catch(() => undefined)
+      }
+    }
+  }, [saga, resetSagaOnSuccess, dispatch])
+
+  return sagaState
+}
diff --git a/apps/extension/src/app/navigation/HideContentsWhenSidebarBecomesInactive.tsx b/apps/extension/src/app/navigation/HideContentsWhenSidebarBecomesInactive.tsx
new file mode 100644
index 00000000000..a91cb1c1689
--- /dev/null
+++ b/apps/extension/src/app/navigation/HideContentsWhenSidebarBecomesInactive.tsx
@@ -0,0 +1,31 @@
+import { PropsWithChildren, useEffect } from 'react'
+import { Flex } from 'ui/src'
+import { useIsChromeWindowFocusedWithTimeout } from 'uniswap/src/extension/useIsChromeWindowFocused'
+import { ONE_MINUTE_MS } from 'utilities/src/time/time'
+import { LandingBackground } from 'wallet/src/components/landing/LandingBackground'
+import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+
+// The sidebar becomes "inactive"  when this amount of time has passed since the window lost focus.
+const INACTIVITY_TIMEOUT = 15 * ONE_MINUTE_MS
+
+export function HideContentsWhenSidebarBecomesInactive({ children }: PropsWithChildren): JSX.Element {
+  const isChromeWindowFocused = useIsChromeWindowFocusedWithTimeout(INACTIVITY_TIMEOUT)
+
+  const { navigateToAccountTokenList } = useWalletNavigation()
+
+  useEffect(() => {
+    if (!isChromeWindowFocused) {
+      // We navigate to the homepage because we'll lose the local state when the sidebar becomes active again,
+      // and we want to avoid the user making mistakes because their swap/flow state was lost.
+      navigateToAccountTokenList()
+    }
+  }, [isChromeWindowFocused, navigateToAccountTokenList])
+
+  return isChromeWindowFocused ? (
+    <>{children}</>
+  ) : (
+    <Flex fill>
+      <LandingBackground />
+    </Flex>
+  )
+}
diff --git a/apps/extension/src/app/navigation/SideBarNavigationProvider.tsx b/apps/extension/src/app/navigation/SideBarNavigationProvider.tsx
new file mode 100644
index 00000000000..7ae244b5d0e
--- /dev/null
+++ b/apps/extension/src/app/navigation/SideBarNavigationProvider.tsx
@@ -0,0 +1,186 @@
+import { PropsWithChildren, useCallback } from 'react'
+import { createSearchParams, useNavigate } from 'react-router-dom'
+import { useCopyToClipboard } from 'src/app/hooks/useOnCopyToClipboard'
+import { AppRoutes, HomeQueryParams, HomeTabs } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { focusOrCreateTokensExploreTab } from 'src/app/navigation/utils'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { ShareableEntity } from 'uniswap/src/types/sharing'
+import { logger } from 'utilities/src/logger/logger'
+import {
+  NavigateToNftItemArgs,
+  NavigateToSendFlowArgs,
+  NavigateToSwapFlowArgs,
+  ShareNftArgs,
+  ShareTokenArgs,
+  WalletNavigationProvider,
+  getNavigateToSendFlowArgsInitialState,
+  getNavigateToSwapFlowArgsInitialState,
+} from 'wallet/src/contexts/WalletNavigationContext'
+import { CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
+import { ExplorerDataType, getExplorerLink, getNftUrl, getTokenUrl } from 'wallet/src/utils/linking'
+
+export type SidebarLocationState =
+  | {
+      initialTransactionState?: TransactionState
+    }
+  | undefined
+
+export function SideBarNavigationProvider({ children }: PropsWithChildren): JSX.Element {
+  const handleShareNft = useHandleShareNft()
+  const handleShareToken = useHandleShareToken()
+  const navigateToAccountActivityList = useNavigateToAccountActivityList()
+  const navigateToAccountTokenList = useNavigateToAccountTokenList()
+  const navigateToBuyOrReceiveWithEmptyWallet = useNavigateToBuyOrReceiveWithEmptyWallet()
+  const navigateToNftDetails = useNavigateToNftDetails()
+  const navigateToReceive = useNavigateToReceive()
+  const navigateToSend = useNavigateToSend()
+  const navigateToSwapFlow = useNavigateToSwapFlow()
+  const navigateToTokenDetails = useNavigateToTokenDetails()
+  const navigateToNftCollection = useCallback(() => {
+    // no-op until we have proper NFT collection
+  }, [])
+
+  return (
+    <WalletNavigationProvider
+      handleShareNft={handleShareNft}
+      handleShareToken={handleShareToken}
+      navigateToAccountActivityList={navigateToAccountActivityList}
+      navigateToAccountTokenList={navigateToAccountTokenList}
+      navigateToBuyOrReceiveWithEmptyWallet={navigateToBuyOrReceiveWithEmptyWallet}
+      navigateToNftCollection={navigateToNftCollection}
+      navigateToNftDetails={navigateToNftDetails}
+      navigateToReceive={navigateToReceive}
+      navigateToSend={navigateToSend}
+      navigateToSwapFlow={navigateToSwapFlow}
+      navigateToTokenDetails={navigateToTokenDetails}
+    >
+      {children}
+    </WalletNavigationProvider>
+  )
+}
+
+function useHandleShareNft(): (args: ShareNftArgs) => void {
+  const copyToClipboard = useCopyToClipboard()
+
+  return useCallback(
+    async ({ contractAddress, tokenId }: ShareNftArgs): Promise<void> => {
+      const url = getNftUrl(contractAddress, tokenId)
+
+      await copyToClipboard({ textToCopy: url, copyType: CopyNotificationType.NftUrl })
+
+      sendAnalyticsEvent(WalletEventName.ShareButtonClicked, {
+        entity: ShareableEntity.NftItem,
+        url,
+      })
+    },
+    [copyToClipboard],
+  )
+}
+
+function useHandleShareToken(): (args: ShareTokenArgs) => void {
+  const copyToClipboard = useCopyToClipboard()
+
+  return useCallback(
+    async ({ currencyId }: ShareTokenArgs): Promise<void> => {
+      const url = getTokenUrl(currencyId)
+
+      if (!url) {
+        logger.error(new Error('Failed to get token URL'), {
+          tags: { file: 'SideBarNavigationProvider.tsx', function: 'useHandleShareToken' },
+          extra: { currencyId },
+        })
+        return
+      }
+
+      await copyToClipboard({ textToCopy: url, copyType: CopyNotificationType.TokenUrl })
+
+      sendAnalyticsEvent(WalletEventName.ShareButtonClicked, {
+        entity: ShareableEntity.Token,
+        url,
+      })
+    },
+    [copyToClipboard],
+  )
+}
+
+function useNavigateToAccountActivityList(): () => void {
+  // TODO(EXT-1029): determine why we need useNavigate here
+  const navigateFix = useNavigate()
+
+  return useCallback(
+    (): void =>
+      navigateFix({
+        pathname: AppRoutes.Home,
+        search: createSearchParams({
+          [HomeQueryParams.Tab]: HomeTabs.Activity,
+        }).toString(),
+      }),
+    [navigateFix],
+  )
+}
+
+function useNavigateToAccountTokenList(): () => void {
+  // TODO(EXT-1029): determine why we need useNavigate here
+  const navigateFix = useNavigate()
+
+  return useCallback(
+    (): void =>
+      navigateFix({
+        pathname: AppRoutes.Home,
+        search: createSearchParams({
+          [HomeQueryParams.Tab]: HomeTabs.Tokens,
+        }).toString(),
+      }),
+    [navigateFix],
+  )
+}
+
+function useNavigateToReceive(): () => void {
+  return useCallback((): void => navigate(AppRoutes.Receive), [])
+}
+
+function useNavigateToSend(): (args: NavigateToSendFlowArgs) => void {
+  return useCallback((args: NavigateToSendFlowArgs): void => {
+    const initialState = getNavigateToSendFlowArgsInitialState(args)
+
+    const state: SidebarLocationState = args ? { initialTransactionState: initialState } : undefined
+
+    navigate(AppRoutes.Transfer, { state })
+  }, [])
+}
+
+function useNavigateToSwapFlow(): (args: NavigateToSwapFlowArgs) => void {
+  return useCallback((args: NavigateToSwapFlowArgs): void => {
+    const initialState = getNavigateToSwapFlowArgsInitialState(args)
+
+    const state: SidebarLocationState = initialState ? { initialTransactionState: initialState } : undefined
+
+    navigate(AppRoutes.Swap, { state })
+  }, [])
+}
+
+function useNavigateToTokenDetails(): (currencyId: string) => void {
+  return useCallback(async (currencyId: string): Promise<void> => {
+    await focusOrCreateTokensExploreTab({ currencyId })
+  }, [])
+}
+
+function useNavigateToNftDetails(): (args: NavigateToNftItemArgs) => void {
+  return useCallback(({ address, tokenId, chainId }: NavigateToNftItemArgs): void => {
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    window.open(getExplorerLink(chainId ?? UniverseChainId.Mainnet, `${address}/${tokenId}`, ExplorerDataType.NFT))
+  }, [])
+}
+
+function useNavigateToBuyOrReceiveWithEmptyWallet(): () => void {
+  return useCallback((): void => {
+    // TODO(EXT-669): replace this once we have an onramp in the Extension.
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    window.open(uniswapUrls.helpArticleUrls.moonpayHelp, '_blank')
+  }, [])
+}
diff --git a/apps/extension/src/app/navigation/constants.ts b/apps/extension/src/app/navigation/constants.ts
new file mode 100644
index 00000000000..7ada8b59b50
--- /dev/null
+++ b/apps/extension/src/app/navigation/constants.ts
@@ -0,0 +1,42 @@
+export { HomeTabs } from 'uniswap/src/types/screens/extension'
+
+export enum TopLevelRoutes {
+  Onboarding = 'onboarding',
+  Notifications = 'notifications',
+}
+
+export enum OnboardingRoutes {
+  Import = 'import',
+  Create = 'create',
+  Scan = 'scan',
+  Reset = 'reset',
+  ResetScan = 'reset-scan',
+  UnsupportedBrowser = 'unsupported-browser',
+}
+
+export enum AppRoutes {
+  AccountSwitcher = 'account-switcher',
+  Home = '',
+  Receive = 'receive',
+  Requests = 'requests',
+  Settings = 'settings',
+  Swap = 'swap',
+  Transfer = 'transfer',
+}
+
+export enum HomeQueryParams {
+  Tab = 'tab',
+}
+
+export enum SettingsRoutes {
+  ChangePassword = 'change-password',
+  DevMenu = 'dev-menu',
+  ViewRecoveryPhrase = 'view-recovery-phrase',
+  RemoveRecoveryPhrase = 'remove-recovery-phrase',
+  Privacy = 'privacy',
+}
+
+export enum RemoveRecoveryPhraseRoutes {
+  Wallets = 'wallets',
+  Verify = 'verify',
+}
diff --git a/apps/extension/src/app/navigation/index.tsx b/apps/extension/src/app/navigation/index.tsx
new file mode 100644
index 00000000000..cc25f3a6a91
--- /dev/null
+++ b/apps/extension/src/app/navigation/index.tsx
@@ -0,0 +1,247 @@
+import { useCallback, useMemo, useRef } from 'react'
+import { Outlet, useLocation } from 'react-router-dom'
+import { FeedbackRequestModal } from 'src/app/components/modal/FeedbackRequestModal'
+import { DappRequestWrapper } from 'src/app/features/dappRequests/DappRequestContent'
+import { DappRequestQueueProvider } from 'src/app/features/dappRequests/DappRequestQueueContext'
+import { HomeScreen } from 'src/app/features/home/HomeScreen'
+import { Locked } from 'src/app/features/lockScreen/Locked'
+import { NotificationToastWrapper } from 'src/app/features/notifications/NotificationToastWrapper'
+import { StorageWarningModal } from 'src/app/features/warnings/StorageWarningModal'
+import { useIsWalletUnlocked } from 'src/app/hooks/useIsWalletUnlocked'
+import { HideContentsWhenSidebarBecomesInactive } from 'src/app/navigation/HideContentsWhenSidebarBecomesInactive'
+import { SideBarNavigationProvider } from 'src/app/navigation/SideBarNavigationProvider'
+import { AppRoutes } from 'src/app/navigation/constants'
+import { useRouterState } from 'src/app/navigation/state'
+import { focusOrCreateOnboardingTab } from 'src/app/navigation/utils'
+import { isOnboardedSelector } from 'src/app/utils/isOnboardedSelector'
+import { useAppSelector } from 'src/store/store'
+import { AnimatePresence, Flex, SpinningLoader, styled } from 'ui/src'
+import { useIsChromeWindowFocusedWithTimeout } from 'uniswap/src/extension/useIsChromeWindowFocused'
+import { useAsyncData } from 'utilities/src/react/hooks'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { TransactionHistoryUpdater } from 'wallet/src/features/transactions/TransactionHistoryUpdater'
+import { QueuedOrderModal } from 'wallet/src/features/transactions/swap/modals/QueuedOrderModal'
+
+export function MainContent(): JSX.Element {
+  const isOnboarded = useAppSelector(isOnboardedSelector)
+
+  if (!isOnboarded) {
+    // TODO: add an error state that takes the user to fullscreen onboarding
+    throw new Error('you should have onboarded')
+  }
+
+  return (
+    <>
+      <StorageWarningModal isOnboarding={false} />
+      <HomeScreen />
+    </>
+  )
+}
+
+enum Direction {
+  Left = 'left',
+  Right = 'right',
+  Up = 'up',
+  Down = 'down',
+}
+
+const oppositeDirection = {
+  [Direction.Left]: Direction.Right,
+  [Direction.Right]: Direction.Left,
+  [Direction.Up]: Direction.Down,
+  [Direction.Down]: Direction.Up,
+}
+
+// default is Right
+const routeDirections = {
+  [AppRoutes.AccountSwitcher]: Direction.Up,
+  [AppRoutes.Swap]: Direction.Down,
+  [AppRoutes.Home]: Direction.Right,
+  [AppRoutes.Requests]: Direction.Right,
+  [AppRoutes.Receive]: Direction.Down,
+  [AppRoutes.Settings]: Direction.Right,
+  [AppRoutes.Transfer]: Direction.Down,
+} satisfies Record<AppRoutes, Direction>
+
+const getAppRouteFromPathName = (pathname: string): AppRoutes | null => {
+  const val = (pathname.split('/')[1] || '') as AppRoutes
+  if (Object.values(AppRoutes).includes(val)) {
+    return val
+  }
+  return null
+}
+
+export function WebNavigation(): JSX.Element {
+  const isLoggedIn = useIsWalletUnlocked()
+  const { pathname } = useLocation()
+  const history = useRef<string[]>([]).current
+  if (history[0] !== pathname) {
+    history.unshift(pathname)
+  }
+
+  let towards = Direction.Right
+  const routeName = getAppRouteFromPathName(pathname)
+  const routerState = useRouterState()
+  if (routeName != null) {
+    towards = routeDirections[routeName]
+    const isBackwards = routerState?.historyAction === 'POP'
+    if (isBackwards) {
+      const lastRoute = getAppRouteFromPathName(history[1] || '')
+      const previousDirection = lastRoute ? routeDirections[lastRoute] : 'right'
+      towards = oppositeDirection[previousDirection]
+    }
+  }
+
+  const childrenMemo = useMemo(() => {
+    return (
+      <AnimatePresence custom={{ towards }} initial={false}>
+        <AnimatedPane
+          key={pathname}
+          animation={[
+            isVertical(towards) ? 'quicker' : '100ms',
+            {
+              opacity: {
+                overshootClamping: true,
+              },
+            },
+          ]}
+        >
+          <Flex fill grow overflow="visible">
+            {isLoggedIn === null ? (
+              <Loading />
+            ) : isLoggedIn === true ? (
+              <HideContentsWhenSidebarBecomesInactive>
+                <LoggedIn />
+              </HideContentsWhenSidebarBecomesInactive>
+            ) : (
+              <LoggedOut />
+            )}
+          </Flex>
+        </AnimatedPane>
+      </AnimatePresence>
+    )
+  }, [isLoggedIn, pathname, towards])
+
+  return (
+    <SideBarNavigationProvider>
+      <NotificationToastWrapper />
+      {childrenMemo}
+    </SideBarNavigationProvider>
+  )
+}
+
+// TODO(EXT-994): improve this loading screen.
+function Loading(): JSX.Element {
+  return (
+    <Flex centered grow>
+      <SpinningLoader />
+    </Flex>
+  )
+}
+
+const AnimatedPane = styled(Flex, {
+  zIndex: 1,
+  fill: true,
+  position: 'absolute',
+  inset: 0,
+  x: 0,
+  opacity: 1,
+  maxWidth: 'calc(min(495px, 100vw))',
+  minHeight: '100vh',
+  mx: 'auto',
+  width: '100%',
+
+  variants: {
+    towards: (dir: Direction) => ({
+      enterStyle: {
+        x: isVertical(dir) ? 0 : dir === 'right' ? 30 : -30,
+        y: !isVertical(dir) ? 0 : dir === 'down' ? 15 : -15,
+        opacity: 0,
+        zIndex: 1,
+      },
+      exitStyle: {
+        zIndex: 0,
+        x: isVertical(dir) ? 0 : dir === 'left' ? 30 : -30,
+        y: !isVertical(dir) ? 0 : dir === 'up' ? 15 : -15,
+        opacity: 0,
+      },
+    }),
+  } as const,
+})
+
+const isVertical = (dir: Direction): boolean => dir === 'up' || dir === 'down'
+
+function useConstant<A>(c: A): A {
+  const out = useRef<A>()
+  if (!out.current) {
+    out.current = c
+  }
+  return out.current
+}
+
+function LoggedIn(): JSX.Element {
+  /**
+   *
+   * So, rendering <Outlet /> directly means the internal hooks in Outlet
+   * will update instantly on page change, but we don't want that.
+   *
+   * Instead we run an animation on page change and keep the old page around
+   * until the animation completes.
+   *
+   * So what this does is "unwraps" the Outlet component in a sense, the hooks
+   * actually run inside *this* component instead of inside the sub-component
+   * Outlet.
+   *
+   * Then we wrap that in `useConstant` so it never changes.
+   *
+   * This makes it so the old page doesn't render with the new page contents
+   * as it does its exit animation.
+   *
+   **/
+  const outletContents = Outlet({})
+  const contents = useConstant(outletContents)
+  const pendingDappRequests = useAppSelector((state) => state.dappRequests.pending)
+  const areRequestsPending = pendingDappRequests.length > 0
+
+  // To avoid excessive API calls, we pause the transaction history updater a short time after the window loses focus.
+  const isChromeWindowFocused = useIsChromeWindowFocusedWithTimeout(30 * ONE_SECOND_MS)
+
+  return (
+    <>
+      {contents}
+
+      <FeedbackRequestModal />
+
+      <QueuedOrderModal />
+
+      {isChromeWindowFocused && <TransactionHistoryUpdater />}
+
+      {areRequestsPending && (
+        <DappRequestQueueProvider>
+          <DappRequestWrapper />
+        </DappRequestQueueProvider>
+      )}
+    </>
+  )
+}
+
+function LoggedOut(): JSX.Element {
+  const isOnboarded = useAppSelector(isOnboardedSelector)
+  const didOpenOnboarding = useRef(false)
+
+  const handleOnboarding = useCallback(async () => {
+    if (!isOnboarded && !didOpenOnboarding.current) {
+      // We keep track of this to avoid opening the onboarding page multiple times if this component remounts.
+      didOpenOnboarding.current = true
+      await focusOrCreateOnboardingTab()
+      // Automatically close the pop up after focusing on the onboarding tab.
+      window.close()
+    }
+  }, [isOnboarded])
+
+  useAsyncData(handleOnboarding)
+
+  // If the user has not onboarded, we render nothing and let the `useEffect` above automatically close the popup.
+  // We could consider showing a loading spinner while the popup is being closed.
+  return isOnboarded ? <Locked /> : <></>
+}
diff --git a/apps/extension/src/app/navigation/state.ts b/apps/extension/src/app/navigation/state.ts
new file mode 100644
index 00000000000..1dc49187dc2
--- /dev/null
+++ b/apps/extension/src/app/navigation/state.ts
@@ -0,0 +1,86 @@
+import { RouterState } from '@sentry/react/types/types'
+import { useEffect, useState } from 'react'
+import { Router } from 'react-router-dom'
+import { sentryCreateHashRouter } from 'src/app/sentry'
+
+/**
+ * Note this file is separate from SidebarApp on purpose!
+ *
+ * Because the router imports all the top-level pages, you can't import it from
+ * below those pages without causing circular imports.
+ *
+ * Circular imports break many things - HMR, bundle splitting, tree shaking,
+ * etc.
+ *
+ * So instead we use this file as a way to "push" the router into an import that
+ * is safe from circularity.
+ */
+
+type RouterStateListener = (state: RouterState) => void
+
+let state: RouterState | null = null
+
+const listeners = new Set<RouterStateListener>()
+
+export function setRouterState(next: RouterState): void {
+  state = next
+  listeners.forEach((l) => l(next))
+}
+
+export function getRouterState(): RouterState | null {
+  return state
+}
+
+export function subscribeToRouterState(listener: RouterStateListener): () => void {
+  listeners.add(listener)
+
+  if (state) {
+    listener(state)
+  }
+
+  return () => {
+    listeners.delete(listener)
+  }
+}
+
+export function useRouterState(): RouterState | null {
+  const [val, setVal] = useState(state)
+
+  useEffect(() => {
+    return subscribeToRouterState(setVal)
+  }, [])
+
+  return val
+}
+
+// as far as i can tell, react-router-dom doesn't give us this type so have to work around
+type Router = ReturnType<typeof sentryCreateHashRouter>
+
+let router: Router | null = null
+
+export function setRouter(next: Router): void {
+  router = next
+}
+
+export function getRouter(): Router {
+  if (!router) {
+    throw new Error('Invalid call to `getRouter` before the router was initialized')
+  }
+  return router
+}
+
+type RouterNavigate = Router['navigate']
+type RouterNavigateArgs = Parameters<RouterNavigate>
+
+// this is a navigate that doesn't need any useNavigate() hook, which in react router has performance issues:
+// https://github.com/remix-run/react-router/issues/7634#issuecomment-1306650156
+// note: useNavigation().navigate() returns void, so making this match that function for easier swapping out
+export const navigate = (to: RouterNavigateArgs[0] | number, opts?: RouterNavigateArgs[1]): void => {
+  if (typeof to === 'number') {
+    // eslint-disable-next-line no-void
+    void getRouter().navigate(to)
+    return
+  }
+  // eslint-disable-next-line no-void
+  void getRouter().navigate(to, opts)
+}
diff --git a/apps/extension/src/app/navigation/utils.ts b/apps/extension/src/app/navigation/utils.ts
new file mode 100644
index 00000000000..7426f645614
--- /dev/null
+++ b/apps/extension/src/app/navigation/utils.ts
@@ -0,0 +1,141 @@
+import { To, matchPath, useLocation } from 'react-router-dom'
+import { SidebarLocationState } from 'src/app/navigation/SideBarNavigationProvider'
+import { TopLevelRoutes } from 'src/app/navigation/constants'
+import { navigate } from 'src/app/navigation/state'
+import { onboardingMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { OnboardingMessageType } from 'src/background/messagePassing/types/ExtensionMessages'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { logger } from 'utilities/src/logger/logger'
+import { escapeRegExp } from 'utilities/src/primitives/string'
+import { getTokenUrl } from 'wallet/src/utils/linking'
+
+export function useRouteMatch(pathToMatch: string): boolean {
+  const { pathname } = useLocation()
+
+  return !!matchPath(pathToMatch, pathname)
+}
+
+export const useExtensionNavigation = (): {
+  navigateTo: (path: To) => void
+  navigateBack: () => void
+  locationState: SidebarLocationState
+} => {
+  const navigateTo = (path: To): void => navigate(path)
+  const navigateBack = (): void => navigate(-1)
+  const locationState = useLocation().state as SidebarLocationState
+
+  return { navigateTo, navigateBack, locationState }
+}
+
+export async function focusOrCreateOnboardingTab(page?: string): Promise<void> {
+  const extension = await chrome.management.getSelf()
+
+  const tabs = await chrome.tabs.query({ url: `chrome-extension://${extension.id}/*` })
+  const tab = tabs[0]
+
+  const url = 'onboarding.html#/' + (page ? page : TopLevelRoutes.Onboarding)
+
+  if (!tab?.id) {
+    await chrome.tabs.create({ url })
+    return
+  }
+
+  await chrome.tabs.update(tab.id, {
+    active: true,
+    highlighted: true,
+    // We only want to update the URL if we're navigating to a specific page.
+    // Otherwise, just focus the existing tab without overriding the current URL.
+    url: page ? url : undefined,
+  })
+
+  if (page) {
+    // When navigating to a specific page, we need to reload the tab to ensure that the app state is reset and the store synchronization is properly initialized.
+    // This is necessary to handle the edge case where the user leaves a completed onboarding tab open (with synchronization paused)
+    // and then clicks on the "forgot password" link.
+    await chrome.tabs.reload(tab.id)
+  }
+
+  await chrome.windows.update(tab.windowId, { focused: true })
+
+  await onboardingMessageChannel.sendMessage({
+    type: OnboardingMessageType.HighlightOnboardingTab,
+  })
+}
+
+/**
+ * To avoid opening too many tabs while also ensuring that we don't take over the user's active tab,
+ * we only update the URL of the active tab if it's already in a specific route of the Uniswap interface.
+ *
+ * If the current tab is not in that route, we open a new tab instead.
+ */
+export async function focusOrCreateUniswapInterfaceTab({
+  url,
+  reuseActiveTabIfItMatches,
+}: {
+  url: string
+  reuseActiveTabIfItMatches?: RegExp
+}): Promise<void> {
+  const tabs = await chrome.tabs.query({ active: true, currentWindow: true })
+
+  const activeTab = tabs[0]
+  const activeTabUrl = activeTab?.url
+
+  const isInNewTabPage = activeTabUrl === 'chrome://newtab/'
+
+  const shouldReuseActiveTab = reuseActiveTabIfItMatches
+    ? activeTabUrl && reuseActiveTabIfItMatches?.test(activeTabUrl)
+    : false
+
+  if (activeTab?.id && (shouldReuseActiveTab || isInNewTabPage)) {
+    await chrome.tabs.update(activeTab.id, {
+      active: true,
+      highlighted: true,
+      url,
+    })
+    return
+  }
+
+  await chrome.tabs.create({ url })
+}
+
+export async function focusOrCreateTokensExploreTab({ currencyId }: { currencyId: string }): Promise<void> {
+  const url = getTokenUrl(currencyId)
+
+  if (!url) {
+    logger.error(new Error('Failed to get token URL'), {
+      tags: { file: 'navigation/utils.ts', function: 'focusOrCreateTokensExploreTab' },
+      extra: { currencyId },
+    })
+    return
+  }
+
+  return focusOrCreateUniswapInterfaceTab({
+    url,
+    // We want to reuse the active tab only if it's already in any other TDP.
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    reuseActiveTabIfItMatches: new RegExp(`^${escapeRegExp(uniswapUrls.webInterfaceTokensUrl)}`),
+  })
+}
+
+export async function focusOrCreateNftItemTab({
+  address,
+  tokenId,
+}: {
+  address: string
+  tokenId: string
+}): Promise<void> {
+  return focusOrCreateUniswapInterfaceTab({
+    url: `${uniswapUrls.webInterfaceNftItemUrl}/${address}/${tokenId}`,
+    // We want to reuse the active tab only if it's already in any other NFT item page.
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    reuseActiveTabIfItMatches: new RegExp(`^${escapeRegExp(uniswapUrls.webInterfaceNftItemUrl)}`),
+  })
+}
+
+export async function getCurrentTabAndWindowId(): Promise<{ tabId: number; windowId: number }> {
+  const tabs = await chrome.tabs.query({ active: true, currentWindow: true })
+  if (tabs.length === 0 || !tabs[0] || typeof tabs[0].id !== 'number' || typeof tabs[0].windowId !== 'number') {
+    throw new Error('No active tab found or missing tab/window ID')
+  }
+  return { tabId: tabs[0].id, windowId: tabs[0].windowId }
+}
diff --git a/apps/extension/src/app/saga.ts b/apps/extension/src/app/saga.ts
new file mode 100644
index 00000000000..86d67b549dd
--- /dev/null
+++ b/apps/extension/src/app/saga.ts
@@ -0,0 +1,99 @@
+import { initDappStore } from 'src/app/features/dapp/saga'
+import { dappRequestApprovalWatcher } from 'src/app/features/dappRequests/dappRequestApprovalWatcherSaga'
+import { dappRequestWatcher } from 'src/app/features/dappRequests/saga'
+import { call, spawn } from 'typed-redux-saga'
+import { apolloClientRef } from 'wallet/src/data/apollo/usePersistedApolloClient'
+import { authActions, authReducer, authSaga, authSagaName } from 'wallet/src/features/auth/saga'
+import { appLanguageWatcherSaga } from 'wallet/src/features/language/saga'
+import { initProviders } from 'wallet/src/features/providers'
+import { swapActions, swapReducer, swapSaga, swapSagaName } from 'wallet/src/features/transactions/swap/swapSaga'
+import {
+  tokenWrapActions,
+  tokenWrapReducer,
+  tokenWrapSaga,
+  tokenWrapSagaName,
+} from 'wallet/src/features/transactions/swap/wrapSaga'
+import { transactionWatcher, watchTransactionEvents } from 'wallet/src/features/transactions/transactionWatcherSaga'
+import {
+  editAccountActions,
+  editAccountReducer,
+  editAccountSaga,
+  editAccountSagaName,
+} from 'wallet/src/features/wallet/accounts/editAccountSaga'
+import {
+  createAccountsActions,
+  createAccountsReducer,
+  createAccountsSaga,
+  createAccountsSagaName,
+} from 'wallet/src/features/wallet/create/createAccountsSaga'
+import { MonitoredSaga, getMonitoredSagaReducers } from 'wallet/src/state/saga'
+
+// Stateful sagas that are registered with the store on startup
+export const monitoredSagas: Record<string, MonitoredSaga> = {
+  [authSagaName]: {
+    name: authSagaName,
+    wrappedSaga: authSaga,
+    reducer: authReducer,
+    actions: authActions,
+  },
+  [createAccountsSagaName]: {
+    name: createAccountsSagaName,
+    wrappedSaga: createAccountsSaga,
+    reducer: createAccountsReducer,
+    actions: createAccountsActions,
+  },
+  [editAccountSagaName]: {
+    name: editAccountSagaName,
+    wrappedSaga: editAccountSaga,
+    reducer: editAccountReducer,
+    actions: editAccountActions,
+  },
+  [swapSagaName]: {
+    name: swapSagaName,
+    wrappedSaga: swapSaga,
+    reducer: swapReducer,
+    actions: swapActions,
+  },
+  [tokenWrapSagaName]: {
+    name: tokenWrapSagaName,
+    wrappedSaga: tokenWrapSaga,
+    reducer: tokenWrapReducer,
+    actions: tokenWrapActions,
+  },
+} as const
+
+const sagasInitializedOnStartup = [
+  appLanguageWatcherSaga,
+  initDappStore,
+  dappRequestApprovalWatcher,
+  dappRequestWatcher,
+  initProviders,
+  watchTransactionEvents,
+] as const
+
+export const monitoredSagaReducers = getMonitoredSagaReducers(monitoredSagas)
+
+export function* webRootSaga() {
+  for (const s of sagasInitializedOnStartup) {
+    yield* spawn(s)
+  }
+
+  const apolloClient = yield* call(apolloClientRef.onReady)
+  yield* spawn(transactionWatcher, { apolloClient })
+
+  for (const m of Object.values(monitoredSagas)) {
+    yield* spawn(m.wrappedSaga)
+  }
+}
+
+const onboardingSagasInitializedOnStartup = [initProviders] as const
+
+export function* onboardingRootSaga() {
+  for (const s of onboardingSagasInitializedOnStartup) {
+    yield* spawn(s)
+  }
+
+  for (const m of Object.values(monitoredSagas)) {
+    yield* spawn(m.wrappedSaga)
+  }
+}
diff --git a/apps/extension/src/app/sentry.ts b/apps/extension/src/app/sentry.ts
new file mode 100644
index 00000000000..33515d8a76c
--- /dev/null
+++ b/apps/extension/src/app/sentry.ts
@@ -0,0 +1,88 @@
+import * as SentryBrowser from '@sentry/browser'
+import * as Sentry from '@sentry/react'
+import { setTag } from '@sentry/react'
+import { useEffect } from 'react'
+import {
+  createHashRouter,
+  createRoutesFromChildren,
+  matchRoutes,
+  useLocation,
+  useNavigationType,
+} from 'react-router-dom'
+import { getSentryEnvironment } from 'src/app/version'
+import { config } from 'uniswap/src/config'
+import { logger } from 'utilities/src/logger/logger'
+import { beforeSend } from 'wallet/src/utils/sentry'
+
+export const enum SentryAppNameTag {
+  Sidebar = 'sidebar',
+  Onboarding = 'onboarding',
+  ContentScript = 'content-script',
+  Background = 'background',
+}
+
+export function initializeSentry(appNameTag: SentryAppNameTag, sentryUserId: string): void {
+  if (__DEV__) {
+    return
+  }
+  Sentry.init({
+    environment: getSentryEnvironment(),
+    dsn: config.sentryDsn,
+    release: process.env.VERSION,
+    integrations: [
+      new Sentry.BrowserTracing({
+        // See docs for support of different versions of variation of react router
+        // https://docs.sentry.io/platforms/javascript/guides/react/configuration/integrations/react-router/
+        routingInstrumentation: Sentry.reactRouterV6Instrumentation(
+          useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        ),
+      }),
+    ],
+    beforeSend,
+    ...sentrySampleRateOptions,
+  })
+  setTag('appName', appNameTag)
+  Sentry.setUser({ id: sentryUserId })
+}
+
+export function initSentryForBrowserScripts(appNameTag: SentryAppNameTag, sentryUserId: string): void {
+  if (__DEV__) {
+    return
+  }
+
+  // Wrapped in try/catch because in this context it can fail silently
+  try {
+    SentryBrowser.init({
+      environment: getSentryEnvironment(),
+      dsn: config.sentryDsn,
+      release: process.env.VERSION,
+      // TODO (EXT-528): Look into adding tracing integration
+      beforeSend,
+      ...sentrySampleRateOptions,
+    })
+  } catch (e) {
+    logger.debug('sentry.ts', 'initSentryForBrowserScripts', 'Error in Sentry init', e)
+  }
+  setTag('appName', appNameTag)
+
+  if (sentryUserId) {
+    SentryBrowser.setUser({ id: sentryUserId })
+  }
+}
+
+const sentrySampleRateOptions = {
+  // Set tracesSampleRate to 1.0 to capture 100%
+  // of transactions for performance monitoring.
+  tracesSampleRate: 1.0,
+
+  // Capture Replay for 10% of all sessions,
+  // plus for 100% of sessions with an error
+  replaysSessionSampleRate: 0.1,
+  replaysOnErrorSampleRate: 1.0,
+}
+
+export const sentryCreateHashRouter = Sentry.wrapCreateBrowserRouter(createHashRouter)
diff --git a/apps/extension/src/app/utils/analytics.ts b/apps/extension/src/app/utils/analytics.ts
new file mode 100644
index 00000000000..41920b0a63b
--- /dev/null
+++ b/apps/extension/src/app/utils/analytics.ts
@@ -0,0 +1,23 @@
+import '@tamagui/core/reset.css'
+import 'src/app/Global.css'
+import 'symbol-observable' // Needed by `reduxed-chrome-storage` as polyfill, order matters
+
+import { getLocalUserId } from 'src/app/utils/storage'
+import { EXTENSION_ORIGIN_APPLICATION } from 'src/app/version'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { ApplicationTransport } from 'utilities/src/telemetry/analytics/ApplicationTransport'
+// eslint-disable-next-line no-restricted-imports
+import { analytics, getAnalyticsAtomDirect } from 'utilities/src/telemetry/analytics/analytics'
+
+export async function initExtensionAnalytics(): Promise<void> {
+  const analyticsAllowed = await getAnalyticsAtomDirect(true)
+  await analytics.init(
+    new ApplicationTransport({
+      serverUrl: uniswapUrls.amplitudeProxyUrl,
+      appOrigin: EXTENSION_ORIGIN_APPLICATION,
+    }),
+    analyticsAllowed,
+    undefined,
+    getLocalUserId,
+  )
+}
diff --git a/apps/extension/src/app/utils/chrome.ts b/apps/extension/src/app/utils/chrome.ts
new file mode 100644
index 00000000000..9433b4c9271
--- /dev/null
+++ b/apps/extension/src/app/utils/chrome.ts
@@ -0,0 +1,17 @@
+/**
+ * Helper function to detect if user is using arc chromium browser
+ * Will not work until stylesheets are loaded
+ * @returns true if user is using arc browser
+ */
+export function isArcBrowser(): boolean {
+  return !!getComputedStyle(document.documentElement).getPropertyValue('--arc-palette-background')
+}
+
+/**
+ * Helper function to check if chome extension environment supports side panel
+ * Arc browser has the functions defined but does not do anything so needs to be explicitly checked
+ * @returns true if chrome environment supports side panel
+ */
+export function checksIfSupportsSidePanel(): boolean {
+  return !!chrome.sidePanel && !isArcBrowser()
+}
diff --git a/apps/extension/src/app/utils/devtools.ts b/apps/extension/src/app/utils/devtools.ts
new file mode 100644
index 00000000000..fe355ad4b6f
--- /dev/null
+++ b/apps/extension/src/app/utils/devtools.ts
@@ -0,0 +1,3 @@
+if (process.env.NODE_ENV === 'development' && window.location.search.includes('why-did-you-render')) {
+  require('./whyDidYouRender')
+}
diff --git a/apps/extension/src/app/utils/isAppleDevice.test.ts b/apps/extension/src/app/utils/isAppleDevice.test.ts
new file mode 100644
index 00000000000..558774ab472
--- /dev/null
+++ b/apps/extension/src/app/utils/isAppleDevice.test.ts
@@ -0,0 +1,56 @@
+import { isAppleDevice } from 'src/app/utils/isAppleDevice'
+
+describe('isAppleDevice', () => {
+  beforeEach(() => {
+    // Reset any mocks before each test
+    jest.resetModules()
+  })
+
+  it('should return true for macOS', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'MacIntel',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(true)
+  })
+
+  it('should return true for iPhone', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'iPhone',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(true)
+  })
+
+  it('should return true for iPad', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'iPad',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(true)
+  })
+
+  it('should return false for Windows', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'Win32',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(false)
+  })
+
+  it('should return false for Linux', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'Linux',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(false)
+  })
+
+  it('should return false for Android', () => {
+    Object.defineProperty(window.navigator, 'platform', {
+      value: 'Android',
+      writable: true,
+    })
+    expect(isAppleDevice()).toBe(false)
+  })
+})
diff --git a/apps/extension/src/app/utils/isAppleDevice.ts b/apps/extension/src/app/utils/isAppleDevice.ts
new file mode 100644
index 00000000000..48adc3955a2
--- /dev/null
+++ b/apps/extension/src/app/utils/isAppleDevice.ts
@@ -0,0 +1,7 @@
+/**
+ * Checks if the operating system is macOS.
+ * @returns {boolean} - True if the OS is macOS, otherwise false.
+ */
+export function isAppleDevice(): boolean {
+  return /Mac|iPod|iPhone|iPad/.test(navigator.platform)
+}
diff --git a/apps/extension/src/app/utils/isOnboardedSelector.ts b/apps/extension/src/app/utils/isOnboardedSelector.ts
new file mode 100644
index 00000000000..6add25ea522
--- /dev/null
+++ b/apps/extension/src/app/utils/isOnboardedSelector.ts
@@ -0,0 +1,5 @@
+import { AppSelector } from 'wallet/src/state'
+
+export const isOnboardedSelector: AppSelector<boolean> = (state) => {
+  return Object.values(state.wallet.accounts).length > 0
+}
diff --git a/apps/extension/src/app/utils/storage.ts b/apps/extension/src/app/utils/storage.ts
new file mode 100644
index 00000000000..1107161fd20
--- /dev/null
+++ b/apps/extension/src/app/utils/storage.ts
@@ -0,0 +1,18 @@
+import { v4 as uuidv4 } from 'uuid'
+import { PersistedStorage } from 'wallet/src/utils/persistedStorage'
+
+const STORAGE_AREA_KEY = 'local'
+export const USER_ID_KEY = 'USER_ID'
+export const LOCAL_STORAGE = new PersistedStorage(STORAGE_AREA_KEY)
+
+export async function getLocalUserId(): Promise<string> {
+  let userId: string | undefined = await LOCAL_STORAGE.getItem(USER_ID_KEY)
+
+  if (userId) {
+    return userId
+  }
+
+  userId = uuidv4()
+  await LOCAL_STORAGE.setItem(USER_ID_KEY, userId)
+  return userId
+}
diff --git a/apps/extension/src/app/utils/whyDidYouRender.ts b/apps/extension/src/app/utils/whyDidYouRender.ts
new file mode 100644
index 00000000000..1f0d3645831
--- /dev/null
+++ b/apps/extension/src/app/utils/whyDidYouRender.ts
@@ -0,0 +1,13 @@
+import whyDidYouRender from '@welldone-software/why-did-you-render'
+import React from 'react'
+
+if (process.env.NODE_ENV === 'development') {
+  whyDidYouRender(React, {
+    // use this to filter down to specific component names, ie /Select.*/
+    include: [/.*/],
+    collapseGroups: true,
+    logOnDifferentValues: true,
+    trackAllPureComponents: true,
+    trackHooks: true,
+  })
+}
diff --git a/apps/extension/src/app/version.ts b/apps/extension/src/app/version.ts
new file mode 100644
index 00000000000..a1b425aa712
--- /dev/null
+++ b/apps/extension/src/app/version.ts
@@ -0,0 +1,31 @@
+import { isBetaEnv, isDevEnv } from 'utilities/src/environment'
+import { StatsigEnvironmentTier } from 'wallet/src/version'
+
+// TODO: Add to analytics package and remove
+export const EXTENSION_ORIGIN_APPLICATION = 'extension'
+
+export function getStatsigEnvironmentTier(): StatsigEnvironmentTier {
+  if (isDevEnv()) {
+    return StatsigEnvironmentTier.DEV
+  }
+  if (isBetaEnv()) {
+    return StatsigEnvironmentTier.BETA
+  }
+  return StatsigEnvironmentTier.PROD
+}
+
+export function getSentryEnvironment(): SentryEnvironment {
+  if (isDevEnv()) {
+    return SentryEnvironment.DEV
+  }
+  if (isBetaEnv()) {
+    return SentryEnvironment.BETA
+  }
+  return SentryEnvironment.PROD
+}
+
+enum SentryEnvironment {
+  DEV = 'development',
+  BETA = 'beta',
+  PROD = 'production',
+}
diff --git a/apps/extension/src/assets/beta-logo.png b/apps/extension/src/assets/beta-logo.png
new file mode 100644
index 00000000000..a8e2387a9f7
Binary files /dev/null and b/apps/extension/src/assets/beta-logo.png differ
diff --git a/apps/extension/src/assets/fonts/Basel-Book.woff b/apps/extension/src/assets/fonts/Basel-Book.woff
new file mode 100644
index 00000000000..7cfd4abb6e9
Binary files /dev/null and b/apps/extension/src/assets/fonts/Basel-Book.woff differ
diff --git a/apps/extension/src/assets/fonts/Basel-Medium.woff b/apps/extension/src/assets/fonts/Basel-Medium.woff
new file mode 100644
index 00000000000..004a41fcb1c
Binary files /dev/null and b/apps/extension/src/assets/fonts/Basel-Medium.woff differ
diff --git a/apps/extension/src/assets/fonts/Inter-normal.var.ttf b/apps/extension/src/assets/fonts/Inter-normal.var.ttf
new file mode 100644
index 00000000000..600b384ad81
Binary files /dev/null and b/apps/extension/src/assets/fonts/Inter-normal.var.ttf differ
diff --git a/apps/extension/src/assets/graphics/extension-preview-dark.png b/apps/extension/src/assets/graphics/extension-preview-dark.png
new file mode 100644
index 00000000000..11145a70ae2
Binary files /dev/null and b/apps/extension/src/assets/graphics/extension-preview-dark.png differ
diff --git a/apps/extension/src/assets/graphics/extension-preview-light.png b/apps/extension/src/assets/graphics/extension-preview-light.png
new file mode 100644
index 00000000000..f29c5585399
Binary files /dev/null and b/apps/extension/src/assets/graphics/extension-preview-light.png differ
diff --git a/apps/extension/src/assets/icon128.png b/apps/extension/src/assets/icon128.png
new file mode 100644
index 00000000000..e9c2299dfd5
Binary files /dev/null and b/apps/extension/src/assets/icon128.png differ
diff --git a/apps/extension/src/assets/icon16.png b/apps/extension/src/assets/icon16.png
new file mode 100644
index 00000000000..3de1e355d12
Binary files /dev/null and b/apps/extension/src/assets/icon16.png differ
diff --git a/apps/extension/src/assets/icon32.png b/apps/extension/src/assets/icon32.png
new file mode 100644
index 00000000000..071e63e7fd2
Binary files /dev/null and b/apps/extension/src/assets/icon32.png differ
diff --git a/apps/extension/src/assets/icon48.png b/apps/extension/src/assets/icon48.png
new file mode 100644
index 00000000000..6626bc3b0d0
Binary files /dev/null and b/apps/extension/src/assets/icon48.png differ
diff --git a/apps/extension/src/assets/icon64.png b/apps/extension/src/assets/icon64.png
new file mode 100644
index 00000000000..cf5e77b53cd
Binary files /dev/null and b/apps/extension/src/assets/icon64.png differ
diff --git a/apps/extension/src/assets/index.ts b/apps/extension/src/assets/index.ts
new file mode 100644
index 00000000000..b9de945e81a
--- /dev/null
+++ b/apps/extension/src/assets/index.ts
@@ -0,0 +1,6 @@
+export const ONBOARDING_BACKGROUND_LIGHT = require('./onboarding-background-light.png')
+export const ONBOARDING_BACKGROUND_DARK = require('./onboarding-background-dark.png')
+export const LOCK_SCREEN_BACKGROUND = require('./lock-screen-background.png')
+export const UNISWAP_BETA_LOGO = require('./beta-logo.png')
+export const EXTENSION_PREVIEW_LIGHT = require('./graphics/extension-preview-light.png')
+export const EXTENSION_PREVIEW_DARK = require('./graphics/extension-preview-dark.png')
diff --git a/apps/extension/src/assets/lock-screen-background.png b/apps/extension/src/assets/lock-screen-background.png
new file mode 100644
index 00000000000..61b22ebf394
Binary files /dev/null and b/apps/extension/src/assets/lock-screen-background.png differ
diff --git a/apps/extension/src/assets/onboarding-background-dark.png b/apps/extension/src/assets/onboarding-background-dark.png
new file mode 100644
index 00000000000..d171047c301
Binary files /dev/null and b/apps/extension/src/assets/onboarding-background-dark.png differ
diff --git a/apps/extension/src/assets/onboarding-background-light.png b/apps/extension/src/assets/onboarding-background-light.png
new file mode 100644
index 00000000000..9c1296b3011
Binary files /dev/null and b/apps/extension/src/assets/onboarding-background-light.png differ
diff --git a/apps/extension/src/background/background.ts b/apps/extension/src/background/background.ts
new file mode 100644
index 00000000000..3f8f27d545c
--- /dev/null
+++ b/apps/extension/src/background/background.ts
@@ -0,0 +1,91 @@
+import 'symbol-observable' // Needed by `reduxed-chrome-storage` as polyfill, order matters
+
+import { initStatSigForBrowserScripts } from 'src/app/StatsigProvider'
+import { focusOrCreateOnboardingTab } from 'src/app/navigation/utils'
+import { SentryAppNameTag, initSentryForBrowserScripts } from 'src/app/sentry'
+import { initExtensionAnalytics } from 'src/app/utils/analytics'
+import { getLocalUserId } from 'src/app/utils/storage'
+import { initMessageBridge } from 'src/background/backgroundDappRequests'
+import { backgroundStore } from 'src/background/backgroundStore'
+import { backgroundToSidePanelMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { BackgroundToSidePanelRequestType } from 'src/background/messagePassing/types/requests'
+import { setSidePanelBehavior, setSidePanelOptions } from 'src/background/utils/chromeSidePanelUtils'
+import { readIsOnboardedFromStorage } from 'src/background/utils/persistedStateUtils'
+import { logger } from 'utilities/src/logger/logger'
+
+export const EXTENSION_ID = chrome.runtime.id
+
+initMessageBridge()
+
+async function initApp(): Promise<void> {
+  const userId = await getLocalUserId()
+  initSentryForBrowserScripts(SentryAppNameTag.Background, userId)
+  await initStatSigForBrowserScripts()
+  await initExtensionAnalytics()
+
+  // Enables or disables sidebar based on onboarding status
+  // Injected script will reject any requests if not onboarded
+  backgroundStore.addOnboardingChangedListener(async (isOnboarded) => {
+    if (isOnboarded) {
+      await enableSidebar()
+    } else {
+      await disableSidebar()
+      await focusOrCreateOnboardingTab()
+    }
+  })
+
+  await backgroundStore.init()
+}
+
+chrome.tabs.onActivated.addListener(onTabChange)
+chrome.tabs.onUpdated.addListener(onTabChange)
+
+chrome.action.onClicked.addListener(async () => {
+  await checkAndHandleOnboarding()
+})
+
+chrome.runtime.onInstalled.addListener(async () => {
+  await checkAndHandleOnboarding()
+})
+
+// Utility Functions
+async function checkAndHandleOnboarding(): Promise<void> {
+  const isOnboarded = await readIsOnboardedFromStorage()
+
+  if (!isOnboarded) {
+    await disableSidebar()
+    await focusOrCreateOnboardingTab()
+  } else {
+    await enableSidebar()
+  }
+}
+
+async function enableSidebar(): Promise<void> {
+  await setSidePanelOptions({ enabled: true })
+  await setSidePanelBehavior({ openPanelOnActionClick: true })
+}
+
+async function disableSidebar(): Promise<void> {
+  await setSidePanelOptions({ enabled: false })
+  await setSidePanelBehavior({ openPanelOnActionClick: false })
+}
+
+/** Fires an event whenever a tab is changed so the sidebar can reflect the current connection status properly. */
+async function onTabChange(): Promise<void> {
+  try {
+    await backgroundToSidePanelMessageChannel.sendMessage({
+      type: BackgroundToSidePanelRequestType.TabActivated,
+    })
+  } catch (e) {
+    // an error will be thrown if the sidebar is not open. This is expected and in this case there is no action to be taken anyways so ignore.
+  }
+}
+
+initApp().catch((error) => {
+  logger.error(error, {
+    tags: {
+      file: 'background/background.ts',
+      function: 'initApp',
+    },
+  })
+})
diff --git a/apps/extension/src/background/backgroundDappRequests.ts b/apps/extension/src/background/backgroundDappRequests.ts
new file mode 100644
index 00000000000..12f142cafd3
--- /dev/null
+++ b/apps/extension/src/background/backgroundDappRequests.ts
@@ -0,0 +1,267 @@
+import { rpcErrors, serializeError } from '@metamask/rpc-errors'
+import { removeDappConnection } from 'src/app/features/dapp/actions'
+import { changeChain } from 'src/app/features/dapp/changeChain'
+import { dappStore } from 'src/app/features/dapp/store'
+import { SenderTabInfo } from 'src/app/features/dappRequests/slice'
+import {
+  ChangeChainRequest,
+  DappRequest,
+  DappRequestType,
+  DappResponseType,
+  RevokePermissionsRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import { focusOrCreateOnboardingTab } from 'src/app/navigation/utils'
+import {
+  DappBackgroundPortChannel,
+  contentScriptToBackgroundMessageChannel,
+  contentScriptUtilityMessageChannel,
+  createBackgroundToSidePanelMessagePort,
+  dappResponseMessageChannel,
+} from 'src/background/messagePassing/messageChannels'
+import {
+  BackgroundToSidePanelRequestType,
+  ContentScriptUtilityMessageType,
+  DappRequestMessage,
+} from 'src/background/messagePassing/types/requests'
+import { openSidePanel } from 'src/background/utils/chromeSidePanelUtils'
+import { ExtensionEthMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import { hexadecimalStringToInt, toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants/extension'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { RPCType } from 'uniswap/src/types/chains'
+import { logger } from 'utilities/src/logger/logger'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import { walletContextValue } from 'wallet/src/features/wallet/context'
+
+const INACTIVITY_ALARM_NAME = 'inactivity'
+// TODO(EXT-546): add a setting to turn off the auto-lock setting
+const INACTIVITY_TIMEOUT_MINUTES = 60 * 24 // 1 day
+
+const windowIdToSidebarPortMap = new Map<string, DappBackgroundPortChannel>()
+// TODO EXT-1020 add timeout support to avoid memory leaks
+const windowIdToPendingRequestsMap = new Map<string, DappRequestMessage[]>()
+
+chrome.alarms.onAlarm.addListener(async (alarm) => {
+  if (alarm.name !== INACTIVITY_ALARM_NAME) {
+    return
+  }
+
+  await lockWallet()
+})
+
+async function lockWallet(): Promise<void> {
+  logger.debug('background', 'lockWallet', 'Locking wallet via background script')
+  sendAnalyticsEvent(ExtensionEventName.ChangeLockedState, { locked: true, location: 'background' })
+  await Keyring.lock()
+}
+
+chrome.runtime.onConnect.addListener(async (port) => {
+  await chrome.alarms.clear(INACTIVITY_ALARM_NAME)
+
+  const windowId = port.name
+  const portChannel = createBackgroundToSidePanelMessagePort(port)
+  windowIdToSidebarPortMap.set(windowId, portChannel)
+
+  const pendingRequests = windowIdToPendingRequestsMap.get(windowId)
+
+  if (pendingRequests) {
+    for (const pendingRequest of pendingRequests) {
+      await portChannel.sendMessage(pendingRequest)
+    }
+    windowIdToPendingRequestsMap.delete(windowId)
+  }
+
+  // Only gets called when `port.disconnect()` is called or `port.sendMessage()` for a disconnected port
+  port.onDisconnect.addListener(async () => {
+    windowIdToSidebarPortMap.delete(windowId)
+
+    if (windowIdToSidebarPortMap.size <= 0) {
+      await chrome.alarms.create(INACTIVITY_ALARM_NAME, {
+        delayInMinutes: INACTIVITY_TIMEOUT_MINUTES,
+      })
+    }
+  })
+})
+
+let initialized = false
+export function initMessageBridge(): void {
+  if (initialized) {
+    return
+  }
+
+  contentScriptToBackgroundMessageChannel.addAllMessageListener(async (message, sender) => {
+    // The side panel needs to be opened here because it has to be in response to a user action.
+    // Further down in the chain it will be opened in response to a message from the background script.
+
+    if (sender?.tab?.id === undefined || sender?.tab?.url === undefined) {
+      logger.error(new Error('sender.tab id or url is not defined'), {
+        tags: {
+          file: 'background/background.ts',
+          function: 'dappMessageListener',
+        },
+      })
+      return
+    }
+
+    const senderTabInfo = {
+      id: sender.tab.id,
+      url: sender.tab.url,
+      favIconUrl: sender.tab.favIconUrl,
+    }
+
+    const isSidebarActive = Boolean(windowIdToSidebarPortMap.get(sender.tab.windowId.toString()))
+    if (!isSidebarActive) {
+      const handled = handleSilentBackgroundRequest(message, senderTabInfo)
+      if (handled) {
+        return
+      }
+    }
+
+    await handleSidebarRequest(message, sender.tab.windowId, senderTabInfo)
+  })
+
+  contentScriptUtilityMessageChannel.addMessageListener(ContentScriptUtilityMessageType.ErrorLog, async (message) => {
+    // Need to re-construct the error object from the message since the error object is not serializable
+    logger.error(new Error(message.message), {
+      tags: {
+        file: message.fileName,
+        function: message.functionName,
+        ...message.tags,
+      },
+    })
+  })
+
+  contentScriptUtilityMessageChannel.addMessageListener(ContentScriptUtilityMessageType.InfoLog, async (message) => {
+    logger.info(message.fileName, message.functionName, message.message, message.tags)
+  })
+
+  contentScriptUtilityMessageChannel.addMessageListener(ContentScriptUtilityMessageType.FocusOnboardingTab, () => {
+    focusOrCreateOnboardingTab().catch((error) =>
+      logger.error(error, {
+        tags: {
+          file: 'backgroundDappRequests.ts',
+          function: 'contentScriptUtilityMessageListener',
+        },
+      }),
+    )
+  })
+  contentScriptUtilityMessageChannel.addMessageListener(ContentScriptUtilityMessageType.FocusOnboardingTab, () => {
+    focusOrCreateOnboardingTab().catch((error) =>
+      logger.error(error, {
+        tags: {
+          file: 'backgroundDappRequests.ts',
+          function: 'contentScriptUtilityMessageListener',
+        },
+      }),
+    )
+  })
+
+  initialized = true
+}
+
+/**
+ * Dapp requests that should be silently handled by the background worker as a proxy if the sidebar is not open
+ * Avoids async to trigger open side panel as quickly as possible
+ * @returns true if the request was handled, false otherwise
+ */
+function handleSilentBackgroundRequest(request: DappRequest, senderTabInfo: SenderTabInfo): boolean {
+  const dappUrl = extractBaseUrl(senderTabInfo.url)
+
+  if (!dappUrl) {
+    return false
+  }
+
+  switch (request.type) {
+    case DappRequestType.ChangeChain:
+      handleChainChange(request, dappUrl, senderTabInfo.id).catch(() => {})
+      return true
+    case DappRequestType.RevokePermissions:
+      handleRevokePermissions(request, dappUrl, senderTabInfo.id).catch(() => {})
+      return true
+    default:
+      return false
+  }
+}
+
+async function handleChainChange(request: ChangeChainRequest, dappUrl: string, tabId: number): Promise<void> {
+  await dappStore.init()
+  const { activeConnectedAddress } = dappStore.getDappInfo(dappUrl) ?? {}
+  const updatedChainId = toSupportedChainId(hexadecimalStringToInt(request.chainId))
+  const provider = updatedChainId ? walletContextValue.providers.getProvider(updatedChainId, RPCType.Public) : undefined
+  const response = changeChain({
+    provider,
+    dappUrl,
+    updatedChainId,
+    requestId: request.requestId,
+    activeConnectedAddress,
+  })
+
+  await dappResponseMessageChannel.sendMessageToTab(tabId, response)
+}
+
+async function handleRevokePermissions(
+  request: RevokePermissionsRequest,
+  dappUrl: string,
+  tabId: number,
+): Promise<void> {
+  await dappStore.init()
+  const revokedPermissions = Object.keys(request.permissions)
+
+  if (revokedPermissions.includes(ExtensionEthMethods.eth_accounts)) {
+    await removeDappConnection(dappUrl)
+    await dappResponseMessageChannel.sendMessageToTab(tabId, {
+      type: DappResponseType.RevokePermissionsResponse,
+      requestId: request.requestId,
+    })
+  } else {
+    await dappResponseMessageChannel.sendMessageToTab(tabId, {
+      type: DappResponseType.ErrorResponse,
+      error: serializeError(rpcErrors.methodNotFound()),
+      requestId: request.requestId,
+    })
+  }
+}
+
+class ExpectedNoPortError extends Error {
+  constructor() {
+    super('No port in storage to post message to')
+  }
+}
+
+async function handleSidebarRequest(
+  request: DappRequest,
+  windowId: number,
+  senderTabInfo: DappRequestMessage['senderTabInfo'],
+): Promise<void> {
+  const windowIdString = windowId.toString()
+  const portChannel = windowIdToSidebarPortMap.get(windowIdString)
+  const message: DappRequestMessage = {
+    type: BackgroundToSidePanelRequestType.DappRequestReceived,
+    dappRequest: request,
+    senderTabInfo,
+    isSidebarClosed: !portChannel,
+  }
+
+  try {
+    if (!portChannel) {
+      throw new ExpectedNoPortError()
+    }
+
+    await portChannel.sendMessage(message)
+  } catch (error) {
+    await openSidePanel(senderTabInfo.id, windowId)
+
+    windowIdToPendingRequestsMap.set(windowIdString, windowIdToPendingRequestsMap.get(windowIdString) ?? [])
+    windowIdToPendingRequestsMap.get(windowIdString)?.push(message)
+
+    if (!(error instanceof ExpectedNoPortError)) {
+      logger.error(error, {
+        tags: {
+          file: 'backgroundDappRequests.ts',
+          function: 'handleSidebarRequest',
+        },
+      })
+    }
+  }
+}
diff --git a/apps/extension/src/background/backgroundStore.ts b/apps/extension/src/background/backgroundStore.ts
new file mode 100644
index 00000000000..6664de5a803
--- /dev/null
+++ b/apps/extension/src/background/backgroundStore.ts
@@ -0,0 +1,71 @@
+import { readIsOnboardedFromStorage, readReduxStateFromStorage } from 'src/background/utils/persistedStateUtils'
+import { WebState } from 'src/store/webReducer'
+import { logger } from 'utilities/src/logger/logger'
+
+type BackgroundState = {
+  isOnboarded: boolean
+}
+
+const state: BackgroundState = {
+  isOnboarded: false,
+}
+
+type OnboardingChangedListener = (isOnboarded: boolean) => void
+const onboardingChangedListeners: OnboardingChangedListener[] = []
+
+// Allows for multiple init attempts from different sources
+let initPromise: Promise<void> | undefined
+
+async function init(): Promise<void> {
+  if (!initPromise) {
+    initPromise = initInternal()
+  }
+
+  return initPromise
+}
+
+async function initInternal(): Promise<void> {
+  try {
+    const reduxState = await readReduxStateFromStorage()
+
+    if (!reduxState) {
+      logger.debug('backgroundStore.ts', 'initInternal', 'Failed to read redux state from storage')
+    }
+
+    await updateFromReduxState(reduxState)
+    chrome.storage.local.onChanged.addListener(async (changes) => {
+      const newReduxState = await readReduxStateFromStorage(changes)
+      await updateFromReduxState(newReduxState)
+    })
+  } catch (error) {
+    logger.error(error, {
+      tags: {
+        file: 'backgroundStore.ts',
+        function: 'init',
+      },
+    })
+  }
+}
+
+async function updateFromReduxState(reduxState: WebState | undefined): Promise<void> {
+  if (reduxState) {
+    updateIsOnboarded(await readIsOnboardedFromStorage()) // Can replace this with selector after migration is complete
+  }
+}
+
+function updateIsOnboarded(isOnboarded: boolean): void {
+  if (isOnboarded !== state.isOnboarded) {
+    state.isOnboarded = isOnboarded
+    onboardingChangedListeners.forEach((listener) => listener(isOnboarded))
+  }
+}
+
+function addOnboardingChangedListener(listener: OnboardingChangedListener): void {
+  onboardingChangedListeners.push(listener)
+}
+
+export const backgroundStore = {
+  state,
+  init,
+  addOnboardingChangedListener,
+}
diff --git a/apps/extension/src/background/messagePassing/messageChannels.ts b/apps/extension/src/background/messagePassing/messageChannels.ts
new file mode 100644
index 00000000000..ffadf741f2f
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/messageChannels.ts
@@ -0,0 +1,339 @@
+import {
+  AccountResponse,
+  AccountResponseSchema,
+  ChainIdResponse,
+  ChainIdResponseSchema,
+  ChangeChainRequest,
+  ChangeChainRequestSchema,
+  ChangeChainResponse,
+  ChangeChainResponseSchema,
+  DappRequestType,
+  DappResponseType,
+  ErrorResponse,
+  ErrorResponseSchema,
+  GetAccountRequest,
+  GetAccountRequestSchema,
+  GetChainIdRequest,
+  GetChainIdRequestSchema,
+  GetPermissionsRequest,
+  GetPermissionsRequestSchema,
+  GetPermissionsResponse,
+  GetPermissionsResponseSchema,
+  RequestAccountRequest,
+  RequestAccountRequestSchema,
+  RequestPermissionsRequest,
+  RequestPermissionsRequestSchema,
+  RequestPermissionsResponse,
+  RequestPermissionsResponseSchema,
+  RevokePermissionsRequest,
+  RevokePermissionsRequestSchema,
+  RevokePermissionsResponse,
+  RevokePermissionsResponseSchema,
+  SendTransactionRequest,
+  SendTransactionRequestSchema,
+  SendTransactionResponse,
+  SendTransactionResponseSchema,
+  SignMessageRequest,
+  SignMessageRequestSchema,
+  SignMessageResponse,
+  SignMessageResponseSchema,
+  SignTransactionRequest,
+  SignTransactionRequestSchema,
+  SignTransactionResponse,
+  SignTransactionResponseSchema,
+  SignTypedDataRequest,
+  SignTypedDataRequestSchema,
+  SignTypedDataResponse,
+  SignTypedDataResponseSchema,
+  UniswapOpenSidebarRequest,
+  UniswapOpenSidebarRequestSchema,
+  UniswapOpenSidebarResponse,
+  UniswapOpenSidebarResponseSchema,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import {
+  MessageParsers,
+  TypedPortMessageChannel,
+  TypedRuntimeMessageChannel,
+} from 'src/background/messagePassing/platform'
+import {
+  HighlightOnboardingTabMessage,
+  HighlightOnboardingTabMessageSchema,
+  OnboardingMessageType,
+  SidebarOpenedMessage,
+  SidebarOpenedMessageSchema,
+} from 'src/background/messagePassing/types/ExtensionMessages'
+import {
+  BackgroundToSidePanelRequestType,
+  ContentScriptUtilityMessageType,
+  DappRequestMessage,
+  DappRequestMessageSchema,
+  ErrorLog,
+  ErrorLogSchema,
+  ExtensionChainChange,
+  ExtensionChainChangeSchema,
+  ExtensionToDappRequestType,
+  FocusOnboardingMessage,
+  FocusOnboardingMessageSchema,
+  InfoLog,
+  InfoLogSchema,
+  TabActivatedRequest,
+  TabActivatedRequestSchema,
+  UpdateConnectionRequest,
+  UpdateConnectionRequestSchema,
+} from 'src/background/messagePassing/types/requests'
+
+export enum MessageChannelName {
+  DappContentScript = 'DappContentScript',
+  DappBackground = 'DappBackground',
+  DappResponse = 'DappResponse',
+  Onboarding = 'Onboarding',
+  ExternalDapp = 'ExternalDapp',
+  ContentScriptUtility = 'ContentScriptUtility',
+}
+
+type OnboardingMessageSchemas = {
+  [OnboardingMessageType.HighlightOnboardingTab]: HighlightOnboardingTabMessage
+  [OnboardingMessageType.SidebarOpened]: SidebarOpenedMessage
+}
+const onboardingMessageParsers: MessageParsers<OnboardingMessageType, OnboardingMessageSchemas> = {
+  [OnboardingMessageType.HighlightOnboardingTab]: (message): HighlightOnboardingTabMessage =>
+    HighlightOnboardingTabMessageSchema.parse(message),
+  [OnboardingMessageType.SidebarOpened]: (message): SidebarOpenedMessage => SidebarOpenedMessageSchema.parse(message),
+}
+
+function createOnboardingMessageChannel(): TypedRuntimeMessageChannel<OnboardingMessageType, OnboardingMessageSchemas> {
+  return new TypedRuntimeMessageChannel<OnboardingMessageType, OnboardingMessageSchemas>({
+    channelName: MessageChannelName.Onboarding,
+    messageParsers: onboardingMessageParsers,
+  })
+}
+
+export function createOnboardingMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<OnboardingMessageType, OnboardingMessageSchemas> {
+  return new TypedPortMessageChannel({
+    channelName: MessageChannelName.Onboarding,
+    messageParsers: onboardingMessageParsers,
+    port,
+  })
+}
+
+type BackgroundToSidePanelMessageSchemas = {
+  [BackgroundToSidePanelRequestType.DappRequestReceived]: DappRequestMessage
+  [BackgroundToSidePanelRequestType.TabActivated]: TabActivatedRequest
+}
+const backgroundToSidePanelMessageParsers: MessageParsers<
+  BackgroundToSidePanelRequestType,
+  BackgroundToSidePanelMessageSchemas
+> = {
+  [BackgroundToSidePanelRequestType.DappRequestReceived]: (message): DappRequestMessage =>
+    DappRequestMessageSchema.parse(message),
+  [BackgroundToSidePanelRequestType.TabActivated]: (message): TabActivatedRequest =>
+    TabActivatedRequestSchema.parse(message),
+}
+
+function createBackgroundToSidePanelMessageChannel(): TypedRuntimeMessageChannel<
+  BackgroundToSidePanelRequestType,
+  BackgroundToSidePanelMessageSchemas
+> {
+  return new TypedRuntimeMessageChannel<BackgroundToSidePanelRequestType, BackgroundToSidePanelMessageSchemas>({
+    channelName: MessageChannelName.DappBackground,
+    messageParsers: backgroundToSidePanelMessageParsers,
+  })
+}
+
+export function createBackgroundToSidePanelMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<BackgroundToSidePanelRequestType, BackgroundToSidePanelMessageSchemas> {
+  return new TypedPortMessageChannel<BackgroundToSidePanelRequestType, BackgroundToSidePanelMessageSchemas>({
+    channelName: MessageChannelName.DappBackground,
+    messageParsers: backgroundToSidePanelMessageParsers,
+    port,
+  })
+}
+
+type ContentScriptToBackgroundMessageSchemas = {
+  [DappRequestType.ChangeChain]: ChangeChainRequest
+  [DappRequestType.GetAccount]: GetAccountRequest
+  [DappRequestType.GetChainId]: GetChainIdRequest
+  [DappRequestType.GetPermissions]: GetPermissionsRequest
+  [DappRequestType.RequestAccount]: RequestAccountRequest
+  [DappRequestType.RequestPermissions]: RequestPermissionsRequest
+  [DappRequestType.RevokePermissions]: RevokePermissionsRequest
+  [DappRequestType.SendTransaction]: SendTransactionRequest
+  [DappRequestType.SignMessage]: SignMessageRequest
+  [DappRequestType.SignTransaction]: SignTransactionRequest
+  [DappRequestType.SignTypedData]: SignTypedDataRequest
+  [DappRequestType.UniswapOpenSidebar]: UniswapOpenSidebarRequest
+}
+const contentScriptToBackgroundMessageParsers: MessageParsers<
+  DappRequestType,
+  ContentScriptToBackgroundMessageSchemas
+> = {
+  [DappRequestType.ChangeChain]: (message): ChangeChainRequest => ChangeChainRequestSchema.parse(message),
+  [DappRequestType.GetAccount]: (message): GetAccountRequest => GetAccountRequestSchema.parse(message),
+  [DappRequestType.GetChainId]: (message): GetChainIdRequest => GetChainIdRequestSchema.parse(message),
+  [DappRequestType.GetPermissions]: (message): GetPermissionsRequest => GetPermissionsRequestSchema.parse(message),
+  [DappRequestType.RequestAccount]: (message): RequestAccountRequest => RequestAccountRequestSchema.parse(message),
+  [DappRequestType.RequestPermissions]: (message): RequestPermissionsRequest =>
+    RequestPermissionsRequestSchema.parse(message),
+  [DappRequestType.RevokePermissions]: (message): RevokePermissionsRequest =>
+    RevokePermissionsRequestSchema.parse(message),
+  [DappRequestType.SendTransaction]: (message): SendTransactionRequest => SendTransactionRequestSchema.parse(message),
+  [DappRequestType.SignMessage]: (message): SignMessageRequest => SignMessageRequestSchema.parse(message),
+  [DappRequestType.SignTransaction]: (message): SignTransactionRequest => SignTransactionRequestSchema.parse(message),
+  [DappRequestType.SignTypedData]: (message): SignTypedDataRequest => SignTypedDataRequestSchema.parse(message),
+  [DappRequestType.UniswapOpenSidebar]: (message): UniswapOpenSidebarRequest =>
+    UniswapOpenSidebarRequestSchema.parse(message),
+}
+
+function createContentScriptToBackgroundMessageChannel(): TypedRuntimeMessageChannel<
+  DappRequestType,
+  ContentScriptToBackgroundMessageSchemas
+> {
+  return new TypedRuntimeMessageChannel<DappRequestType, ContentScriptToBackgroundMessageSchemas>({
+    channelName: MessageChannelName.DappContentScript,
+    messageParsers: contentScriptToBackgroundMessageParsers,
+    canReceiveFromContentScript: true,
+  })
+}
+
+export function createContentScriptToBackgroundMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<DappRequestType, ContentScriptToBackgroundMessageSchemas> {
+  return new TypedPortMessageChannel<DappRequestType, ContentScriptToBackgroundMessageSchemas>({
+    channelName: MessageChannelName.DappContentScript,
+    messageParsers: contentScriptToBackgroundMessageParsers,
+    canReceiveFromContentScript: true,
+    port,
+  })
+}
+
+type DappResponseMessageSchemas = {
+  [DappResponseType.AccountResponse]: AccountResponse
+  [DappResponseType.ChainChangeResponse]: ChangeChainResponse
+  [DappResponseType.ChainIdResponse]: ChainIdResponse
+  [DappResponseType.ErrorResponse]: ErrorResponse
+  [DappResponseType.GetPermissionsResponse]: GetPermissionsResponse
+  [DappResponseType.RequestPermissionsResponse]: RequestPermissionsResponse
+  [DappResponseType.RevokePermissionsResponse]: RevokePermissionsResponse
+  [DappResponseType.SendTransactionResponse]: SendTransactionResponse
+  [DappResponseType.SignMessageResponse]: SignMessageResponse
+  [DappResponseType.SignTransactionResponse]: SignTransactionResponse
+  [DappResponseType.SignTypedDataResponse]: SignTypedDataResponse
+  [DappResponseType.UniswapOpenSidebarResponse]: UniswapOpenSidebarResponse
+}
+const dappResponseMessageParsers: MessageParsers<DappResponseType, DappResponseMessageSchemas> = {
+  [DappResponseType.AccountResponse]: (message): AccountResponse => AccountResponseSchema.parse(message),
+  [DappResponseType.ChainChangeResponse]: (message): ChangeChainResponse => ChangeChainResponseSchema.parse(message),
+  [DappResponseType.ChainIdResponse]: (message): ChainIdResponse => ChainIdResponseSchema.parse(message),
+  [DappResponseType.ErrorResponse]: (message): ErrorResponse => ErrorResponseSchema.parse(message),
+  [DappResponseType.GetPermissionsResponse]: (message): GetPermissionsResponse =>
+    GetPermissionsResponseSchema.parse(message),
+  [DappResponseType.RequestPermissionsResponse]: (message): RequestPermissionsResponse =>
+    RequestPermissionsResponseSchema.parse(message),
+  [DappResponseType.RevokePermissionsResponse]: (message): RevokePermissionsResponse =>
+    RevokePermissionsResponseSchema.parse(message),
+  [DappResponseType.SendTransactionResponse]: (message): SendTransactionResponse =>
+    SendTransactionResponseSchema.parse(message),
+  [DappResponseType.SignMessageResponse]: (message): SignMessageResponse => SignMessageResponseSchema.parse(message),
+  [DappResponseType.SignTransactionResponse]: (message): SignTransactionResponse =>
+    SignTransactionResponseSchema.parse(message),
+  [DappResponseType.SignTypedDataResponse]: (message): SignTypedDataResponse =>
+    SignTypedDataResponseSchema.parse(message),
+  [DappResponseType.UniswapOpenSidebarResponse]: (message): UniswapOpenSidebarResponse =>
+    UniswapOpenSidebarResponseSchema.parse(message),
+}
+
+function createDappResponseMessageChannel(): TypedRuntimeMessageChannel<DappResponseType, DappResponseMessageSchemas> {
+  return new TypedRuntimeMessageChannel<DappResponseType, DappResponseMessageSchemas>({
+    channelName: MessageChannelName.DappResponse,
+    messageParsers: dappResponseMessageParsers,
+  })
+}
+
+export function createDappResponseMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<DappResponseType, DappResponseMessageSchemas> {
+  return new TypedPortMessageChannel<DappResponseType, DappResponseMessageSchemas>({
+    channelName: MessageChannelName.DappResponse,
+    messageParsers: dappResponseMessageParsers,
+    port,
+  })
+}
+
+type ExternalDappMessageSchemas = {
+  [ExtensionToDappRequestType.SwitchChain]: ExtensionChainChange
+  [ExtensionToDappRequestType.UpdateConnections]: UpdateConnectionRequest
+}
+const externalDappMessageParsers: MessageParsers<ExtensionToDappRequestType, ExternalDappMessageSchemas> = {
+  [ExtensionToDappRequestType.SwitchChain]: (message): ExtensionChainChange =>
+    ExtensionChainChangeSchema.parse(message),
+  [ExtensionToDappRequestType.UpdateConnections]: (message): UpdateConnectionRequest =>
+    UpdateConnectionRequestSchema.parse(message),
+}
+
+export function createExternalDappMessageChannel(): TypedRuntimeMessageChannel<
+  ExtensionToDappRequestType,
+  ExternalDappMessageSchemas
+> {
+  return new TypedRuntimeMessageChannel<ExtensionToDappRequestType, ExternalDappMessageSchemas>({
+    channelName: MessageChannelName.ExternalDapp,
+    messageParsers: externalDappMessageParsers,
+  })
+}
+
+export function createExternalDappMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<ExtensionToDappRequestType, ExternalDappMessageSchemas> {
+  return new TypedPortMessageChannel<ExtensionToDappRequestType, ExternalDappMessageSchemas>({
+    channelName: MessageChannelName.ExternalDapp,
+    messageParsers: externalDappMessageParsers,
+    port,
+  })
+}
+
+type ContentScriptUtilityMessageSchemas = {
+  [ContentScriptUtilityMessageType.FocusOnboardingTab]: FocusOnboardingMessage
+  [ContentScriptUtilityMessageType.ErrorLog]: ErrorLog
+  [ContentScriptUtilityMessageType.InfoLog]: InfoLog
+}
+const contentScriptUtilityMessageParsers: MessageParsers<
+  ContentScriptUtilityMessageType,
+  ContentScriptUtilityMessageSchemas
+> = {
+  [ContentScriptUtilityMessageType.FocusOnboardingTab]: (message): FocusOnboardingMessage =>
+    FocusOnboardingMessageSchema.parse(message),
+  [ContentScriptUtilityMessageType.ErrorLog]: (message): ErrorLog => ErrorLogSchema.parse(message),
+  [ContentScriptUtilityMessageType.InfoLog]: (message): InfoLog => InfoLogSchema.parse(message),
+}
+
+export function createContentScriptUtilityMessageChannel(): TypedRuntimeMessageChannel<
+  ContentScriptUtilityMessageType,
+  ContentScriptUtilityMessageSchemas
+> {
+  return new TypedRuntimeMessageChannel<ContentScriptUtilityMessageType, ContentScriptUtilityMessageSchemas>({
+    channelName: MessageChannelName.ContentScriptUtility,
+    messageParsers: contentScriptUtilityMessageParsers,
+    canReceiveFromContentScript: true,
+  })
+}
+
+export function createContentScriptUtilityMessagePort(
+  port: chrome.runtime.Port,
+): TypedPortMessageChannel<ContentScriptUtilityMessageType, ContentScriptUtilityMessageSchemas> {
+  return new TypedPortMessageChannel<ContentScriptUtilityMessageType, ContentScriptUtilityMessageSchemas>({
+    channelName: MessageChannelName.ExternalDapp,
+    messageParsers: contentScriptUtilityMessageParsers,
+    port,
+  })
+}
+
+export const onboardingMessageChannel = createOnboardingMessageChannel()
+export const backgroundToSidePanelMessageChannel = createBackgroundToSidePanelMessageChannel()
+export const contentScriptToBackgroundMessageChannel = createContentScriptToBackgroundMessageChannel()
+export const dappResponseMessageChannel = createDappResponseMessageChannel()
+export const externalDappMessageChannel = createExternalDappMessageChannel()
+export const contentScriptUtilityMessageChannel = createContentScriptUtilityMessageChannel()
+
+export type DappBackgroundPortChannel = ReturnType<typeof createBackgroundToSidePanelMessagePort>
diff --git a/apps/extension/src/background/messagePassing/messageTypes.ts b/apps/extension/src/background/messagePassing/messageTypes.ts
new file mode 100644
index 00000000000..a73e41bb09b
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/messageTypes.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod'
+
+// SCHEMAS
+export const MessageSchema = z.object({})
+
+// TYPES
+export type Message = z.infer<typeof MessageSchema>
diff --git a/apps/extension/src/background/messagePassing/messageUtils.ts b/apps/extension/src/background/messagePassing/messageUtils.ts
new file mode 100644
index 00000000000..86209df7fc6
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/messageUtils.ts
@@ -0,0 +1,28 @@
+import { Message } from 'src/background/messagePassing/messageTypes'
+
+type MessageValidator<T extends Message> = (message: unknown) => message is T
+
+type WindowMessageHandler<T extends Message> = (message: T, source: MessageEventSource | null) => void
+type InvalidWindowMessageHandler = (message: unknown, source?: MessageEventSource | null) => void
+
+// Message listener for chrome.window with validation logic. Used only to receive external messages from dapps.
+export function addWindowMessageListener<T extends Message>(
+  validator: MessageValidator<T>,
+  handler: WindowMessageHandler<T>,
+  invalidMessageHandler?: InvalidWindowMessageHandler,
+): (event: MessageEvent) => void {
+  const listener = (event: MessageEvent): void => {
+    if (event.source !== window || !validator(event.data)) {
+      invalidMessageHandler?.(event.data, event.source)
+      return
+    }
+
+    handler(event.data, event.source)
+  }
+  window.addEventListener('message', listener)
+  return listener
+}
+
+export function removeWindowMessageListener(listener: (event: MessageEvent) => void): void {
+  window.removeEventListener('message', listener)
+}
diff --git a/apps/extension/src/background/messagePassing/platform.ts b/apps/extension/src/background/messagePassing/platform.ts
new file mode 100644
index 00000000000..a7ab70c0d2e
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/platform.ts
@@ -0,0 +1,300 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { logger } from 'utilities/src/logger/logger'
+
+const EXTENSION_CONTEXT_INVALIDATED_CHROMIUM_ERROR = 'Extension context invalidated.'
+
+type MessageListener<T> = (message: T, sender?: chrome.runtime.MessageSender) => void
+class ChromeMessageChannel {
+  protected readonly channelName: string
+  readonly port?: chrome.runtime.Port
+
+  protected listeners: MessageListener<any>[] = []
+
+  constructor({
+    channelName,
+    port,
+    canReceiveFromContentScript = false,
+  }: {
+    channelName: string
+    canReceiveFromContentScript?: boolean
+    port?: chrome.runtime.Port
+  }) {
+    this.channelName = channelName
+    this.port = port
+
+    const mainListener: MessageListener<any> = (message, sender) => {
+      const targetMessage = message[this.channelName]
+
+      if (targetMessage !== undefined) {
+        if (sender?.tab !== undefined && !canReceiveFromContentScript) {
+          return
+        }
+
+        if (sender?.id !== chrome.runtime.id && !this.port) {
+          return
+        }
+
+        this.listeners.forEach((listener) => {
+          listener(targetMessage, sender)
+        })
+      }
+    }
+
+    if (this.port) {
+      this.port.onMessage.addListener((message, senderPort) => mainListener(message, senderPort.sender))
+    } else {
+      // eslint-disable-next-line no-restricted-syntax
+      chrome.runtime.onMessage.addListener(mainListener)
+    }
+
+    this.sendMessage = this.sendMessage.bind(this)
+    this.sendMessageToTab = this.sendMessageToTab.bind(this)
+    this.sendMessageToTabUrl = this.sendMessageToTabUrl.bind(this)
+    this.addMessageListener = this.addMessageListener.bind(this)
+    this.removeMessageListener = this.removeMessageListener.bind(this)
+  }
+
+  async sendMessage(message: any): Promise<void> {
+    if (this.port) {
+      this.port.postMessage({ [this.channelName]: message })
+    } else {
+      // eslint-disable-next-line no-restricted-syntax
+      chrome.runtime.sendMessage({ [this.channelName]: message }).catch(() => {})
+    }
+  }
+
+  async sendMessageToTab(tabId: number, message: any): Promise<void> {
+    // eslint-disable-next-line no-restricted-syntax
+    await chrome.tabs.sendMessage(tabId, { [this.channelName]: message })
+  }
+
+  async sendMessageToTabUrl(tabUrl: string, message: any): Promise<void[]> {
+    const urlMatcher = `${tabUrl}/*`
+    const promises: Promise<void>[] = []
+    chrome.tabs.query({ url: urlMatcher }, (tabs) => {
+      tabs.forEach((tab) => {
+        if (tab?.id) {
+          promises.push(
+            // eslint-disable-next-line no-restricted-syntax
+            chrome.tabs.sendMessage(tab.id, { [this.channelName]: message }).catch(() => {
+              // Not logging error here because it is expected that inactive tabs will not be able to receive the message
+            }),
+          )
+        }
+      })
+    })
+    return Promise.all(promises)
+  }
+
+  addMessageListener(listener: MessageListener<any>): () => void {
+    this.listeners.push(listener)
+
+    return () => this.removeMessageListener(listener)
+  }
+
+  removeMessageListener(listener: MessageListener<any>): void {
+    this.listeners = this.listeners.filter((l) => l !== listener)
+  }
+}
+
+export type MessageParsers<T extends string, R extends { [key in T]: { type: key } }> = {
+  [key in T]: (message: unknown) => R[key]
+}
+abstract class TypedMessageChannel<
+  T extends string,
+  R extends { [key in T]: { type: key } },
+  L extends { [key in T]: MessageListener<R[key]> } = { [key in T]: MessageListener<R[key]> },
+> {
+  private readonly chromeMessageChannel: ChromeMessageChannel
+  private readonly messageParsers: MessageParsers<T, R>
+  private listeners = new Map<T, L[T][]>()
+
+  constructor({
+    channelName,
+    port,
+    messageParsers,
+    canReceiveFromContentScript,
+  }: {
+    channelName: string
+    port?: chrome.runtime.Port
+    messageParsers: MessageParsers<T, R>
+    canReceiveFromContentScript?: boolean
+  }) {
+    this.messageParsers = messageParsers
+    this.chromeMessageChannel = new ChromeMessageChannel({
+      channelName,
+      port,
+      canReceiveFromContentScript,
+    })
+
+    this.chromeMessageChannel.addMessageListener((message, sender) => {
+      let type: T | undefined
+      try {
+        const processed = this.processMessage(message)
+        const messageParser = processed.messageParser
+        type = processed.type
+
+        const parsed = messageParser(message)
+        this.listeners.get(type)?.forEach((listener) => {
+          listener(parsed, sender)
+        })
+      } catch (error) {
+        logger.error(
+          new Error(`Error validating message. Possible type is ${type}`, {
+            cause: error,
+          }),
+          {
+            tags: {
+              file: 'platform.ts',
+              function: 'TypedMessageChannel.constructor',
+            },
+          },
+        )
+      }
+    })
+
+    this.sendMessage = this.sendMessage.bind(this)
+    this.sendMessageToTab = this.sendMessageToTab.bind(this)
+    this.sendMessageToTabUrl = this.sendMessageToTabUrl.bind(this)
+    this.addMessageListener = this.addMessageListener.bind(this)
+    this.removeMessageListener = this.removeMessageListener.bind(this)
+  }
+
+  private processMessage(message: any): { type: T; messageParser: (message: unknown) => R[T] } {
+    const type = message.type as Maybe<T>
+    if (!type) {
+      throw new Error('No type provided on message')
+    }
+
+    const messageParser = this.messageParsers[type]
+    if (!messageParser) {
+      throw new Error(`No message parser found for type ${type}`)
+    }
+    return { type, messageParser }
+  }
+
+  async sendMessage<T1 extends T>(message: R[T1]): Promise<boolean> {
+    const { type } = message
+
+    try {
+      await this.chromeMessageChannel.sendMessage(message)
+      return true
+    } catch (error) {
+      const isExtensionInvalidatedError =
+        error instanceof Error && error.message === EXTENSION_CONTEXT_INVALIDATED_CHROMIUM_ERROR
+      logger.error(
+        new Error(
+          `${isExtensionInvalidatedError ? 'Please refresh the page. ' : ''}Error sending message for type ${type}`,
+          { cause: error },
+        ),
+        {
+          tags: {
+            file: 'platform.ts',
+            function: 'TypedMessageChannel.sendMessage',
+          },
+        },
+      )
+      return false
+    }
+  }
+
+  async sendMessageToTab<T1 extends T>(tabId: number, message: R[T1]): Promise<boolean> {
+    const { type } = message
+
+    try {
+      await this.chromeMessageChannel.sendMessageToTab(tabId, message)
+      return true
+    } catch (error) {
+      logger.error(new Error(`Error sending message to tab for type ${type}`, { cause: error }), {
+        tags: {
+          file: 'platform.ts',
+          function: 'TypedMessageChannel.sendMessageToTab',
+        },
+      })
+      return false
+    }
+  }
+
+  async sendMessageToTabUrl<T1 extends T>(tabUrl: string, message: R[T1]): Promise<boolean> {
+    const { type } = message
+
+    try {
+      await this.chromeMessageChannel.sendMessageToTabUrl(tabUrl, message)
+      return true
+    } catch (error) {
+      logger.error(new Error(`Error sending message to tab for type ${type}`, { cause: error }), {
+        tags: {
+          file: 'platform.ts',
+          function: 'TypedMessageChannel.sendMessageToTabUrl',
+        },
+      })
+      return false
+    }
+  }
+
+  addMessageListener<T1 extends T>(type: T1, listener: L[T1]): () => void {
+    this.listeners.set(type, this.listeners.get(type) ?? [])
+    this.listeners.get(type)?.push(listener)
+
+    return () => this.removeMessageListener(type, listener)
+  }
+
+  addAllMessageListener(listener: MessageListener<R[keyof R]>): () => void {
+    const removeListeners = Object.keys(this.messageParsers).map((type) =>
+      this.addMessageListener(type as T, listener as L[T]),
+    )
+
+    return () => removeListeners.forEach((remove) => remove())
+  }
+
+  removeMessageListener(type: T, listener: L[T]): void {
+    this.listeners.set(type, this.listeners.get(type)?.filter((l) => l !== listener) ?? [])
+  }
+}
+
+/**
+ * Type-safe message channel class used for communication. Intended for general global use, backed by chrome.runtime
+ */
+export class TypedRuntimeMessageChannel<
+  T extends string,
+  R extends { [key in T]: { type: key } },
+  L extends { [key in T]: MessageListener<R[key]> } = { [key in T]: MessageListener<R[key]> },
+> extends TypedMessageChannel<T, R, L> {
+  constructor({
+    channelName,
+    messageParsers,
+    canReceiveFromContentScript,
+  }: {
+    channelName: string
+    messageParsers: MessageParsers<T, R>
+    canReceiveFromContentScript?: boolean
+  }) {
+    super({ channelName, messageParsers, canReceiveFromContentScript })
+  }
+}
+
+/**
+ * Adaptation of TypedRuntimeMessageChannel used as a wrapper around chrome.runtime.Port
+ */
+export class TypedPortMessageChannel<
+  T extends string,
+  R extends { [key in T]: { type: key } },
+  L extends { [key in T]: MessageListener<R[key]> } = { [key in T]: MessageListener<R[key]> },
+> extends TypedMessageChannel<T, R, L> {
+  readonly port: chrome.runtime.Port
+
+  constructor({
+    channelName,
+    messageParsers,
+    port,
+    canReceiveFromContentScript,
+  }: {
+    channelName: string
+    messageParsers: MessageParsers<T, R>
+    port: chrome.runtime.Port
+    canReceiveFromContentScript?: boolean
+  }) {
+    super({ channelName, messageParsers, port, canReceiveFromContentScript })
+    this.port = port
+  }
+}
diff --git a/apps/extension/src/background/messagePassing/types/ExtensionMessages.ts b/apps/extension/src/background/messagePassing/types/ExtensionMessages.ts
new file mode 100644
index 00000000000..66bb0d00891
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/types/ExtensionMessages.ts
@@ -0,0 +1,17 @@
+import { MessageSchema } from 'src/background/messagePassing/messageTypes'
+import { z } from 'zod'
+
+export enum OnboardingMessageType {
+  HighlightOnboardingTab = 'HighlightOnboardingTab',
+  SidebarOpened = 'SidebarOpened',
+}
+
+export const HighlightOnboardingTabMessageSchema = MessageSchema.extend({
+  type: z.literal(OnboardingMessageType.HighlightOnboardingTab),
+})
+export type HighlightOnboardingTabMessage = z.infer<typeof HighlightOnboardingTabMessageSchema>
+
+export const SidebarOpenedMessageSchema = MessageSchema.extend({
+  type: z.literal(OnboardingMessageType.SidebarOpened),
+})
+export type SidebarOpenedMessage = z.infer<typeof SidebarOpenedMessageSchema>
diff --git a/apps/extension/src/background/messagePassing/types/requests.ts b/apps/extension/src/background/messagePassing/types/requests.ts
new file mode 100644
index 00000000000..f9ac4e49b62
--- /dev/null
+++ b/apps/extension/src/background/messagePassing/types/requests.ts
@@ -0,0 +1,94 @@
+import { DappRequestSchema } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { MessageSchema } from 'src/background/messagePassing/messageTypes'
+import { z } from 'zod'
+
+// ENUMS
+
+// Requests from content scripts to the extension (non-dapp requests)
+export enum ContentScriptUtilityMessageType {
+  FocusOnboardingTab = 'FocusOnboardingTab',
+  ErrorLog = 'Error',
+  InfoLog = 'Info',
+}
+
+export const ErrorLogSchema = MessageSchema.extend({
+  type: z.literal(ContentScriptUtilityMessageType.ErrorLog),
+  message: z.string(),
+  fileName: z.string(),
+  functionName: z.string(),
+  tags: z.record(z.string()).optional(),
+})
+export type ErrorLog = z.infer<typeof ErrorLogSchema>
+
+export const InfoLogSchema = MessageSchema.extend({
+  type: z.literal(ContentScriptUtilityMessageType.InfoLog),
+  fileName: z.string(),
+  functionName: z.string(),
+  message: z.string(),
+  tags: z.record(z.string()),
+})
+export type InfoLog = z.infer<typeof InfoLogSchema>
+
+export const FocusOnboardingMessageSchema = MessageSchema.extend({
+  type: z.literal(ContentScriptUtilityMessageType.FocusOnboardingTab),
+})
+export type FocusOnboardingMessage = z.infer<typeof FocusOnboardingMessageSchema>
+
+// Requests from background script to the extension sidebar
+export enum BackgroundToSidePanelRequestType {
+  TabActivated = 'TabActivated',
+  DappRequestReceived = 'DappRequestReceived',
+}
+
+export const DappRequestMessageSchema = z.object({
+  type: z.literal(BackgroundToSidePanelRequestType.DappRequestReceived),
+  dappRequest: DappRequestSchema,
+  senderTabInfo: z.object({
+    id: z.number(),
+    url: z.string(),
+    favIconUrl: z.string().optional(),
+  }),
+  isSidebarClosed: z.optional(z.boolean()),
+})
+export type DappRequestMessage = z.infer<typeof DappRequestMessageSchema>
+
+export const TabActivatedRequestSchema = MessageSchema.extend({
+  type: z.literal(BackgroundToSidePanelRequestType.TabActivated),
+})
+export type TabActivatedRequest = z.infer<typeof TabActivatedRequestSchema>
+
+// Requests outgoing from the extension to the injected script
+export enum ExtensionToDappRequestType {
+  UpdateConnections = 'UpdateConnections',
+  SwitchChain = 'SwitchChain',
+}
+
+const BaseExtensionRequestSchema = MessageSchema.extend({
+  type: z.nativeEnum(ExtensionToDappRequestType),
+})
+export type BaseExtensionRequest = z.infer<typeof BaseExtensionRequestSchema>
+
+export const ExtensionChainChangeSchema = BaseExtensionRequestSchema.extend({
+  type: z.literal(ExtensionToDappRequestType.SwitchChain),
+  chainId: z.string(),
+  providerUrl: z.string(),
+})
+export type ExtensionChainChange = z.infer<typeof ExtensionChainChangeSchema>
+
+export const UpdateConnectionRequestSchema = BaseExtensionRequestSchema.extend({
+  type: z.literal(ExtensionToDappRequestType.UpdateConnections),
+  addresses: z.array(z.string()), // TODO (Thomas): Figure out what to do for type safety here
+})
+export type UpdateConnectionRequest = z.infer<typeof UpdateConnectionRequestSchema>
+
+export const ExtensionToDappRequestSchema = z.union([
+  ExtensionChainChangeSchema,
+  UpdateConnectionRequestSchema,
+])
+export type ExtensionToDappRequest = z.infer<typeof ExtensionToDappRequestSchema>
+
+// VALIDATORS
+
+export function isValidExtensionToDappRequest(request: unknown): request is ExtensionToDappRequest {
+  return ExtensionToDappRequestSchema.safeParse(request).success
+}
diff --git a/apps/extension/src/background/utils/chromeSidePanelUtils.ts b/apps/extension/src/background/utils/chromeSidePanelUtils.ts
new file mode 100644
index 00000000000..c566362777e
--- /dev/null
+++ b/apps/extension/src/background/utils/chromeSidePanelUtils.ts
@@ -0,0 +1,44 @@
+import { logger } from 'utilities/src/logger/logger'
+
+export async function openSidePanel(tabId: number | undefined, windowId: number): Promise<void> {
+  try {
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    await chrome.sidePanel.open({
+      tabId,
+      windowId,
+    })
+  } catch (error) {
+    logger.error(error, {
+      tags: {
+        file: 'background/background.ts',
+        function: 'openSidebar',
+      },
+    })
+  }
+}
+
+export async function setSidePanelBehavior(behavior: chrome.sidePanel.PanelBehavior): Promise<void> {
+  try {
+    await chrome.sidePanel.setPanelBehavior(behavior)
+  } catch (error) {
+    logger.error(error, {
+      tags: {
+        file: 'background/background.ts',
+        function: 'setSideBarBehavior',
+      },
+    })
+  }
+}
+
+export async function setSidePanelOptions(options: chrome.sidePanel.PanelOptions): Promise<void> {
+  try {
+    await chrome.sidePanel.setOptions(options)
+  } catch (error) {
+    logger.error(error, {
+      tags: {
+        file: 'background/background.ts',
+        function: 'setSideBarOptions',
+      },
+    })
+  }
+}
diff --git a/apps/extension/src/background/utils/getCalldataInfoFromTransaction.ts b/apps/extension/src/background/utils/getCalldataInfoFromTransaction.ts
new file mode 100644
index 00000000000..338f3a4a545
--- /dev/null
+++ b/apps/extension/src/background/utils/getCalldataInfoFromTransaction.ts
@@ -0,0 +1,63 @@
+import { parseCalldata as parseURCalldata } from 'src/app/features/dappRequests/requestContent/EthSend/Swap/universalRouter'
+import { EthSendTransactionRPCActions } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { EthersTransactionRequest } from 'src/app/features/dappRequests/types/EthersTypes'
+import { parseCalldata as parseNfPMCalldata } from 'src/app/features/dappRequests/types/NonfungiblePositionManager'
+import { NonfungiblePositionManagerCall } from 'src/app/features/dappRequests/types/NonfungiblePositionManagerTypes'
+import { UniversalRouterCall } from 'src/app/features/dappRequests/types/UniversalRouterTypes'
+import methodHashToFunctionSignature from 'utilities/src/calldata/methodHashToFunctionSignature'
+import noop from 'utilities/src/react/noop'
+
+interface GetCalldataInfoFromTransactionReturnValue {
+  functionSignature: string | undefined
+  contractInteractions: EthSendTransactionRPCActions
+  to: string | undefined
+  parsedCalldata?: UniversalRouterCall | NonfungiblePositionManagerCall
+}
+
+function getCalldataInfoFromTransaction(
+  transaction: EthersTransactionRequest,
+): GetCalldataInfoFromTransactionReturnValue {
+  const calldataMethodHash = transaction.data.substring(2, 10)
+  const functionSignature = methodHashToFunctionSignature(calldataMethodHash)
+  const contractInteractions = EthSendTransactionRPCActions.ContractInteraction
+  const result: GetCalldataInfoFromTransactionReturnValue = {
+    functionSignature,
+    contractInteractions,
+    to: transaction.to,
+  }
+
+  if (functionSignature) {
+    if (['approve', 'permit'].some((el) => functionSignature.includes(el))) {
+      result.contractInteractions = EthSendTransactionRPCActions.Approve
+      return result
+    }
+    try {
+      const URCalldata = parseURCalldata(transaction.data)
+      if (URCalldata) {
+        result.contractInteractions = EthSendTransactionRPCActions.Swap
+        result.parsedCalldata = URCalldata
+        return result
+      }
+    } catch (_e) {
+      noop()
+    }
+    try {
+      const NfPMCalldata = parseNfPMCalldata(transaction.data)
+
+      if (NfPMCalldata) {
+        result.contractInteractions = EthSendTransactionRPCActions.LP
+        result.parsedCalldata = NfPMCalldata
+        return result
+      }
+    } catch (_e) {
+      noop()
+    }
+    if (functionSignature.includes('wrap')) {
+      result.contractInteractions = EthSendTransactionRPCActions.Wrap
+      return result
+    }
+  }
+  return result
+}
+
+export default getCalldataInfoFromTransaction
diff --git a/apps/extension/src/background/utils/loggerMiddleware.ts b/apps/extension/src/background/utils/loggerMiddleware.ts
new file mode 100644
index 00000000000..b334591de1f
--- /dev/null
+++ b/apps/extension/src/background/utils/loggerMiddleware.ts
@@ -0,0 +1,6 @@
+import { createLogger } from 'redux-logger'
+
+export const loggerMiddleware = createLogger({
+  collapsed: true,
+  diff: true,
+})
diff --git a/apps/extension/src/background/utils/persistedStateUtils.ts b/apps/extension/src/background/utils/persistedStateUtils.ts
new file mode 100644
index 00000000000..8ebf4a471dd
--- /dev/null
+++ b/apps/extension/src/background/utils/persistedStateUtils.ts
@@ -0,0 +1,39 @@
+import { isOnboardedSelector } from 'src/app/utils/isOnboardedSelector'
+import { STATE_STORAGE_KEY } from 'src/store/constants'
+import { readDeprecatedReduxedChromeStorage } from 'src/store/reduxedChromeStorageToReduxPersistMigration'
+import { WebState } from 'src/store/webReducer'
+
+export async function readReduxStateFromStorage(storageChanges?: {
+  [key: string]: chrome.storage.StorageChange
+}): Promise<WebState | undefined> {
+  const root = storageChanges
+    ? storageChanges[STATE_STORAGE_KEY]?.newValue
+    : (await chrome.storage.local.get(STATE_STORAGE_KEY))[STATE_STORAGE_KEY]
+
+  if (!root) {
+    return undefined
+  }
+
+  const rootParsed = JSON.parse(root)
+
+  Object.keys(rootParsed).forEach((key) => {
+    // Each reducer must be parsed individually.
+    rootParsed[key] = JSON.parse(rootParsed[key])
+  })
+
+  return rootParsed as WebState
+}
+
+export async function readIsOnboardedFromStorage(): Promise<boolean> {
+  // The migration will happen in the sidebar, not in the background script,
+  // because the background script never persists the state (only reads it).
+  // So we need to check both the old and new storage keys to avoid the onboarding
+  // flow re-opening the first time the migration needs to run.
+  const [oldReduxedChromeStorageState, newReduxPersistState] = await Promise.all([
+    readDeprecatedReduxedChromeStorage(),
+    readReduxStateFromStorage(),
+  ])
+
+  const state = oldReduxedChromeStorageState ?? newReduxPersistState
+  return state ? isOnboardedSelector(state) : false
+}
diff --git a/apps/extension/src/contentScript/WindowEthereumProxy.ts b/apps/extension/src/contentScript/WindowEthereumProxy.ts
new file mode 100644
index 00000000000..2c479f5021d
--- /dev/null
+++ b/apps/extension/src/contentScript/WindowEthereumProxy.ts
@@ -0,0 +1,160 @@
+import { rpcErrors, serializeError } from '@metamask/rpc-errors'
+import EventEmitter from 'eventemitter3'
+import { addWindowMessageListener, removeWindowMessageListener } from 'src/background/messagePassing/messageUtils'
+import { BaseEthereumRequest, BaseEthereumRequestSchema } from 'src/contentScript/WindowEthereumRequestTypes'
+import { ExtensionResponse, isValidExtensionResponse } from 'src/contentScript/types'
+import { logger } from 'utilities/src/logger/logger'
+import { v4 as uuidv4 } from 'uuid'
+import { ZodError } from 'zod'
+
+type EthersSendCallback = (error: unknown, response: unknown) => void
+type RequestInput = BaseEthereumRequest & { id?: number; jsonrpc?: string }
+
+const messages = {
+  errors: {
+    disconnected: (): string => 'Uniswap Wallet: Disconnected from chain. Attempting to connect.',
+    invalidRequestArgs: (): string => `Uniswap Wallet: Expected a single, non-array, object argument.`,
+    invalidRequestGeneric: (): string => `Uniswap Wallet: Please check the input passed to the request method`,
+  },
+}
+
+/**
+ * Proxy class that is injected at `window.ethereum` to handle all RPC and extension API requests.
+ * Passes along requests to the content script which then forwards and listens for requests accordingly.
+ */
+export class WindowEthereumProxy extends EventEmitter {
+  /**
+   * Boolean indicating that the provider is Uniswap Wallet.
+   */
+  isUniswapWallet = true
+
+  /**
+   * Boolean to spoof MetaMask
+   * TODO(EXT-393): Remove this once more dapps support EIP-6963 or have explicit support for Uniswap Wallet.
+   */
+  isMetaMask: boolean
+
+  /**
+   * Pending requests are stored as promises that resolve or reject based on the response from the content script.
+   */
+  pendingRequests: {
+    [key: string]: {
+      resolve: (value: unknown) => void
+      reject: (error: unknown) => void
+    }
+  }
+
+  constructor() {
+    super()
+
+    this.isMetaMask = true
+    this.pendingRequests = {}
+  }
+
+  // Deprecated EIP-11193 method
+  enable = async (): Promise<unknown> => {
+    return this.request({ method: 'eth_requestAccounts' })
+  }
+
+  // Deprecated EIP-1193 method
+  send = (
+    methodOrRequest: string | BaseEthereumRequest,
+    paramsOrCallback: Array<unknown> | EthersSendCallback,
+  ): Promise<unknown> | void => {
+    if (typeof methodOrRequest === 'string' && typeof paramsOrCallback !== 'function') {
+      return this.request({
+        method: methodOrRequest,
+        params: paramsOrCallback,
+      })
+    } else if (typeof methodOrRequest === 'object' && typeof paramsOrCallback === 'function') {
+      return this.sendAsync(methodOrRequest, paramsOrCallback)
+    }
+    return Promise.reject(new Error('Unsupported function parameters'))
+  }
+
+  // Deprecated EIP-1193 method still in use by some DApps
+  sendAsync = (
+    request: RequestInput,
+    callback: (error: unknown, response: unknown) => void,
+  ): Promise<unknown> | void => {
+    return this.request(request).then(
+      (response) =>
+        callback(null, {
+          result: response,
+          id: request.id,
+          jsonrpc: request.jsonrpc,
+        }),
+      (error) => callback(error, null),
+    )
+  }
+
+  request = async (args: RequestInput): Promise<unknown> => {
+    return new Promise((resolve, reject) => {
+      try {
+        const ethereumRequest = BaseEthereumRequestSchema.parse(args)
+
+        // Generate a unique ID for this request and store the promise callbacks
+        const requestId = uuidv4()
+        this.pendingRequests[requestId] = { resolve, reject }
+        const responseListener = addWindowMessageListener<ExtensionResponse>(isValidExtensionResponse, (response) => {
+          if (response.requestId === requestId) {
+            this.handleResponse(response)
+            removeWindowMessageListener(responseListener)
+          }
+        })
+        window.postMessage({
+          ...ethereumRequest,
+          requestId,
+        })
+      } catch (error) {
+        logger.info('WindowEthereumProxy.ts', 'request', 'Invalid request', args)
+
+        // Based on the zod error, we can determine the type of error and reject accordingly
+        if (error instanceof ZodError) {
+          return reject(
+            serializeError(
+              rpcErrors.invalidRequest({
+                message: messages.errors.invalidRequestArgs(),
+                data: args,
+              }),
+            ),
+          )
+        }
+
+        return reject(
+          serializeError(
+            rpcErrors.invalidRequest({
+              message: messages.errors.invalidRequestGeneric(),
+              data: args,
+            }),
+          ),
+        )
+      }
+    })
+  }
+
+  private handleResponse(response: ExtensionResponse): boolean {
+    const { requestId, result, error } = response
+    const promise = this.pendingRequests[requestId]
+    if (!promise) {
+      logger.debug('WindowEthereumProxy.ts', 'handleResponse', 'No promise found for request id:', requestId)
+      return false
+    }
+
+    if (error) {
+      promise.reject(error)
+      delete this.pendingRequests[requestId]
+      return true
+    }
+
+    promise.resolve(result)
+
+    // Clean up after handling the response
+    delete this.pendingRequests[requestId]
+    return true
+  }
+  // Utility function representing connectivity status for RPC requests to the current chain (as opposed to user accounts).
+  // Method itself created by MetaMask and not in EIP spec. Necessary since some dapps supporting EIP-6963 require it.
+  // TODO(EXT-1255): Currently faking real status, replace with actual implementation
+  isConnected = (): boolean => true
+}
diff --git a/apps/extension/src/contentScript/WindowEthereumRequestTypes.ts b/apps/extension/src/contentScript/WindowEthereumRequestTypes.ts
new file mode 100644
index 00000000000..7e97b6c55d5
--- /dev/null
+++ b/apps/extension/src/contentScript/WindowEthereumRequestTypes.ts
@@ -0,0 +1,323 @@
+import { ethers } from 'ethers'
+import { EthersTransactionRequestSchema } from 'src/app/features/dappRequests/types/EthersTypes'
+import { HexadecimalNumberSchema } from 'src/app/features/dappRequests/types/utilityTypes'
+import { HomeTabs } from 'src/app/navigation/constants'
+import { ZodIssueCode, z } from 'zod'
+
+/**
+ * Schemas + types for requests that come via `window.ethereum.request`
+ * e.g.: {"jsonrpc":"2.0","method":"personal_sign","params": ["0x295a70b2de5e3953354a6a8344e616ed314d7251", "0xasdfasdfasdfasdfasdfasdfa"],"id":1}'
+ * @see https://eips.ethereum.org/EIPS/eip-1193
+ * @see https://docs.metamask.io/guide/ethereum-provider.html#ethereum-request
+ * @see https://docs.metamask.io/wallet/reference/json-rpc-api/
+ *
+ * Note: Our schemas include transformations to make it easier to work with the data
+ */
+
+export const BaseEthereumRequestSchema = z.object({
+  method: z.string(),
+  params: z.union([z.array(z.unknown()), z.record(z.string(), z.unknown())]).optional(),
+})
+
+export const EthereumRequestWithIdSchema = BaseEthereumRequestSchema.extend({
+  requestId: z.string(),
+})
+export type EthereumRequestWithId = z.infer<typeof EthereumRequestWithIdSchema>
+
+export type BaseEthereumRequest = z.infer<typeof BaseEthereumRequestSchema>
+
+export const EthChainIdRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('eth_chainId'),
+})
+export type EthChainIdRequest = z.infer<typeof EthChainIdRequestSchema>
+
+export const EthRequestAccountsRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('eth_requestAccounts'),
+})
+export type EthRequestAccountsRequest = z.infer<typeof EthRequestAccountsRequestSchema>
+
+export const EthAccountsRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('eth_accounts'),
+})
+export type EthAccountsRequest = z.infer<typeof EthAccountsRequestSchema>
+export const EthSendTransactionRequestSchema = EthereumRequestWithIdSchema.extend({
+  requestId: z.string(),
+  method: z.literal('eth_sendTransaction'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+  if (params.length < 1) {
+    throw new Error('Params array must contain at least one element')
+  }
+
+  const parseResult = EthersTransactionRequestSchema.safeParse(params[0])
+
+  if (!parseResult.success) {
+    throw new Error('First element of the array must match EthersTransactionRequestSchema')
+  }
+
+  const transaction = parseResult.data
+
+  return {
+    requestId,
+    method,
+    params,
+    transaction,
+  }
+})
+export type EthSendTransactionRequest = z.infer<typeof EthSendTransactionRequestSchema>
+
+export const PersonalSignRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('personal_sign'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+
+  if (params.length < 2) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least two elements',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const messageHex = z.string().parse(params[0])
+
+  try {
+    ethers.utils.toUtf8String(messageHex)
+  } catch {
+    throw new z.ZodError([
+      {
+        message: 'Message hex is not a valid hex string',
+        path: ['params', 'hexMessage'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const address = z.string().parse(params[1])
+
+  return {
+    requestId,
+    method,
+    params,
+    messageHex,
+    address,
+  }
+})
+
+export type PersonalSignRequest = z.infer<typeof PersonalSignRequestSchema>
+
+export const EthSignTransactionRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('eth_signTransaction'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+
+  if (params.length < 1) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least one element',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const parseResult = EthersTransactionRequestSchema.safeParse(params[0])
+  if (!parseResult.success) {
+    throw new z.ZodError([
+      {
+        message: 'First element of the array must match EthersTransactionRequestSchema',
+        path: ['params', '0'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+  const transaction = parseResult.data
+
+  return {
+    requestId,
+    method,
+    params,
+    transaction,
+  }
+})
+export type EthSignTransactionRequest = z.infer<typeof EthSignTransactionRequestSchema>
+
+export const EthSignTypedDataV4RequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('eth_signTypedData_v4'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+
+  if (params.length < 2) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least two elements',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const address = z.string().parse(params[0])
+  const typedData = z.string().parse(params[1])
+
+  const chainId = JSON.parse(typedData)?.domain?.chainId
+  const formattedChainId = HexadecimalNumberSchema.parse(chainId)
+  if (!formattedChainId) {
+    throw new z.ZodError([
+      {
+        message: 'Typed data must contain a chainId',
+        path: ['params', '1'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+  return {
+    requestId,
+    method,
+    params,
+    address,
+    typedData,
+  }
+})
+export type EthSignTypedDataV4Request = z.infer<typeof EthSignTypedDataV4RequestSchema>
+
+export const SwitchEthereumChainParameterSchema = z.object({
+  chainId: z.string(),
+})
+
+export const WalletSwitchEthereumChainRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('wallet_switchEthereumChain'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+  if (params.length < 1) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least one element',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const parseResult = SwitchEthereumChainParameterSchema.safeParse(params[0])
+  if (!parseResult.success) {
+    throw new z.ZodError([
+      {
+        message: 'Chain id should be specified as a hexadecimal string within object',
+        path: ['params', '0'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const { chainId } = parseResult.data
+
+  return {
+    requestId,
+    method,
+    params,
+    chainId,
+  }
+})
+export type WalletSwitchEthereumChainRequest = z.infer<typeof WalletSwitchEthereumChainRequestSchema>
+
+// eslint-disable-next-line no-restricted-syntax
+export const PermissionRequestSchema = z.record(z.record(z.any()))
+
+export const RequestedPermissionSchema = z.object({
+  parentCapability: z.string(), // name of the method for which the permission is requested
+  date: z.number().optional(), // in UNIX time
+})
+
+export const CaveatSchema = z.object({
+  type: z.string(),
+  // eslint-disable-next-line no-restricted-syntax
+  value: z.any(),
+})
+export type Caveat = z.infer<typeof CaveatSchema>
+
+export const PermissionSchema = z.object({
+  invoker: z.string(),
+  parentCapability: z.string(),
+  caveats: z.array(CaveatSchema),
+})
+export type Permission = z.infer<typeof PermissionSchema>
+
+export const WalletRequestPermissionsRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('wallet_requestPermissions'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+  if (params.length < 1) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least one element',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const permissions = PermissionRequestSchema.parse(params[0])
+
+  return {
+    requestId,
+    method,
+    params,
+    permissions,
+  }
+})
+
+export type WalletRequestPermissionsRequest = z.infer<typeof WalletRequestPermissionsRequestSchema>
+
+export const WalletRevokePermissionsRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('wallet_revokePermissions'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const { requestId, method, params } = data
+  if (params.length < 1) {
+    throw new z.ZodError([
+      {
+        message: 'Params array must contain at least one element',
+        path: ['params'],
+        code: ZodIssueCode.custom,
+      },
+    ])
+  }
+
+  const permissions = PermissionRequestSchema.parse(params[0])
+
+  return {
+    requestId,
+    method,
+    params,
+    permissions,
+  }
+})
+
+export type WalletRevokePermissionsRequest = z.infer<typeof WalletRevokePermissionsRequestSchema>
+
+export const WalletGetPermissionsRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('wallet_getPermissions'),
+})
+export type WalletGetPermissionsRequest = z.infer<typeof WalletGetPermissionsRequestSchema>
+
+export const UniswapOpenSidebarRequestSchema = EthereumRequestWithIdSchema.extend({
+  method: z.literal('uniswap_openSidebar'),
+  params: z.array(z.unknown()),
+}).transform((data) => {
+  const tab = z.nativeEnum(HomeTabs).optional().parse(data.params[0])
+  return {
+    ...data,
+    tab,
+  }
+})
+
+export type UniswapOpenSidebarRequest = z.infer<typeof UniswapOpenSidebarRequestSchema>
diff --git a/apps/extension/src/contentScript/ethereum.ts b/apps/extension/src/contentScript/ethereum.ts
new file mode 100644
index 00000000000..7864cb1953f
--- /dev/null
+++ b/apps/extension/src/contentScript/ethereum.ts
@@ -0,0 +1,84 @@
+import { addWindowMessageListener } from 'src/background/messagePassing/messageUtils'
+import { WindowEthereumProxy } from 'src/contentScript/WindowEthereumProxy'
+import { isValidContentScriptToProxyEmission } from 'src/contentScript/types'
+import { logger } from 'utilities/src/logger/logger'
+import { v4 as uuid } from 'uuid'
+
+// TODO(xtine): Get this working by importing the svg file directly. The svg text comes from packages/ui/src/assets/icons/uniswap-logo.svg
+const UNISWAP_LOGO = `data:image/svg+xml,${encodeURIComponent(`<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="96" height="96" rx="18" fill="#FEF4FF"/>
+<g filter="url(#filter0_d_12393_20043)">
+<path d="M71.9367 18.39C72.0482 16.4526 72.3145 15.1746 72.8497 14.0075C73.0616 13.5456 73.2601 13.1675 73.2907 13.1675C73.3214 13.1675 73.2293 13.5085 73.086 13.9252C72.6969 15.0578 72.633 16.607 72.901 18.4094C73.2413 20.6963 73.4348 21.0263 75.8841 23.4967C77.0329 24.6554 78.3692 26.1168 78.8536 26.7443L79.7343 27.8851L78.8536 27.0698C77.7764 26.0728 75.2992 24.1283 74.7521 23.8503C74.3852 23.6639 74.3306 23.6671 74.1043 23.8894C73.8958 24.0943 73.8519 24.4021 73.8229 25.8572C73.7778 28.125 73.4646 29.5807 72.7087 31.0362C72.2998 31.8234 72.2354 31.6554 72.6053 30.7668C72.8816 30.1034 72.9096 29.8117 72.9076 27.6163C72.9033 23.2052 72.3727 22.1447 69.2607 20.3281C68.4724 19.8678 67.1734 19.2041 66.3742 18.8531C65.575 18.502 64.9401 18.1962 64.9633 18.1734C65.0514 18.0868 68.0863 18.961 69.3077 19.4247C71.1247 20.1145 71.4247 20.2039 71.6454 20.1207C71.7933 20.0649 71.8648 19.6398 71.9367 18.39Z" fill="#F50DB4"/>
+<path d="M33.5466 11.9727C32.4688 11.808 32.4233 11.7887 32.9306 11.7119C33.9026 11.5647 36.1979 11.7653 37.7796 12.1358C41.4722 13.0004 44.8322 15.2153 48.4188 19.1488L49.3717 20.1938L50.7348 19.978C56.4773 19.0689 62.3192 19.7914 67.2054 22.0148C68.5495 22.6265 70.6689 23.8441 70.9337 24.157C71.018 24.2568 71.173 24.8987 71.2779 25.5837C71.6408 27.9534 71.4591 29.7699 70.7234 31.1265C70.3229 31.8648 70.3006 32.0988 70.5698 32.7306C70.7847 33.2348 71.3838 33.608 71.9771 33.6072C73.1913 33.6056 74.4983 31.6721 75.1038 28.9818L75.3443 27.9131L75.8209 28.4448C78.4346 31.3619 80.4876 35.34 80.8403 38.1716L80.9321 38.9099L80.4928 38.2387C79.7366 37.0838 78.9769 36.2976 78.0041 35.6635C76.2504 34.5205 74.3961 34.1315 69.4853 33.8766C65.0501 33.6464 62.5399 33.2732 60.0509 32.4737C55.816 31.1137 53.6812 29.3023 48.6508 22.8012C46.4164 19.9135 45.0354 18.3159 43.6616 17.0293C40.5401 14.1058 37.4729 12.5726 33.5466 11.9727Z" fill="#F50DB4"/>
+<path d="M35.6404 25.9564C33.4522 22.9889 32.0983 18.4391 32.3914 15.0379L32.482 13.9854L32.9801 14.0749C33.9155 14.243 35.5283 14.8343 36.2835 15.2861C38.3559 16.5259 39.253 18.1582 40.1658 22.3496C40.4332 23.5773 40.7839 24.9666 40.9454 25.437C41.2052 26.194 42.1871 27.9624 42.9854 29.1109C43.5605 29.938 43.1785 30.33 41.9074 30.217C39.9662 30.0444 37.3367 28.2568 35.6404 25.9564Z" fill="#F50DB4"/>
+<path d="M69.2799 48.0419C59.0538 43.9862 55.4521 40.4658 55.4521 34.5259C55.4521 33.6517 55.4827 32.9365 55.5199 32.9365C55.5572 32.9365 55.9528 33.225 56.3991 33.5776C58.4728 35.216 60.7949 35.9157 67.2233 36.8395C71.0061 37.3831 73.1349 37.8222 75.0986 38.4637C81.3402 40.5027 85.2018 44.6406 86.1227 50.2766C86.3903 51.9143 86.2334 54.9854 85.7995 56.6039C85.457 57.8824 84.4118 60.1868 84.1346 60.2751C84.0578 60.2996 83.9824 60.0094 83.9626 59.6147C83.8575 57.4983 82.7718 55.438 80.9485 53.8946C78.8754 52.1399 76.0901 50.7428 69.2799 48.0419Z" fill="#F50DB4"/>
+<path d="M62.1008 49.7268C61.9727 48.9758 61.7505 48.0167 61.607 47.5954L61.3461 46.8296L61.8307 47.3655C62.5014 48.107 63.0314 49.0559 63.4806 50.3197C63.8234 51.2843 63.862 51.5711 63.8594 53.1386C63.8568 54.6774 63.814 55 63.4974 55.8682C62.9983 57.2373 62.3788 58.208 61.3392 59.2501C59.4712 61.1228 57.0696 62.1596 53.6039 62.5896C53.0015 62.6643 51.2456 62.7902 49.7019 62.8693C45.8118 63.0686 43.2515 63.4803 40.9508 64.276C40.6201 64.3905 40.3247 64.4601 40.2948 64.4305C40.2017 64.3393 41.768 63.4195 43.0618 62.8056C44.8862 61.94 46.7021 61.4676 50.7709 60.8002C52.7809 60.4704 54.8566 60.0704 55.3837 59.9112C60.3612 58.4079 62.9197 54.5286 62.1008 49.7268Z" fill="#F50DB4"/>
+<path d="M66.7886 57.9275C65.4299 55.0505 65.1179 52.2726 65.8623 49.6821C65.942 49.4053 66.07 49.1787 66.1471 49.1787C66.224 49.1787 66.5447 49.3495 66.8594 49.5581C67.4855 49.9732 68.7412 50.6725 72.0866 52.4692C76.2612 54.7111 78.6414 56.4472 80.2599 58.4306C81.6775 60.1677 82.5547 62.1459 82.9769 64.5583C83.2159 65.9248 83.0759 69.2128 82.7199 70.5889C81.5975 74.9275 78.9889 78.3356 75.2682 80.3242C74.7231 80.6155 74.2337 80.8547 74.1807 80.8558C74.1278 80.8569 74.3264 80.3594 74.6222 79.7503C75.8738 77.173 76.0163 74.6661 75.07 71.8756C74.4906 70.1671 73.3092 68.0823 70.924 64.5588C68.1507 60.4623 67.4708 59.3721 66.7886 57.9275Z" fill="#F50DB4"/>
+<path d="M28.3782 73.4506C32.173 70.2943 36.8948 68.0521 41.1958 67.3639C43.0494 67.0672 46.1372 67.185 47.8537 67.6178C50.605 68.3113 53.0662 69.8648 54.3462 71.7156C55.5971 73.5245 56.1338 75.1008 56.6925 78.6081C56.913 79.9916 57.1527 81.3809 57.2252 81.6954C57.6449 83.5131 58.4614 84.966 59.4733 85.6957C61.0805 86.8544 63.8479 86.9265 66.5704 85.8804C67.0325 85.7028 67.4336 85.5801 67.4618 85.6078C67.5605 85.7044 66.1896 86.6083 65.2225 87.0842C63.9212 87.7245 62.8864 87.972 61.5115 87.972C59.0181 87.972 56.948 86.7226 55.2206 84.175C54.8807 83.6736 54.1167 82.1718 53.5228 80.8378C51.699 76.7403 50.7984 75.4921 48.6809 74.126C46.8381 72.9374 44.4615 72.7245 42.6736 73.588C40.325 74.7223 39.6698 77.6786 41.3518 79.5521C42.0204 80.2967 43.2671 80.939 44.2865 81.0638C46.1936 81.2975 47.8326 79.8684 47.8326 77.9717C47.8326 76.7402 47.352 76.0374 46.1423 75.4996C44.4901 74.7652 42.7141 75.6237 42.7226 77.1526C42.7263 77.8045 43.0145 78.214 43.6779 78.5097C44.1036 78.6994 44.1134 78.7144 43.7664 78.6434C42.2504 78.3337 41.8952 76.5335 43.1141 75.3383C44.5776 73.9036 47.6037 74.5367 48.6428 76.4951C49.0794 77.3177 49.1301 78.956 48.7495 79.9452C47.8976 82.1593 45.4138 83.3237 42.8941 82.6901C41.1787 82.2587 40.4801 81.7915 38.4119 79.6931C34.8179 76.0462 33.4226 75.3396 28.2413 74.5428L27.2484 74.3902L28.3782 73.4506Z" fill="#F50DB4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5147 8.18128C23.517 22.5305 31.7835 28.4507 32.7022 29.7015C33.4607 30.7343 33.1752 31.6628 31.8758 32.3905C31.1532 32.7951 29.6676 33.205 28.9238 33.205C28.0825 33.205 27.7936 32.8853 27.7936 32.8853C27.3058 32.4296 27.0311 32.5093 24.5261 28.1293C21.0483 22.8137 18.1379 18.4041 18.0585 18.3303C17.8749 18.1596 17.878 18.1653 24.1715 29.2574C25.1883 31.5693 24.3737 32.4179 24.3737 32.7471C24.3737 33.417 24.1882 33.7691 23.3494 34.6907C21.951 36.2274 21.3259 37.954 20.8746 41.5274C20.3687 45.5332 18.9462 48.3629 15.0041 53.2057C12.6965 56.0406 12.3189 56.5602 11.7366 57.7028C11.0032 59.1416 10.8015 59.9475 10.7198 61.7645C10.6334 63.6855 10.8016 64.9265 11.3975 66.7632C11.9191 68.3712 12.4636 69.433 13.8555 71.5567C15.0568 73.3894 15.7484 74.7513 15.7484 75.2841C15.7484 75.708 15.8306 75.7085 17.692 75.2945C22.1466 74.3036 25.7638 72.5609 27.7981 70.4252C29.0571 69.1033 29.3527 68.3733 29.3623 66.5619C29.3686 65.377 29.3263 65.1289 29.0011 64.4473C28.4718 63.3379 27.5083 62.4154 25.3845 60.9853C22.6019 59.1115 21.4133 57.603 21.085 55.5285C20.8157 53.8263 21.1282 52.6253 22.6676 49.4472C24.2609 46.1575 24.6558 44.7557 24.9229 41.4399C25.0954 39.2977 25.3343 38.4528 25.9591 37.7747C26.6108 37.0676 27.1975 36.8281 28.8103 36.611C31.4396 36.2572 33.1139 35.5871 34.4901 34.3379C35.6839 33.2543 36.1835 32.2101 36.2602 30.6382L36.3184 29.4468L35.6512 28.6806C33.2352 25.9057 9.89667 6 9.74799 6C9.71623 6 10.5113 6.98164 11.5147 8.18128ZM17.1047 63.9381C17.6509 62.9852 17.3607 61.7601 16.447 61.1617C15.5836 60.5962 14.2424 60.8625 14.2424 61.5994C14.2424 61.8243 14.3687 61.9879 14.6532 62.1322C15.1322 62.375 15.167 62.648 14.7901 63.2061C14.4084 63.7712 14.4392 64.2681 14.877 64.6057C15.5826 65.15 16.5815 64.8507 17.1047 63.9381Z" fill="#F50DB4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.9777 37.236C36.7433 37.6095 35.5435 38.8981 35.172 40.2493C34.9454 41.0736 35.074 42.5196 35.4134 42.9662C35.9617 43.6874 36.492 43.8774 37.9277 43.8675C40.7388 43.8482 43.1825 42.6606 43.4666 41.176C43.6994 39.9591 42.6262 38.2726 41.1478 37.5321C40.385 37.1502 38.7626 36.9987 37.9777 37.236ZM41.2638 39.7671C41.6973 39.1604 41.5076 38.5047 40.7704 38.0611C39.3664 37.2167 37.2432 37.9155 37.2432 39.222C37.2432 39.8724 38.3504 40.5819 39.3653 40.5819C40.0408 40.5819 40.9652 40.1851 41.2638 39.7671Z" fill="#F50DB4"/>
+</g>
+</svg>`)}`
+const UNISWAP_NAME = 'Uniswap Extension'
+const UNISWAP_RDNS = 'org.uniswap.app'
+
+declare global {
+  interface Window {
+    isStretchInstalled?: boolean
+    ethereum?: WindowEthereumProxy
+  }
+}
+
+enum EIP6963EventNames {
+  Announce = 'eip6963:announceProvider',
+  Request = 'eip6963:requestProvider',
+}
+
+interface EIP6963ProviderInfo {
+  uuid: string
+  name: string
+  icon: string
+  rdns: string
+}
+
+const uniswapProvider = new WindowEthereumProxy()
+window.ethereum = uniswapProvider
+
+addWindowMessageListener(isValidContentScriptToProxyEmission, (message) => {
+  logger.debug('ethereum.ts', `Emitting ${message.emitKey} via WindowEthereumProxy`, message.emitValue)
+  uniswapProvider.emit(message.emitKey, message.emitValue)
+})
+function announceProvider(): void {
+  const info: EIP6963ProviderInfo = {
+    uuid: uuid(),
+    name: UNISWAP_NAME,
+    icon: UNISWAP_LOGO,
+    rdns: UNISWAP_RDNS,
+  }
+
+  window.dispatchEvent(
+    new CustomEvent(EIP6963EventNames.Announce, {
+      detail: Object.freeze({ info, provider: uniswapProvider }),
+    }),
+  )
+}
+
+window.addEventListener(EIP6963EventNames.Request, (event) => {
+  if (!isValidRequestProviderEvent(event)) {
+    throw new Error(
+      `Invalid EIP-6963 RequestProviderEvent object received from ${EIP6963EventNames.Request} event. See https://eips.ethereum.org/EIPS/eip-6963 for requirements.`,
+    )
+  }
+
+  announceProvider()
+})
+
+announceProvider()
+
+type EIP6963RequestProviderEvent = Event & {
+  type: EIP6963EventNames.Request
+}
+
+function isValidRequestProviderEvent(event: unknown): event is EIP6963RequestProviderEvent {
+  return event instanceof Event && event.type === EIP6963EventNames.Request
+}
diff --git a/apps/extension/src/contentScript/index.tsx b/apps/extension/src/contentScript/index.tsx
new file mode 100644
index 00000000000..96d0a1de30d
--- /dev/null
+++ b/apps/extension/src/contentScript/index.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+import { createRoot } from 'react-dom/client'
+
+const container = document.createElement('div')
+container.id = 'crx-root'
+document.body.append(container)
+
+const root = createRoot(container)
+root.render(<React.StrictMode />)
diff --git a/apps/extension/src/contentScript/injected.test.ts b/apps/extension/src/contentScript/injected.test.ts
new file mode 100644
index 00000000000..859888dd8a8
--- /dev/null
+++ b/apps/extension/src/contentScript/injected.test.ts
@@ -0,0 +1,11 @@
+jest.mock('src/background/messagePassing/messageChannels')
+
+describe('injected', () => {
+  it('should run without throwing an error', () => {
+    // This does not exist in the extension execution environment for content scripts
+    Object.defineProperty(document, 'head', { value: undefined, writable: true })
+
+    const injected = require('./injected')
+    expect(injected).toBeTruthy()
+  })
+})
diff --git a/apps/extension/src/contentScript/injected.ts b/apps/extension/src/contentScript/injected.ts
new file mode 100644
index 00000000000..85ad15cc1cf
--- /dev/null
+++ b/apps/extension/src/contentScript/injected.ts
@@ -0,0 +1,267 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { dappStore } from 'src/app/features/dapp/store'
+import { getOrderedConnectedAddresses } from 'src/app/features/dapp/utils'
+import { backgroundStore } from 'src/background/backgroundStore'
+import {
+  contentScriptUtilityMessageChannel,
+  externalDappMessageChannel,
+} from 'src/background/messagePassing/messageChannels'
+import { addWindowMessageListener } from 'src/background/messagePassing/messageUtils'
+import {
+  ContentScriptUtilityMessageType,
+  ErrorLog,
+  ExtensionToDappRequestType,
+  InfoLog,
+} from 'src/background/messagePassing/types/requests'
+import { ExtensionEthMethodHandler } from 'src/contentScript/methodHandlers/ExtensionEthMethodHandler'
+import { ProviderDirectMethodHandler } from 'src/contentScript/methodHandlers/ProviderDirectMethodHandler'
+import { UniswapMethodHandler } from 'src/contentScript/methodHandlers/UniswapMethodHandler'
+import { emitAccountsChanged, emitChainChanged } from 'src/contentScript/methodHandlers/emitUtils'
+import { ExtensionEthMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import {
+  isDeprecatedMethod,
+  isExtensionEthMethod,
+  isProviderDirectMethod,
+  isUniswapMethod,
+  isUnsupportedMethod,
+  postDeprecatedMethodError,
+  postParsingError,
+  postUnknownMethodError,
+} from 'src/contentScript/methodHandlers/utils'
+import { WindowEthereumRequest, isValidWindowEthereumRequest } from 'src/contentScript/types'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { RPCType } from 'uniswap/src/types/chains'
+import { logger } from 'utilities/src/logger/logger'
+import { arraysAreEqual } from 'utilities/src/primitives/array'
+import { walletContextValue } from 'wallet/src/features/wallet/context'
+
+import { getValidAddress } from 'uniswap/src/utils/addresses'
+import { ZodError } from 'zod'
+
+let _provider: JsonRpcProvider | undefined
+let _chainId: string | undefined
+let connectedAddresses: Address[] | undefined
+const dappUrl = window.origin
+
+const getChainId = (): string | undefined => {
+  const storedChainId = dappStore.getDappInfo(dappUrl)?.lastChainId
+
+  if (_chainId === undefined && storedChainId) {
+    _chainId = chainIdToHexadecimalString(storedChainId)
+  }
+
+  return _chainId
+}
+
+const getProvider = (): JsonRpcProvider | undefined => _provider
+const getConnectedAddresses = (): Address[] | undefined => {
+  const storedDappInfo = dappStore.getDappInfo(dappUrl)
+  const storedConnectedAddresses =
+    storedDappInfo &&
+    getOrderedConnectedAddresses(storedDappInfo.connectedAccounts, storedDappInfo.activeConnectedAddress)
+  return connectedAddresses ?? storedConnectedAddresses
+}
+
+const setProvider = (newProvider: JsonRpcProvider): void => {
+  _provider = newProvider
+}
+const setChainIdAndMaybeEmit = (newChainId: string): void => {
+  // Only emit if the chain have changed, and it's not the first time
+  if (_chainId !== undefined && _chainId !== newChainId) {
+    emitChainChanged(newChainId)
+  }
+  _chainId = newChainId
+}
+
+const setConnectedAddressesAndMaybeEmit = (newConnectedAddresses: Address[]): void => {
+  // Only emit if the addresses have changed, and it's not the first time
+  const normalizedNewAddresses: Address[] = newConnectedAddresses
+    .map((address) => getValidAddress(address))
+    .filter((normalizedAddress): normalizedAddress is Address => normalizedAddress !== null)
+
+  if (!connectedAddresses || !arraysAreEqual(connectedAddresses, normalizedNewAddresses)) {
+    emitAccountsChanged(normalizedNewAddresses)
+  }
+  connectedAddresses = normalizedNewAddresses
+}
+
+const extensionEthMethodHandler = new ExtensionEthMethodHandler(
+  getChainId,
+  getProvider,
+  getConnectedAddresses,
+  setChainIdAndMaybeEmit,
+  setProvider,
+  setConnectedAddressesAndMaybeEmit,
+)
+const providerDirectMethodHandler = new ProviderDirectMethodHandler(
+  getChainId,
+  getProvider,
+  getConnectedAddresses,
+  setChainIdAndMaybeEmit,
+  setProvider,
+  setConnectedAddressesAndMaybeEmit,
+)
+
+const uniswapMethodHandler = new UniswapMethodHandler(
+  getChainId,
+  getProvider,
+  getConnectedAddresses,
+  setChainIdAndMaybeEmit,
+  setProvider,
+  setConnectedAddressesAndMaybeEmit,
+)
+
+addWindowMessageListener<WindowEthereumRequest>(isValidWindowEthereumRequest, async (request, source) => {
+  logger.debug('injected.ts', 'Request received for method', JSON.stringify(request), _provider)
+
+  if (!backgroundStore.state.isOnboarded) {
+    rejectRequestNotOnboarded(request, source).catch((error) =>
+      logError(
+        error?.message ?? 'Error rejecting request when not onboarded',
+        'injected.ts',
+        'WindowEthereumRequestListener',
+      ),
+    )
+    return
+  }
+
+  if (isProviderDirectMethod(request.method)) {
+    // Provider methods are handled directly by the provider instance
+    // (avoiding roundtrip to background service worker)
+    providerDirectMethodHandler.handleRequest(request, source)
+    return
+  }
+
+  if (isUniswapMethod(request.method)) {
+    try {
+      await uniswapMethodHandler.handleRequest(request, source)
+    } catch (e) {
+      if (e instanceof ZodError) {
+        postParsingError(source, request.requestId, request.method)
+      }
+      const errorMessage = e instanceof Error ? e.message : 'Unknown error'
+      await logError(errorMessage, 'injected.ts', 'WindowEthereumRequest')
+    }
+    return
+  }
+
+  if (isExtensionEthMethod(request.method)) {
+    try {
+      await extensionEthMethodHandler.handleRequest(request, source)
+    } catch (e) {
+      if (e instanceof ZodError) {
+        postParsingError(source, request.requestId, request.method)
+      }
+      const errorMessage = e instanceof Error ? e.message : 'Unknown error'
+      await logError(errorMessage, 'injected.ts', 'WindowEthereumRequest')
+    }
+    return
+  }
+
+  if (isDeprecatedMethod(request.method)) {
+    postDeprecatedMethodError(source, request.requestId, request.method)
+    await logInfo('injected.ts', 'WindowEthereumRequest', 'Deprecated method', {
+      method: request.method,
+      dappUrl,
+    })
+    return
+  }
+
+  if (isUnsupportedMethod(request.method)) {
+    postUnknownMethodError(source, request.requestId, request.method)
+    await logInfo('injected.ts', 'WindowEthereumRequest', 'Unsupported method', {
+      method: request.method,
+      dappUrl,
+    })
+    return
+  }
+
+  // Handle any methods we don't know how to handle and are not in the metamask API
+  await logInfo('injected.ts', 'WindowEthereumRequest', 'Unrecognized method', {
+    method: request.method,
+    dappUrl,
+  })
+  postUnknownMethodError(source, request.requestId, request.method)
+})
+
+externalDappMessageChannel.addMessageListener(ExtensionToDappRequestType.SwitchChain, (message) => {
+  setChainIdAndMaybeEmit(message.chainId)
+  setProvider(new JsonRpcProvider(message.providerUrl))
+})
+
+externalDappMessageChannel.addMessageListener(ExtensionToDappRequestType.UpdateConnections, (message) => {
+  setConnectedAddressesAndMaybeEmit(message.addresses)
+})
+
+async function init(): Promise<void> {
+  try {
+    await Promise.all([backgroundStore.init(), dappStore.init()])
+
+    const chainId = getChainId()
+    const provider = getProvider()
+
+    if (chainId && !provider) {
+      const chainIdNum = parseInt(chainId, 16)
+      const defaultProvider = walletContextValue.providers.getProvider(chainIdNum, RPCType.Public)
+      setProvider(defaultProvider)
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error'
+    await logError(errorMessage, 'injected.ts', 'init')
+  }
+}
+
+/** Helper function to reject all requests from dapps when the extension is not onboarded. */
+async function rejectRequestNotOnboarded(
+  request: WindowEthereumRequest,
+  source: MessageEventSource | null,
+): Promise<void> {
+  if (
+    request.method === ExtensionEthMethods.eth_requestAccounts ||
+    request.method === ExtensionEthMethods.wallet_requestPermissions
+  ) {
+    await contentScriptUtilityMessageChannel.sendMessage({
+      type: ContentScriptUtilityMessageType.FocusOnboardingTab,
+    })
+  }
+
+  source?.postMessage({
+    requestId: request.requestId,
+    error: serializeError(providerErrors.userRejectedRequest()),
+  })
+}
+
+init().catch(() => {})
+
+async function logError(
+  errorMessage: string,
+  fileName: string,
+  functionName: string,
+  tags?: Record<string, string>,
+): Promise<void> {
+  const message: ErrorLog = {
+    type: ContentScriptUtilityMessageType.ErrorLog,
+    message: errorMessage,
+    fileName,
+    functionName,
+    tags,
+  }
+  await contentScriptUtilityMessageChannel.sendMessage(message)
+}
+
+async function logInfo(
+  fileName: string,
+  functionName: string,
+  message: string,
+  tags: Record<string, string>,
+): Promise<void> {
+  const logMessage: InfoLog = {
+    type: ContentScriptUtilityMessageType.InfoLog,
+    fileName,
+    functionName,
+    message,
+    tags,
+  }
+  await contentScriptUtilityMessageChannel.sendMessage(logMessage)
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/BaseMethodHandler.ts b/apps/extension/src/contentScript/methodHandlers/BaseMethodHandler.ts
new file mode 100644
index 00000000000..e9bd18c2baa
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/BaseMethodHandler.ts
@@ -0,0 +1,16 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { WindowEthereumRequest } from 'src/contentScript/types'
+
+export abstract class BaseMethodHandler<T extends WindowEthereumRequest> {
+  constructor(
+    protected readonly getChainId: () => string | undefined,
+    protected readonly getProvider: () => JsonRpcProvider | undefined,
+    protected readonly getConnectedAddresses: () => Address[] | undefined,
+    protected readonly setChainIdAndMaybeEmit: (newChainId: string) => void,
+    protected readonly setProvider: (newProvider: JsonRpcProvider) => void,
+    protected readonly setConnectedAddressesAndMaybeEmit: (newConnectedAddresses: Address[]) => void,
+  ) {}
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  handleRequest(request: T, source: MessageEventSource | null): void {}
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/ExtensionEthMethodHandler.ts b/apps/extension/src/contentScript/methodHandlers/ExtensionEthMethodHandler.ts
new file mode 100644
index 00000000000..e62c7871e2a
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/ExtensionEthMethodHandler.ts
@@ -0,0 +1,483 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { getPermissions } from 'src/app/features/dappRequests/permissions'
+import {
+  DappRequestType,
+  DappResponseType,
+  SendTransactionRequest,
+} from 'src/app/features/dappRequests/types/DappRequestTypes'
+import { extractBaseUrl } from 'src/app/features/dappRequests/utils'
+import {
+  contentScriptToBackgroundMessageChannel,
+  dappResponseMessageChannel,
+} from 'src/background/messagePassing/messageChannels'
+import getCalldataInfoFromTransaction from 'src/background/utils/getCalldataInfoFromTransaction'
+import {
+  EthAccountsRequest,
+  EthAccountsRequestSchema,
+  EthChainIdRequest,
+  EthChainIdRequestSchema,
+  EthRequestAccountsRequest,
+  EthRequestAccountsRequestSchema,
+  EthSendTransactionRequest,
+  EthSendTransactionRequestSchema,
+  EthSignTypedDataV4Request,
+  EthSignTypedDataV4RequestSchema,
+  PersonalSignRequest,
+  PersonalSignRequestSchema,
+  WalletGetPermissionsRequest,
+  WalletGetPermissionsRequestSchema,
+  WalletRequestPermissionsRequest,
+  WalletRequestPermissionsRequestSchema,
+  WalletRevokePermissionsRequest,
+  WalletRevokePermissionsRequestSchema,
+  WalletSwitchEthereumChainRequest,
+  WalletSwitchEthereumChainRequestSchema,
+} from 'src/contentScript/WindowEthereumRequestTypes'
+import { BaseMethodHandler } from 'src/contentScript/methodHandlers/BaseMethodHandler'
+import { ExtensionEthMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import { PendingResponseInfo } from 'src/contentScript/methodHandlers/types'
+import { getPendingResponseInfo, postUnauthorizedError } from 'src/contentScript/methodHandlers/utils'
+import { WindowEthereumRequest } from 'src/contentScript/types'
+import { chainIdToHexadecimalString } from 'uniswap/src/features/chains/utils'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { areAddressesEqual } from 'uniswap/src/utils/addresses'
+
+export class ExtensionEthMethodHandler extends BaseMethodHandler<WindowEthereumRequest> {
+  private readonly requestIdToSourceMap: Map<string, PendingResponseInfo> = new Map()
+
+  constructor(
+    getChainId: () => string | undefined,
+    getProvider: () => JsonRpcProvider | undefined,
+    getConnectedAddresses: () => Address[] | undefined,
+    setChainIdAndMaybeEmit: (newChainId: string) => void,
+    setProvider: (newProvider: JsonRpcProvider) => void,
+    setConnectedAddressesAndMaybeEmit: (newConnectedAddresses: Address[]) => void,
+  ) {
+    super(
+      getChainId,
+      getProvider,
+      getConnectedAddresses,
+      setChainIdAndMaybeEmit,
+      setProvider,
+      setConnectedAddressesAndMaybeEmit,
+    )
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.AccountResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.AccountResponse,
+      )?.source
+
+      this.handleDappUpdate(message.connectedAddresses, message.chainId, message.providerUrl)
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.connectedAddresses,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.ChainIdResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.ChainIdResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.chainId,
+      })
+
+      const chainId = this.getChainId()
+      if (!chainId) {
+        window.postMessage({
+          emitKey: 'connect',
+          emitValue: {
+            chainId: message.chainId,
+          },
+        })
+      }
+
+      this.setChainIdAndMaybeEmit(message.chainId)
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.ChainChangeResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.ChainChangeResponse,
+      )?.source
+
+      this.setChainIdAndMaybeEmit(message.chainId)
+      this.setProvider(new JsonRpcProvider(message.providerUrl))
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.chainId,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.SendTransactionResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.SendTransactionResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.transactionResponse.hash,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.SignMessageResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.SignMessageResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.signature,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.SignTransactionResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.SignTransactionResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.signedTransactionHash,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.SignTypedDataResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.SignTypedDataResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.signature,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.RequestPermissionsResponse, (message) => {
+      if (message.accounts) {
+        const { connectedAddresses, chainId, providerUrl } = message.accounts
+        this.handleDappUpdate(connectedAddresses, chainId, providerUrl)
+      }
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.RequestPermissionsResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: message.permissions,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.RevokePermissionsResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.RevokePermissionsResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+        result: null,
+      })
+    })
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.ErrorResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.ErrorResponse,
+      )?.source
+
+      source?.postMessage(message)
+    })
+  }
+
+  private isAuthorized(): boolean {
+    const connectedAddresses = this.getConnectedAddresses()
+    return !!connectedAddresses?.length
+  }
+
+  private isConnectedToDapp(): boolean {
+    // Fields that should be populated for connected dapps
+    return Boolean(this.getConnectedAddresses()?.length && this.getChainId() && this.getProvider())
+  }
+
+  private handleDappUpdate(connectedAddresses: string[], chainId: string, providerUrl: string): void {
+    this.setConnectedAddressesAndMaybeEmit(connectedAddresses)
+    this.setChainIdAndMaybeEmit(chainId)
+    this.setProvider(new JsonRpcProvider(providerUrl))
+  }
+
+  async handleRequest(request: WindowEthereumRequest, source: MessageEventSource | null): Promise<void> {
+    switch (request.method) {
+      case ExtensionEthMethods.eth_chainId: {
+        const ethChainIdRequest = EthChainIdRequestSchema.parse(request)
+        await this.handleEthChainIdRequest(ethChainIdRequest, source)
+        break
+      }
+      case ExtensionEthMethods.eth_requestAccounts: {
+        const parsedRequest = EthRequestAccountsRequestSchema.parse(request)
+        await this.handleEthRequestAccounts(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.eth_accounts: {
+        const parsedRequest = EthAccountsRequestSchema.parse(request)
+        await this.handleEthAccounts(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.eth_sendTransaction: {
+        if (!this.isAuthorized()) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+        const parsedRequest = EthSendTransactionRequestSchema.parse(request)
+        await this.handleEthSendTransaction(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.wallet_switchEthereumChain: {
+        if (!this.isAuthorized()) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+        const parsedRequest = WalletSwitchEthereumChainRequestSchema.parse(request)
+        await this.handleWalletSwitchEthereumChain(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.wallet_getPermissions: {
+        const parsedRequest = WalletGetPermissionsRequestSchema.parse(request)
+        await this.handleWalletGetPermissions(parsedRequest, source)
+        break
+      }
+
+      case ExtensionEthMethods.wallet_requestPermissions: {
+        const parsedRequest = WalletRequestPermissionsRequestSchema.parse(request)
+        await this.handleWalletRequestPermissions(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.wallet_revokePermissions: {
+        const parsedRequest = WalletRevokePermissionsRequestSchema.parse(request)
+        await this.handleWalletRevokePermissions(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.personal_sign: {
+        if (!this.isAuthorized()) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+
+        const parsedRequest = PersonalSignRequestSchema.parse(request)
+        if (!this.isValidRequestAddress(parsedRequest.address)) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+
+        await this.handlePersonalSign(parsedRequest, source)
+        break
+      }
+      case ExtensionEthMethods.eth_signTypedData_v4: {
+        if (!this.isAuthorized()) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+
+        const parsedRequest = EthSignTypedDataV4RequestSchema.parse(request)
+        if (!this.isValidRequestAddress(parsedRequest.address)) {
+          postUnauthorizedError(source, request.requestId)
+          return
+        }
+
+        await this.handleEthSignTypedData(parsedRequest, source)
+        break
+      }
+    }
+  }
+
+  async handleEthChainIdRequest(request: EthChainIdRequest, source: MessageEventSource | null): Promise<void> {
+    // Defaults to mainnet for unconnected dapps
+    const chainId = this.getChainId() ?? chainIdToHexadecimalString(UniverseChainId.Mainnet)
+
+    source?.postMessage({
+      requestId: request.requestId,
+      result: chainId,
+    })
+    return
+  }
+
+  async handleEthRequestAccounts(request: EthRequestAccountsRequest, source: MessageEventSource | null): Promise<void> {
+    const connectedAddresses = this.getConnectedAddresses()
+
+    if (connectedAddresses?.length && this.isConnectedToDapp()) {
+      source?.postMessage({
+        requestId: request.requestId,
+        result: connectedAddresses,
+      })
+      return
+    }
+
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.AccountResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.RequestAccount,
+      requestId: request.requestId,
+    })
+  }
+
+  async handleEthAccounts(request: EthAccountsRequest, source: MessageEventSource | null): Promise<void> {
+    const connectedAddresses = this.getConnectedAddresses()
+
+    if (connectedAddresses?.length && this.isConnectedToDapp()) {
+      source?.postMessage({
+        requestId: request.requestId,
+        result: connectedAddresses,
+      })
+      return
+    }
+
+    postUnauthorizedError(source, request.requestId)
+  }
+
+  async handleEthSendTransaction(request: EthSendTransactionRequest, source: MessageEventSource | null): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.SendTransactionResponse,
+      source,
+    })
+
+    const sendTransactionRequest: SendTransactionRequest = {
+      type: DappRequestType.SendTransaction,
+      requestId: request.requestId,
+      transaction: adaptTransactionForEthers(request.transaction),
+    }
+
+    // native transactions like native send will not have populated data field
+    const requestIncludesData = Boolean(request.transaction.data)
+
+    if (requestIncludesData && request.transaction.data !== '0x') {
+      Object.assign(sendTransactionRequest, getCalldataInfoFromTransaction(request.transaction))
+    }
+
+    await contentScriptToBackgroundMessageChannel.sendMessage(sendTransactionRequest)
+  }
+
+  async handlePersonalSign(request: PersonalSignRequest, source: MessageEventSource | null): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.SignMessageResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.SignMessage,
+      requestId: request.requestId,
+      messageHex: request.messageHex,
+      address: request.address,
+    })
+  }
+
+  async handleEthSignTypedData(request: EthSignTypedDataV4Request, source: MessageEventSource | null): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.SignTypedDataResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.SignTypedData,
+      requestId: request.requestId,
+      typedData: request.typedData,
+      address: request.address,
+    })
+  }
+
+  async handleWalletSwitchEthereumChain(
+    request: WalletSwitchEthereumChainRequest,
+    source: MessageEventSource | null,
+  ): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.ChainChangeResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.ChangeChain,
+      requestId: request.requestId,
+      chainId: request.chainId,
+    })
+  }
+
+  async handleWalletGetPermissions(
+    request: WalletGetPermissionsRequest,
+    source: MessageEventSource | null,
+  ): Promise<void> {
+    const dappUrl = extractBaseUrl(window.origin)
+    const connectedAddresses = this.getConnectedAddresses()
+
+    const permissions = getPermissions(dappUrl, connectedAddresses)
+
+    source?.postMessage({
+      requestId: request.requestId,
+      result: permissions,
+    })
+  }
+
+  async handleWalletRequestPermissions(
+    request: WalletRequestPermissionsRequest,
+    source: MessageEventSource | null,
+  ): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.RequestPermissionsResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.RequestPermissions,
+      requestId: request.requestId,
+      permissions: request.permissions,
+    })
+  }
+
+  async handleWalletRevokePermissions(
+    request: WalletRevokePermissionsRequest,
+    source: MessageEventSource | null,
+  ): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      type: DappResponseType.RevokePermissionsResponse,
+      source,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.RevokePermissions,
+      requestId: request.requestId,
+      permissions: request.permissions,
+    })
+  }
+
+  private isValidRequestAddress(address: string): boolean {
+    return (this.getConnectedAddresses() ?? []).some((connectedAddress) => areAddressesEqual(connectedAddress, address))
+  }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function adaptTransactionForEthers(transaction: any): any {
+  if (typeof transaction.chainId === 'string') {
+    transaction.chainId = parseInt(transaction.chainId, 16)
+  }
+  return transaction
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/ProviderDirectMethodHandler.ts b/apps/extension/src/contentScript/methodHandlers/ProviderDirectMethodHandler.ts
new file mode 100644
index 00000000000..676c9446a8f
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/ProviderDirectMethodHandler.ts
@@ -0,0 +1,115 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { BigNumber } from 'ethers'
+import { BaseMethodHandler } from 'src/contentScript/methodHandlers/BaseMethodHandler'
+import { ProviderDirectMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import { WindowEthereumRequest } from 'src/contentScript/types'
+import { logger } from 'utilities/src/logger/logger'
+
+/**
+ * Handles all provider direct requests
+ * Maps Ethereum JSON-RPC methods to their corresponding ethers.js provider method calls.
+ */
+
+export class ProviderDirectMethodHandler extends BaseMethodHandler<WindowEthereumRequest> {
+  private methodHandlers: {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [key: string]: (provider: JsonRpcProvider, params: any[]) => Promise<any>
+  }
+
+  constructor(
+    getChainId: () => string | undefined,
+    getProvider: () => JsonRpcProvider | undefined,
+    getConnectedAddresses: () => Address[] | undefined,
+    setChainIdAndMaybeEmit: (newChainId: string) => void,
+    setProvider: (newProvider: JsonRpcProvider) => void,
+    setConnectedAddressesAndMaybeEmit: (newConnectedAddresses: Address[]) => void,
+  ) {
+    super(
+      getChainId,
+      getProvider,
+      getConnectedAddresses,
+      setChainIdAndMaybeEmit,
+      setProvider,
+      setConnectedAddressesAndMaybeEmit,
+    )
+
+    this.methodHandlers = {
+      /* eslint-disable @typescript-eslint/explicit-function-return-type */
+      [ProviderDirectMethods.eth_getBalance]: (provider, params) => provider.getBalance(params[0]),
+      [ProviderDirectMethods.eth_getCode]: (provider, params) => provider.getCode(params[0]),
+      [ProviderDirectMethods.eth_getStorageAt]: (provider, params) => provider.getStorageAt(params[0], params[1]),
+      [ProviderDirectMethods.eth_getTransactionCount]: (provider, params) => provider.getTransactionCount(params[0]),
+      [ProviderDirectMethods.eth_blockNumber]: (provider, _params) => provider.getBlockNumber(),
+      [ProviderDirectMethods.eth_getBlockByNumber]: (provider, params) => provider.getBlock(params[0]),
+      [ProviderDirectMethods.eth_call]: (provider, params) => provider.call(params[0]),
+      [ProviderDirectMethods.eth_gasPrice]: (provider, _params) => provider.getGasPrice(),
+      [ProviderDirectMethods.eth_estimateGas]: (provider, params) => provider.estimateGas(params[0]),
+      [ProviderDirectMethods.eth_getTransactionByHash]: (provider, params) => provider.getTransaction(params[0]),
+      [ProviderDirectMethods.eth_getTransactionReceipt]: (provider, params) =>
+        provider.getTransactionReceipt(params[0]),
+      [ProviderDirectMethods.net_version]: async (provider, params) => provider.send('net_version', params),
+    }
+  }
+
+  handleRequest(request: WindowEthereumRequest, source: MessageEventSource | null): void {
+    const handler = this.methodHandlers[request.method]
+    if (handler) {
+      const provider = this.getProvider()
+      if (!provider) {
+        // TODO: Handle error for disconnection
+        return
+      }
+      const response = handler(provider, request.params)
+      this.handleResponse(response, source, request.requestId)
+    } else {
+      // We shouldn't end up here because injected.ts checks that the method is supported before calling this function
+      logger.error(new Error('Unexpected method requested'), {
+        tags: {
+          file: 'ProviderDirectMethodHandler.ts',
+          function: 'handleRequest',
+        },
+        extra: {
+          method: request.method,
+          dapp: window.origin,
+        },
+      })
+    }
+  }
+
+  private handleResponse(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    response: Promise<any>,
+    source: MessageEventSource | null,
+    requestId: string,
+  ): void {
+    response
+      .then((result) => {
+        source?.postMessage({
+          requestId,
+          result: JSON.parse(
+            JSON.stringify(result, (_key, value) => {
+              if (!value) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                return value
+              } else if (BigNumber.isBigNumber(value)) {
+                return value.toHexString()
+              } else if (value.type === 'BigNumber' && value.hex) {
+                // Unsure of why but sometimes the provider has converted the BigNumber with BigNumber.toJSON() e.g. eth_getBlockByNumber
+                // which is a format not currently accepted by some dapps e.g. Morpho
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                return value.hex
+              }
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+              return value
+            }),
+          ),
+        })
+      })
+      .catch((error) => {
+        source?.postMessage({
+          requestId,
+          error,
+        })
+      })
+  }
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/UniswapMethodHandler.ts b/apps/extension/src/contentScript/methodHandlers/UniswapMethodHandler.ts
new file mode 100644
index 00000000000..bbb888cc949
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/UniswapMethodHandler.ts
@@ -0,0 +1,81 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { DappRequestType, DappResponseType } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import {
+  contentScriptToBackgroundMessageChannel,
+  dappResponseMessageChannel,
+} from 'src/background/messagePassing/messageChannels'
+import {
+  UniswapOpenSidebarRequest,
+  UniswapOpenSidebarRequestSchema,
+} from 'src/contentScript/WindowEthereumRequestTypes'
+import { BaseMethodHandler } from 'src/contentScript/methodHandlers/BaseMethodHandler'
+import { UniswapMethods } from 'src/contentScript/methodHandlers/requestMethods'
+import { PendingResponseInfo } from 'src/contentScript/methodHandlers/types'
+import { getPendingResponseInfo } from 'src/contentScript/methodHandlers/utils'
+import { WindowEthereumRequest } from 'src/contentScript/types'
+import { logger } from 'utilities/src/logger/logger'
+
+/**
+ * Handles all uniswap-specific requests
+ */
+
+export class UniswapMethodHandler extends BaseMethodHandler<WindowEthereumRequest> {
+  private readonly requestIdToSourceMap: Map<string, PendingResponseInfo> = new Map()
+
+  constructor(
+    getChainId: () => string | undefined,
+    getProvider: () => JsonRpcProvider | undefined,
+    getConnectedAddresses: () => Address[] | undefined,
+    setChainIdAndMaybeEmit: (newChainId: string) => void,
+    setProvider: (newProvider: JsonRpcProvider) => void,
+    setConnectedAddressesAndMaybeEmit: (newConnectedAddresses: Address[]) => void,
+  ) {
+    super(
+      getChainId,
+      getProvider,
+      getConnectedAddresses,
+      setChainIdAndMaybeEmit,
+      setProvider,
+      setConnectedAddressesAndMaybeEmit,
+    )
+
+    dappResponseMessageChannel.addMessageListener(DappResponseType.UniswapOpenSidebarResponse, (message) => {
+      const source = getPendingResponseInfo(
+        this.requestIdToSourceMap,
+        message.requestId,
+        DappResponseType.UniswapOpenSidebarResponse,
+      )?.source
+
+      source?.postMessage({
+        requestId: message.requestId,
+      })
+    })
+  }
+
+  async handleRequest(request: WindowEthereumRequest, source: MessageEventSource | null): Promise<void> {
+    switch (request.method) {
+      case UniswapMethods.uniswap_openSidebar: {
+        logger.debug("Handling 'uniswap_openSidebar' request", request.method, request.toString())
+        const uniswapOpenTokensRequest = UniswapOpenSidebarRequestSchema.parse(request)
+        await this.handleUniswapOpenSidebarRequest(uniswapOpenTokensRequest, source)
+        break
+      }
+    }
+  }
+
+  private async handleUniswapOpenSidebarRequest(
+    request: UniswapOpenSidebarRequest,
+    source: MessageEventSource | null,
+  ): Promise<void> {
+    this.requestIdToSourceMap.set(request.requestId, {
+      source,
+      type: DappResponseType.UniswapOpenSidebarResponse,
+    })
+
+    await contentScriptToBackgroundMessageChannel.sendMessage({
+      type: DappRequestType.UniswapOpenSidebar,
+      requestId: request.requestId,
+      tab: request.tab,
+    })
+  }
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/emitUtils.ts b/apps/extension/src/contentScript/methodHandlers/emitUtils.ts
new file mode 100644
index 00000000000..fb2f96b7770
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/emitUtils.ts
@@ -0,0 +1,12 @@
+export function emitChainChanged(newChainId: string): void {
+  window?.postMessage({
+    emitKey: 'chainChanged',
+    emitValue: newChainId,
+  })
+}
+export function emitAccountsChanged(newConnectedAddresses: Address[]): void {
+  window?.postMessage({
+    emitKey: 'accountsChanged',
+    emitValue: newConnectedAddresses,
+  })
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/requestMethods.ts b/apps/extension/src/contentScript/methodHandlers/requestMethods.ts
new file mode 100644
index 00000000000..c147e5f8bf4
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/requestMethods.ts
@@ -0,0 +1,89 @@
+// List of eth methods that the extension will handle
+/* eslint-disable @typescript-eslint/naming-convention */
+export enum ExtensionEthMethods {
+  eth_chainId = 'eth_chainId',
+  eth_requestAccounts = 'eth_requestAccounts',
+  eth_accounts = 'eth_accounts',
+  eth_sendTransaction = 'eth_sendTransaction',
+  personal_sign = 'personal_sign',
+  wallet_switchEthereumChain = 'wallet_switchEthereumChain',
+  wallet_getPermissions = 'wallet_getPermissions',
+  wallet_requestPermissions = 'wallet_requestPermissions',
+  wallet_revokePermissions = 'wallet_revokePermissions',
+  eth_signTypedData_v4 = 'eth_signTypedData_v4',
+}
+
+// Custom Uniswap methods that the extension will handle
+/* eslint-disable @typescript-eslint/naming-convention */
+export enum UniswapMethods {
+  uniswap_openSidebar = 'uniswap_openSidebar',
+}
+
+// Methods that are not supported by the extension because they are deprecated
+/* eslint-disable @typescript-eslint/naming-convention */
+export enum DeprecatedEthMethods {
+  eth_sign = 'eth_sign', // Security risk
+  eth_signTypedData_v3 = 'eth_signTypedData_v3',
+  eth_signTypedData_v1 = 'eth_signTypedData_v1',
+  eth_decrypt = 'eth_decrypt',
+  eth_getEncryptionPublicKey = 'eth_getEncryptionPublicKey',
+}
+
+// Methods that are handled by Metamask but not by the extension. These are logged
+// so we can either display an error to the user or track frequency.
+// Depending on the frequency with which we see these methods we could show an error
+// in the sidebar for users.
+// The methods come from: https://docs.metamask.io/wallet/reference/json-rpc-api/
+/* eslint-disable @typescript-eslint/naming-convention */
+export enum UnsupportedEthMethods {
+  wallet_addEthereumChain = 'wallet_addEthereumChain',
+  wallet_registerOnboarding = 'wallet_registerOnboarding',
+  wallet_watchAsset = 'wallet_watchAsset',
+  wallet_scanQRCode = 'wallet_scanQRCode',
+  wallet_getSnaps = 'wallet_getSnaps',
+  wallet_requestSnaps = 'wallet_requestSnaps',
+  wallet_snap = 'wallet_snap',
+  wallet_invokeSnap = 'wallet_invokeSnap',
+  web3_clientVersion = 'web3_clientVersion',
+  eth_subscribe = 'eth_subscribe',
+  eth_unsubscribe = 'eth_unsubscribe',
+  eth_blobBaseFee = 'eth_blobBaseFee',
+  eth_coinbase = 'eth_coinbase',
+  eth_feeHistory = 'eth_feeHistory',
+  eth_getBlockByHash = 'eth_getBlockByHash',
+  eth_getBlockTransactionCountByHash = 'eth_getBlockTransactionCountByHash',
+  eth_getBlockTransactionCountByNumber = 'eth_getBlockTransactionCountByNumber',
+  eth_getFilterChanges = 'eth_getFilterChanges',
+  eth_getFilterLogs = 'eth_getFilterLogs',
+  eth_getLogs = 'eth_getLogs',
+  eth_getProof = 'eth_getProof',
+  eth_getStorageAt = 'eth_getStorageAt',
+  eth_getTransactionByBlockHashAndIndex = 'eth_getTransactionByBlockHashAndIndex',
+  eth_getTransactionByBlockNumberAndIndex = 'eth_getTransactionByBlockNumberAndIndex',
+  eth_getTransactionCount = 'eth_getTransactionCount',
+  eth_getUncleCountByBlockHash = 'eth_getUncleCountByBlockHash',
+  eth_getUncleCountByBlockNumber = 'eth_getUncleCountByBlockNumber',
+  eth_maxPriorityFeePerGas = 'eth_maxPriorityFeePerGas',
+  eth_newBlockFilter = 'eth_newBlockFilter',
+  eth_newFilter = 'eth_newFilter',
+  eth_newPendingTransactionFilter = 'eth_newPendingTransactionFilter',
+  eth_sendRawTransaction = 'eth_sendRawTransaction',
+  eth_syncing = 'eth_syncing',
+  eth_uninstallFilter = 'eth_uninstallFilter',
+  eth_signTransaction = 'eth_signTransaction',
+}
+
+export enum ProviderDirectMethods {
+  eth_getBalance = 'eth_getBalance',
+  eth_getCode = 'eth_getCode',
+  eth_getStorageAt = 'eth_getStorageAt',
+  eth_getTransactionCount = 'eth_getTransactionCount',
+  eth_blockNumber = 'eth_blockNumber',
+  eth_getBlockByNumber = 'eth_getBlockByNumber',
+  eth_call = 'eth_call',
+  eth_gasPrice = 'eth_gasPrice',
+  eth_estimateGas = 'eth_estimateGas',
+  eth_getTransactionByHash = 'eth_getTransactionByHash',
+  eth_getTransactionReceipt = 'eth_getTransactionReceipt',
+  net_version = 'net_version',
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/types.ts b/apps/extension/src/contentScript/methodHandlers/types.ts
new file mode 100644
index 00000000000..c0f77c234e1
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/types.ts
@@ -0,0 +1,6 @@
+import { DappResponseType } from 'src/app/features/dappRequests/types/DappRequestTypes'
+
+export type PendingResponseInfo = {
+  type: DappResponseType
+  source: MessageEventSource | null
+}
diff --git a/apps/extension/src/contentScript/methodHandlers/utils.ts b/apps/extension/src/contentScript/methodHandlers/utils.ts
new file mode 100644
index 00000000000..ecbf2c59690
--- /dev/null
+++ b/apps/extension/src/contentScript/methodHandlers/utils.ts
@@ -0,0 +1,89 @@
+import { providerErrors, serializeError } from '@metamask/rpc-errors'
+import { DappResponseType } from 'src/app/features/dappRequests/types/DappRequestTypes'
+import {
+  DeprecatedEthMethods,
+  ExtensionEthMethods,
+  ProviderDirectMethods,
+  UniswapMethods,
+  UnsupportedEthMethods,
+} from 'src/contentScript/methodHandlers/requestMethods'
+import { PendingResponseInfo } from 'src/contentScript/methodHandlers/types'
+import { logger } from 'utilities/src/logger/logger'
+
+export function isProviderDirectMethod(method: string): boolean {
+  return Object.keys(ProviderDirectMethods).includes(method)
+}
+
+export function isUniswapMethod(method: string): boolean {
+  return Object.keys(UniswapMethods).includes(method)
+}
+
+export function isExtensionEthMethod(method: string): boolean {
+  return Object.keys(ExtensionEthMethods).includes(method)
+}
+
+export function isDeprecatedMethod(method: string): boolean {
+  return Object.keys(DeprecatedEthMethods).includes(method)
+}
+
+export function isUnsupportedMethod(method: string): boolean {
+  return Object.keys(UnsupportedEthMethods).includes(method)
+}
+
+export function postDeprecatedMethodError(source: MessageEventSource | null, requestId: string, method: string): void {
+  source?.postMessage({
+    requestId,
+    error: serializeError(
+      providerErrors.unsupportedMethod(`Uniswap Wallet does not support ${method} as it is deprecated`),
+    ),
+  })
+}
+
+export function postUnknownMethodError(source: MessageEventSource | null, requestId: string, method: string): void {
+  source?.postMessage({
+    requestId,
+    error: serializeError(providerErrors.unsupportedMethod(`Uniswap Wallet does not support ${method}`)),
+  })
+}
+
+export function postUnauthorizedError(source: MessageEventSource | null, requestId: string): void {
+  source?.postMessage({
+    requestId,
+    error: serializeError(providerErrors.unauthorized()),
+  })
+}
+
+export function postParsingError(source: MessageEventSource | null, requestId: string, method: string): void {
+  source?.postMessage({
+    requestId,
+    error: serializeError(
+      providerErrors.unsupportedMethod(`Uniswap Wallet could not parse the ${method} request properly`),
+    ),
+  })
+}
+
+export function getPendingResponseInfo(
+  requestIdToSourceMap: Map<string, PendingResponseInfo>,
+  requestId: string,
+  type: DappResponseType,
+): PendingResponseInfo | undefined {
+  const pendingResponseInfo = requestIdToSourceMap.get(requestId)
+  if (pendingResponseInfo) {
+    requestIdToSourceMap.delete(requestId)
+
+    if (type !== DappResponseType.ErrorResponse && type !== pendingResponseInfo.type) {
+      logger.error(
+        `Response type doesn't match expected type, expected: ${pendingResponseInfo.type}, actual: ${type}`,
+        {
+          tags: {
+            file: 'injected.ts',
+            function: 'validateResponse',
+          },
+        },
+      )
+    }
+    return pendingResponseInfo
+  }
+
+  return undefined
+}
diff --git a/apps/extension/src/contentScript/types.ts b/apps/extension/src/contentScript/types.ts
new file mode 100644
index 00000000000..d55bff9b096
--- /dev/null
+++ b/apps/extension/src/contentScript/types.ts
@@ -0,0 +1,37 @@
+import { z } from 'zod'
+
+/* eslint-disable no-restricted-syntax  */
+const ExtensionResponseSchema = z
+  .object({
+    requestId: z.string(),
+    result: z.any().optional(),
+    error: z.any().optional(),
+  })
+  .refine((data) => data.result !== undefined || data.error !== undefined, {
+    message: 'Either result or error must be defined',
+  })
+
+export type ExtensionResponse = z.infer<typeof ExtensionResponseSchema>
+
+export const isValidExtensionResponse = (response: unknown): response is ExtensionResponse =>
+  ExtensionResponseSchema.safeParse(response).success
+
+export const WindowEthereumRequestSchema = z.object({
+  method: z.string(),
+  params: z.any(),
+  requestId: z.string(),
+})
+export type WindowEthereumRequest = z.infer<typeof WindowEthereumRequestSchema>
+
+export const isValidWindowEthereumRequest = (request: unknown): request is WindowEthereumRequest =>
+  WindowEthereumRequestSchema.safeParse(request).success
+
+export const ContentScriptToProxyEmissionSchema = z.object({
+  emitKey: z.string(),
+  emitValue: z.any(),
+})
+
+export type ContentScriptToProxyEmission = z.infer<typeof ContentScriptToProxyEmissionSchema>
+
+export const isValidContentScriptToProxyEmission = (request: unknown): request is ContentScriptToProxyEmission =>
+  ContentScriptToProxyEmissionSchema.safeParse(request).success
diff --git a/apps/extension/src/declarations.d.ts b/apps/extension/src/declarations.d.ts
new file mode 100644
index 00000000000..d2ecf6ad63d
--- /dev/null
+++ b/apps/extension/src/declarations.d.ts
@@ -0,0 +1,6 @@
+declare module '*.svg' {
+  import React from 'react'
+  import { SvgProps } from 'react-native-svg'
+  const content: React.FC<SvgProps>
+  export default content
+}
diff --git a/apps/extension/src/env.d.ts b/apps/extension/src/env.d.ts
new file mode 100644
index 00000000000..fd6eabefe81
--- /dev/null
+++ b/apps/extension/src/env.d.ts
@@ -0,0 +1,8 @@
+import { config } from 'ui/src/tamagui.config'
+
+type Conf = typeof config
+
+declare module 'tamagui' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  interface TamaguiCustomConfig extends Conf {}
+}
diff --git a/apps/extension/src/logo.svg b/apps/extension/src/logo.svg
new file mode 100644
index 00000000000..6b60c1042f5
--- /dev/null
+++ b/apps/extension/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
diff --git a/apps/extension/src/manifest.json b/apps/extension/src/manifest.json
new file mode 100644
index 00000000000..683549ddd5a
--- /dev/null
+++ b/apps/extension/src/manifest.json
@@ -0,0 +1,75 @@
+{
+  "manifest_version": 3,
+  "name": "Uniswap Extension",
+  "description": "The Uniswap Extension is a self-custody crypto wallet that's built for swapping.",
+  "version": "1.0.3",
+  "minimum_chrome_version": "116",
+  "icons": {
+    "16": "assets/icon16.png",
+    "32": "assets/icon32.png",
+    "48": "assets/icon48.png",
+    "128": "assets/icon128.png"
+  },
+  "action": {
+    "default_icon": {
+      "16": "assets/icon16.png",
+      "32": "assets/icon32.png",
+      "48": "assets/icon48.png",
+      "128": "assets/icon128.png"
+    }
+  },
+  "side_panel": {
+    "default_path": "sidebar.html"
+  },
+  "background": {
+    "service_worker": "background.js",
+    "type": "module"
+  },
+  "permissions": [
+    "alarms",
+    "notifications",
+    "sidePanel",
+    "storage",
+    "tabs"
+  ],
+  "content_scripts": [
+    {
+      "id": "injected",
+      "run_at": "document_start",
+      "matches": [
+        "http://127.0.0.1/*",
+        "http://localhost/*",
+        "https://*/*"
+      ],
+      "js": [
+        "injected.js"
+      ]
+    },
+    {
+      "id": "ethereum",
+      "run_at": "document_start",
+      "matches": [
+        "http://127.0.0.1/*",
+        "http://localhost/*",
+        "https://*/*"
+      ],
+      "js": [
+        "ethereum.js"
+      ],
+      "world": "MAIN"
+    }
+  ],
+  "externally_connectable": {
+    "ids": [],
+    "matches": []
+  },
+  "commands": {
+    "_execute_action": {
+      "suggested_key": {
+        "default": "Ctrl+Shift+U",
+        "mac": "Command+Shift+U"
+      },
+      "description": "Toggles the sidebar"
+    }
+  }
+}
diff --git a/apps/extension/src/onboarding.html b/apps/extension/src/onboarding.html
new file mode 100644
index 00000000000..67622884299
--- /dev/null
+++ b/apps/extension/src/onboarding.html
@@ -0,0 +1,75 @@
+<!--
+-- UI entrypoint for extension onboarding flow.
+--
+-- This exists as a separate React App from the main extension with its own store because it doesn't
+-- need to rely on the service worker to maintain the redux state with web-ext redux. Rather the onboarding
+-- flow is a standard single page app completely decoupled from the background server going to sleep.
+-->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+  <link rel="preload" href="assets/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+  <link rel="preload" href="assets/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+
+  <style>
+    html,
+    body,
+    #root {
+      min-height: 100%;
+    }
+
+    * {
+      font-family: 'Basel', sans-serif;
+      box-sizing: border-box;
+    }
+
+    /**
+          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+        */
+    @font-face {
+      font-family: 'Basel';
+      font-weight: 500;
+      font-style: normal;
+      font-display: block;
+      font-named-instance: 'Medium';
+      src:
+        url(assets/fonts/Basel-Medium.woff) format('woff');
+    }
+
+    @font-face {
+      font-family: 'Basel';
+      font-weight: 400;
+      font-style: normal;
+      font-display: block;
+      font-named-instance: 'Book';
+      src:
+        url(assets/fonts/Basel-Book.woff) format('woff');
+    }
+
+    @supports (font-variation-settings: normal) {
+      * {
+        font-family: 'Basel', sans-serif;
+      }
+    }
+
+    html {
+      font-variant: none;
+      font-smooth: always;
+      text-rendering: optimizeLegibility;
+      -webkit-font-smoothing: antialiased;
+    }
+  </style>
+
+  <title>Uniswap Extension</title>
+</head>
+
+<body>
+  <div id="onboarding-root"></div>
+  <script type="module" src="onboarding.js"></script>
+</body>
+
+</html>
diff --git a/apps/extension/src/onboarding/onboarding.tsx b/apps/extension/src/onboarding/onboarding.tsx
new file mode 100644
index 00000000000..a583e37a96b
--- /dev/null
+++ b/apps/extension/src/onboarding/onboarding.tsx
@@ -0,0 +1,55 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../../../../index.d.ts" />
+
+import { createRoot } from 'react-dom/client'
+import { OptionalStrictMode } from 'src/app/components/OptionalStrictMode'
+import OnboardingApp from 'src/app/OnboardingApp'
+import { initializeSentry, SentryAppNameTag } from 'src/app/sentry'
+import { getLocalUserId } from 'src/app/utils/storage'
+import { initializeReduxStore } from 'src/store/store'
+import { ExtensionAppLocation, StoreSynchronization } from 'src/store/storeSynchronization'
+import { logger } from 'utilities/src/logger/logger'
+;(globalThis as any).regeneratorRuntime = undefined // eslint-disable-line @typescript-eslint/no-explicit-any
+// The globalThis.regeneratorRuntime = undefined addresses a potentially unsafe-eval problem
+// see https://github.com/facebook/regenerator/issues/378#issuecomment-802628326
+
+getLocalUserId()
+  .then((userId) => {
+    initializeSentry(SentryAppNameTag.Onboarding, userId)
+  })
+  .catch((error) => {
+    logger.error(error, {
+      tags: { file: 'SidebarApp.tsx', function: 'getLocalUserId' },
+    })
+  })
+async function initOnboarding(): Promise<void> {
+  await initializeReduxStore()
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const container = document.getElementById('onboarding-root')!
+  const root = createRoot(container)
+
+  root.render(
+    <OptionalStrictMode>
+      <OnboardingApp />
+    </OptionalStrictMode>,
+  )
+}
+
+StoreSynchronization.init(ExtensionAppLocation.Tab).catch((error) => {
+  logger.error(error, {
+    tags: {
+      file: 'onboarding.ts',
+      function: 'initPrimaryInstanceHandler',
+    },
+  })
+})
+
+initOnboarding().catch((error) => {
+  logger.error(error, {
+    tags: {
+      file: 'onboarding.ts',
+      function: 'initOnboarding',
+    },
+  })
+})
diff --git a/apps/extension/src/sidebar.html b/apps/extension/src/sidebar.html
new file mode 100644
index 00000000000..d918c44aa92
--- /dev/null
+++ b/apps/extension/src/sidebar.html
@@ -0,0 +1,98 @@
+<!--
+-- UI entrypoint for web.
+--
+-- HTML document used to host any React content (popup, window, iframes, etc.)
+--
+-- Flow:
+--   1. Document is opened with url formatted for <Router />
+--   2. Document inserts index.js into a <script> tag
+--   3. index.js renders <App /> at #root
+--   4. react-router handles proper routing (e.g. onboarding, navigation, notifications, etc.)
+--
+-- ┌────────────────────────────┐
+-- │ content_window.html#/route │
+-- ├────────────────────────────┤
+-- │ <html>                     │
+-- │  <script src=content.js /> │
+-- └────┬───────────────────────┘
+--      │ {route}
+--      ▼
+-- ┌───────────────┐    ┌────────────────────┐
+-- │  content.js   │  ┌►│  <Router route>    │
+-- ├───────────────┤  │ ├────────────────────┤
+-- │ <Redux />     │  │ │ |<Onboarding/>     │
+-- │  <Tamagui />  │  │ │ |<WebNavigation /> │
+-- │   <GraphQl /> │  │ │ |<Notifications /> │
+-- │    <Router />─┼──┘ │ |...               │
+-- └───────────────┘    └────────────────────┘
+-->
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <link rel="preload" href="assets/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="assets/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+
+    <style>
+      html,
+      body,
+      #root {
+        min-height: 100%;
+      }
+      @media (prefers-color-scheme: dark) {
+        body {
+          /* Avoid flash of white background when opening the extension. */
+          background-color: #131313;
+        }
+      }
+
+      * {
+        font-family: 'Basel', sans-serif;
+        box-sizing: border-box;
+      }
+
+      /* Explicitly load Basel var from public/ so it does not block LCP's critical path. */
+
+      @font-face {
+        font-family: 'Basel';
+        font-weight: 500;
+        font-style: normal;
+        font-display: block;
+        font-named-instance: 'Medium';
+        src:
+          url(assets/fonts/Basel-Medium.woff) format('woff');
+      }
+
+      @font-face {
+        font-family: 'Basel';
+        font-weight: 400;
+        font-style: normal;
+        font-display: block;
+        font-named-instance: 'Book';
+        src:
+          url(assets/fonts/Basel-Book.woff) format('woff');
+      }
+
+      @supports (font-variation-settings: normal) {
+        * {
+          font-family: 'Basel', sans-serif;
+        }
+      }
+
+      html {
+        font-variant: none;
+        font-smooth: always;
+        text-rendering: optimizeLegibility;
+        -webkit-font-smoothing: antialiased;
+      }
+    </style>
+
+    <title>Uniswap Extension</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="loadSidebar.js" async></script>
+  </body>
+</html>
diff --git a/apps/extension/src/sidebar/loadSidebar.ts b/apps/extension/src/sidebar/loadSidebar.ts
new file mode 100644
index 00000000000..747be9aa8a9
--- /dev/null
+++ b/apps/extension/src/sidebar/loadSidebar.ts
@@ -0,0 +1,18 @@
+/**
+ * IMPORTANT: we should keep this file very light. Do not import anything here.
+ *
+ * The browser was taking too long to interpret the react JS bundle and initialize the react app,
+ * so we're now splitting this up and slightly delaying the react bundle execution.
+ * By doing this, the first render happens faster and there's no longer a flash of a different color background (the default "no background" color).
+ * Instead, the HTML is now rendered immediately, with the right background color from the inline style.
+ *
+ * For video comparison of the before and after, check out https://github.com/Uniswap/universe/pull/9294
+ */
+
+setTimeout(() => {
+  const script = document.createElement('script')
+  script.type = 'text/javascript'
+  script.async = true
+  script.src = './sidebar.js'
+  document.body.appendChild(script)
+}, 10)
diff --git a/apps/extension/src/sidebar/sidebar.tsx b/apps/extension/src/sidebar/sidebar.tsx
new file mode 100644
index 00000000000..4d254f4c36e
--- /dev/null
+++ b/apps/extension/src/sidebar/sidebar.tsx
@@ -0,0 +1,55 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../../../../index.d.ts" />
+
+import 'src/app/utils/devtools'
+import 'symbol-observable' // Needed by `reduxed-chrome-storage` as polyfill, order matters
+
+import { createRoot } from 'react-dom/client'
+import SidebarApp from 'src/app/SidebarApp'
+import { OptionalStrictMode } from 'src/app/components/OptionalStrictMode'
+import { onboardingMessageChannel } from 'src/background/messagePassing/messageChannels'
+import { OnboardingMessageType } from 'src/background/messagePassing/types/ExtensionMessages'
+import { initializeReduxStore } from 'src/store/store'
+import { ExtensionAppLocation, StoreSynchronization } from 'src/store/storeSynchronization'
+import { initializeScrollWatcher } from 'uniswap/src/components/modals/ScrollLock'
+import { logger } from 'utilities/src/logger/logger'
+;(globalThis as any).regeneratorRuntime = undefined // eslint-disable-line @typescript-eslint/no-explicit-any
+// The globalThis.regeneratorRuntime = undefined addresses a potentially unsafe-eval problem
+// see https://github.com/facebook/regenerator/issues/378#issuecomment-802628326
+
+async function initSidebar(): Promise<void> {
+  await initializeReduxStore()
+  await onboardingMessageChannel.sendMessage({
+    type: OnboardingMessageType.SidebarOpened,
+  })
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const container = window.document.querySelector('#root')!
+  const root = createRoot(container)
+
+  root.render(
+    <OptionalStrictMode>
+      <SidebarApp />
+    </OptionalStrictMode>,
+  )
+}
+
+StoreSynchronization.init(ExtensionAppLocation.SidePanel).catch((error) => {
+  logger.error(error, {
+    tags: {
+      file: 'sidebar.ts',
+      function: 'initPrimaryInstanceHandler',
+    },
+  })
+})
+
+initSidebar().catch((error) => {
+  logger.error(error, {
+    tags: {
+      file: 'sidebar.ts',
+      function: 'initSidebar',
+    },
+  })
+})
+
+initializeScrollWatcher()
diff --git a/apps/extension/src/store/PrimaryAppInstanceDebugger.tsx b/apps/extension/src/store/PrimaryAppInstanceDebugger.tsx
new file mode 100644
index 00000000000..42bd081e5b5
--- /dev/null
+++ b/apps/extension/src/store/PrimaryAppInstanceDebugger.tsx
@@ -0,0 +1,24 @@
+import { useIsPrimaryAppInstance } from 'src/store/storeSynchronization'
+
+// This is a dev-only component that renders a small green/red dot in the bottom right corner of the screen
+// to indicate whether the current app instance is the primary one.
+export default function PrimaryAppInstanceDebugger(): JSX.Element | null {
+  const isPrimaryAppInstance = useIsPrimaryAppInstance()
+
+  return (
+    <div
+      style={{
+        position: 'fixed',
+        bottom: '10px',
+        right: '10px',
+        borderRadius: '5px',
+        width: '5px',
+        height: '5px',
+        zIndex: 999999999999999,
+        background: isPrimaryAppInstance ? 'green' : 'red',
+        color: 'white',
+      }}
+      title={`IsPrimaryAppInstance: ${isPrimaryAppInstance}`}
+    />
+  )
+}
diff --git a/apps/extension/src/store/PrimaryAppInstanceDebuggerLazy.tsx b/apps/extension/src/store/PrimaryAppInstanceDebuggerLazy.tsx
new file mode 100644
index 00000000000..42ff1f81cc5
--- /dev/null
+++ b/apps/extension/src/store/PrimaryAppInstanceDebuggerLazy.tsx
@@ -0,0 +1,7 @@
+import { lazy } from 'react'
+
+const PrimaryAppInstanceDebugger = lazy(() => import('src/store/PrimaryAppInstanceDebugger'))
+
+export function PrimaryAppInstanceDebuggerLazy(): JSX.Element | null {
+  return __DEV__ ? <PrimaryAppInstanceDebugger /> : null
+}
diff --git a/apps/extension/src/store/constants.ts b/apps/extension/src/store/constants.ts
new file mode 100644
index 00000000000..68d633df8a9
--- /dev/null
+++ b/apps/extension/src/store/constants.ts
@@ -0,0 +1,2 @@
+export const PERSIST_KEY = 'root'
+export const STATE_STORAGE_KEY = `persist:${PERSIST_KEY}`
diff --git a/apps/extension/src/store/enhancePersistReducer.ts b/apps/extension/src/store/enhancePersistReducer.ts
new file mode 100644
index 00000000000..acb1910c4cc
--- /dev/null
+++ b/apps/extension/src/store/enhancePersistReducer.ts
@@ -0,0 +1,46 @@
+import { Action, Reducer } from 'redux'
+import { logger } from 'utilities/src/logger/logger'
+
+// We use `any` in a few places in this file because those values truly can be anything, so that's the proper type.
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type PersistPartial = { _persist: undefined } | any
+
+export function enhancePersistReducer<S, A extends Action = Action>(
+  reducer: Reducer<S & PersistPartial, A>,
+): Reducer<S & PersistPartial, A> {
+  return forceRehydrationFromDiskWhenResumingPersistence(reducer)
+}
+
+/**
+ * Whenever the `persist/PERSIST` action is dispatched, we reset the `_persist` state in order to trigger rehydration from disk
+ * regardless of whether it had already rehydrated during startup.
+ *
+ * Whenever another app becomes the primary instance, `storeSynchronization.ts` calls `persistor.pause()`,
+ * and then when this app becomes primary again we need to not only re-start persistance but also rehydrate from disk.
+ * We do this by calling `persistor.persist()`, which by default will just continue persisting and skip rehydration.
+ * This custom enhancer ensures that the `_persist` state is reset whenever the `persist/PERSIST` action is dispatched,
+ * so that the internal `redux-persist` logic will rehydrate from disk again.
+ *
+ * See relevat `redux-persist` code here: https://github.com/rt2zz/redux-persist/blob/9c0baee/src/persistReducer.ts#L110
+ */
+function forceRehydrationFromDiskWhenResumingPersistence<S, A extends Action = Action>(
+  reducer: Reducer<S & PersistPartial, A>,
+): Reducer<S & PersistPartial, A> {
+  return (state, action) => {
+    if (action.type !== 'persist/PERSIST') {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return reducer(state, action)
+    }
+
+    logger.debug('store-synchronization', 'enhancePersistReducer', 'Resetting redux _persist state')
+
+    const newState = {
+      ...state,
+      _persist: undefined,
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return reducer(newState, action)
+  }
+}
diff --git a/apps/extension/src/store/migrations.test.ts b/apps/extension/src/store/migrations.test.ts
new file mode 100644
index 00000000000..a03b9139f51
--- /dev/null
+++ b/apps/extension/src/store/migrations.test.ts
@@ -0,0 +1,182 @@
+import { BigNumber } from 'ethers'
+import { toIncludeSameMembers } from 'jest-extended'
+import { EXTENSION_STATE_VERSION, migrations } from 'src/store/migrations'
+import { getSchema, initialSchema, v0Schema, v1Schema, v2Schema, v3Schema } from 'src/store/schema'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { initialBehaviorHistoryState } from 'wallet/src/features/behaviorHistory/slice'
+import { initialFavoritesState } from 'wallet/src/features/favorites/slice'
+import { initialFiatCurrencyState } from 'wallet/src/features/fiatCurrency/slice'
+import { initialLanguageState } from 'wallet/src/features/language/slice'
+import { initialNotificationsState } from 'wallet/src/features/notifications/slice'
+import { initialSearchHistoryState } from 'wallet/src/features/search/searchHistorySlice'
+import { initialTokensState } from 'wallet/src/features/tokens/tokensSlice'
+import { initialTransactionsState } from 'wallet/src/features/transactions/slice'
+import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
+import { initialWalletState } from 'wallet/src/features/wallet/slice'
+import { createMigrate } from 'wallet/src/state/createMigrate'
+import { testActivatePendingAccounts } from 'wallet/src/state/sharedMigrationsTests'
+import { getAllKeysOfNestedObject } from 'wallet/src/state/testUtils'
+
+expect.extend({ toIncludeSameMembers })
+
+describe('Redux state migrations', () => {
+  it('is able to perform all migrations starting from the initial schema', async () => {
+    const initialSchemaStub = {
+      ...initialSchema,
+      _persist: { version: -1, rehydrated: false },
+    }
+
+    const migrate = createMigrate(migrations)
+    const migratedSchema = await migrate(initialSchemaStub, EXTENSION_STATE_VERSION)
+    expect(typeof migratedSchema).toBe('object')
+  })
+
+  // If this test fails then it's likely a required property was added to the Redux state but a migration was not defined
+  it('migrates all the properties correctly', async () => {
+    const initialSchemaStub = {
+      ...initialSchema,
+      _persist: { version: -1, rehydrated: false },
+    }
+
+    const migrate = createMigrate(migrations)
+    const migratedSchema = await migrate(initialSchemaStub, EXTENSION_STATE_VERSION)
+
+    // Add new slices here!
+    const initialState = {
+      appearanceSettings: { selectedAppearanceSettings: 'system' },
+      blocks: { byChainId: {} },
+      chains: {
+        byChainId: {
+          '1': { isActive: true },
+          '10': { isActive: true },
+          '137': { isActive: true },
+          '42161': { isActive: true },
+        },
+      },
+      dapp: {},
+      ens: { ensForAddress: {} },
+      favorites: initialFavoritesState,
+      fiatCurrencySettings: initialFiatCurrencyState,
+      languageSettings: initialLanguageState,
+      notifications: initialNotificationsState,
+      behaviorHistory: initialBehaviorHistoryState,
+      providers: { isInitialized: false },
+      saga: {},
+      searchHistory: initialSearchHistoryState,
+      tokenLists: {},
+      tokens: initialTokensState,
+      transactions: initialTransactionsState,
+      wallet: initialWalletState,
+      _persist: {
+        version: EXTENSION_STATE_VERSION,
+        rehydrated: true,
+      },
+    }
+
+    const migratedSchemaKeys = new Set(
+      getAllKeysOfNestedObject(migratedSchema as Record<string, unknown>)
+    )
+    const latestSchemaKeys = new Set(getAllKeysOfNestedObject(getSchema()))
+    const initialStateKeys = new Set(getAllKeysOfNestedObject(initialState))
+
+    for (const key of initialStateKeys) {
+      if (latestSchemaKeys.has(key)) {
+        latestSchemaKeys.delete(key)
+      }
+      if (migratedSchemaKeys.has(key)) {
+        migratedSchemaKeys.delete(key)
+      }
+      initialStateKeys.delete(key)
+    }
+
+    expect(migratedSchemaKeys.size).toBe(0)
+    expect(latestSchemaKeys.size).toBe(0)
+    expect(initialStateKeys.size).toBe(0)
+  })
+
+  // This is a precaution to ensure we do not attempt to access undefined properties during migrations
+  // If this test fails, make sure all property references to state are using optional chaining
+  it('uses optional chaining when accessing old state variables', async () => {
+    const emptyStub = { _persist: { version: -1, rehydrated: false } }
+
+    const migrate = createMigrate(migrations)
+    const migratedSchema = await migrate(emptyStub, EXTENSION_STATE_VERSION)
+    expect(typeof migratedSchema).toBe('object')
+  })
+
+  it('migrates from initial schema to v0', () => {
+    const stub = { ...initialSchema }
+    const v0 = migrations[0](stub)
+
+    expect(v0.wallet.isUnlocked).toBe(undefined)
+  })
+
+  it('migrates from v0 to v1', () => {
+    const v0Stub = { ...v0Schema }
+    const v1 = migrations[1](v0Stub)
+
+    expect(v1.behaviorHistory.hasViewedUniconV2IntroModal).toBe(undefined)
+  })
+
+  it('migrates from v1 to v2', () => {
+    const TEST_ADDRESS = '0xTestAddress'
+    const txDetails0 = {
+      chainId: UniverseChainId.Mainnet,
+      id: '0',
+      from: '0xTestAddress',
+      options: {
+        request: {
+          from: '0x123',
+          to: '0x456',
+          value: '0x0',
+          data: '0x789',
+          nonce: 10,
+          gasPrice: BigNumber.from('10000'),
+        },
+      },
+      typeInfo: {
+        type: TransactionType.Approve,
+        tokenAddress: '0xtokenAddress',
+        spender: '0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45',
+      },
+      status: TransactionStatus.Pending,
+      addedTime: 1487076708000,
+      hash: '0x123',
+    }
+
+    const txDetails1 = {
+      ...txDetails0,
+      chainId: UniverseChainId.Optimism,
+      id: '1',
+    }
+
+    const transactions = {
+      [TEST_ADDRESS]: {
+        [UniverseChainId.Mainnet]: {
+          '0': txDetails0,
+        },
+        [UniverseChainId.Optimism]: {
+          '1': txDetails1,
+        },
+      },
+    }
+
+    const v0stub = { ...v1Schema, transactions }
+
+    const v64 = migrations[2](v0stub)
+
+    expect(v64.transactions[TEST_ADDRESS][UniverseChainId.Mainnet]['0'].routing).toBe('CLASSIC')
+    expect(v64.transactions[TEST_ADDRESS][UniverseChainId.Optimism]['1'].routing).toBe('CLASSIC')
+  })
+
+  it('migrates from v2 to v3', () => {
+    const v3 = migrations[3]
+    testActivatePendingAccounts(v3, v2Schema)
+  })
+
+  it('migrates from v3 to v4', async () => {
+    const v3Stub = { ...v3Schema }
+    const v4 = await migrations[4](v3Stub)
+    expect(v4.dapp).toBe(undefined)
+  })
+})
diff --git a/apps/extension/src/store/migrations.ts b/apps/extension/src/store/migrations.ts
new file mode 100644
index 00000000000..e0007a73fd3
--- /dev/null
+++ b/apps/extension/src/store/migrations.ts
@@ -0,0 +1,21 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+
+import {
+  activatePendingAccounts,
+  addRoutingFieldToTransactions,
+  removeUniconV2BehaviorState,
+  removeWalletIsUnlockedState,
+} from 'wallet/src/state/sharedMigrations'
+
+export const migrations = {
+  0: removeWalletIsUnlockedState,
+  1: removeUniconV2BehaviorState,
+  2: addRoutingFieldToTransactions,
+  3: activatePendingAccounts,
+  4: function removeDappInfoToChromLocalStorage({ dapp: _dapp, ...state }: any) {
+    return state
+  },
+}
+
+export const EXTENSION_STATE_VERSION = 4
diff --git a/apps/extension/src/store/reduxedChromeStorageToReduxPersistMigration.ts b/apps/extension/src/store/reduxedChromeStorageToReduxPersistMigration.ts
new file mode 100644
index 00000000000..4fc83fd385b
--- /dev/null
+++ b/apps/extension/src/store/reduxedChromeStorageToReduxPersistMigration.ts
@@ -0,0 +1,29 @@
+import { WebState } from 'src/store/webReducer'
+
+// TODO(EXT-1028): remove this file once the migration is no longer needed.
+
+const REDUXED_STORAGE_KEY = 'reduxed'
+
+// These functions are used to migrate the redux state persistence from `reduxed-chrome-storage` to `redux-persist`.
+// The actual migration happens when the sidebar initializes the redux store. See `initializeReduxStore` in `store.ts`.
+
+export async function readDeprecatedReduxedChromeStorage(): Promise<WebState | undefined> {
+  const reduxedArray = (await chrome.storage.local.get(REDUXED_STORAGE_KEY))?.[REDUXED_STORAGE_KEY]
+
+  if (!reduxedArray) {
+    return undefined
+  }
+
+  // The `reduxed` storage is an array: [id, timestamp, state]
+  const [, , state] = reduxedArray
+
+  if (!state) {
+    return undefined
+  }
+
+  return state as WebState
+}
+
+export async function deleteDeprecatedReduxedChromeStorage(): Promise<void> {
+  await chrome.storage.local.remove(REDUXED_STORAGE_KEY)
+}
diff --git a/apps/extension/src/store/schema.ts b/apps/extension/src/store/schema.ts
new file mode 100644
index 00000000000..34b91a0430c
--- /dev/null
+++ b/apps/extension/src/store/schema.ts
@@ -0,0 +1,88 @@
+// only add fields that are persisted
+export const initialSchema = {
+  dapp: {},
+  favorites: {
+    tokens: [],
+    watchedAddresses: [],
+    tokensVisibility: {},
+    nftsVisibility: {},
+  },
+  notifications: {
+    notificationQueue: [],
+    notificationStatus: {},
+    lastTxNotificationUpdate: {},
+  },
+  saga: {},
+  tokens: {
+    dismissedWarningTokens: {},
+  },
+  transactions: {},
+  wallet: {
+    accounts: {},
+    activeAccountAddress: null,
+    hardwareDevices: [],
+    isUnlocked: false,
+    settings: {
+      swapProtection: 'on',
+      hideSmallBalances: true,
+      hideSpamTokens: true,
+    },
+  },
+  searchHistory: {
+    results: [],
+  },
+  appearanceSettings: {
+    selectedAppearanceSettings: 'system',
+  },
+  languageSettings: {
+    currentLanguage: 'en',
+  },
+  fiatCurrencySettings: {
+    currentCurrency: 'USD',
+  },
+  behaviorHistory: {
+    hasViewedReviewScreen: false,
+    hasSubmittedHoldToSwap: false,
+    hasSkippedUnitagPrompt: false,
+    hasCompletedUnitagsIntroModal: false,
+    extensionOnboardingState: 0,
+  },
+}
+
+const v0SchemaIntermediate = {
+  ...initialSchema,
+  wallet: {
+    ...initialSchema.wallet,
+    isUnlocked: undefined,
+  },
+}
+
+// We will no longer keep track of this in the redux state.
+delete v0SchemaIntermediate.wallet.isUnlocked
+
+export const v0Schema = v0SchemaIntermediate
+
+const v1SchemaIntermediate = {
+  ...v0Schema,
+  behaviorHistory: {
+    ...v0Schema.behaviorHistory,
+    hasViewedUniconV2IntroModal: undefined,
+  },
+}
+
+delete v1SchemaIntermediate.behaviorHistory.hasViewedUniconV2IntroModal
+
+export const v1Schema = v1SchemaIntermediate
+export const v2Schema = { ...v1Schema }
+export const v3Schema = { ...v2Schema }
+
+const v4SchemaIntermediate = {
+  ...v3Schema,
+  dapp: undefined,
+}
+
+delete v4SchemaIntermediate.dapp
+
+export const v4Schema = v4SchemaIntermediate
+
+export const getSchema = (): typeof v4Schema => v4Schema
diff --git a/apps/extension/src/store/store.ts b/apps/extension/src/store/store.ts
new file mode 100644
index 00000000000..93c40f09cc4
--- /dev/null
+++ b/apps/extension/src/store/store.ts
@@ -0,0 +1,107 @@
+import { createReduxEnhancer } from '@sentry/react'
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
+import { PreloadedState } from 'redux'
+import { persistReducer, persistStore } from 'redux-persist'
+import { localStorage } from 'redux-persist-webextension-storage'
+import { webRootSaga } from 'src/app/saga'
+import { loggerMiddleware } from 'src/background/utils/loggerMiddleware'
+import { PERSIST_KEY } from 'src/store/constants'
+import { enhancePersistReducer } from 'src/store/enhancePersistReducer'
+import { EXTENSION_STATE_VERSION, migrations } from 'src/store/migrations'
+import {
+  deleteDeprecatedReduxedChromeStorage,
+  readDeprecatedReduxedChromeStorage,
+} from 'src/store/reduxedChromeStorageToReduxPersistMigration'
+import { ReducerNames, WebState, webReducer } from 'src/store/webReducer'
+import { SagaGenerator, select } from 'typed-redux-saga'
+import { createStore } from 'wallet/src/state'
+import { createMigrate } from 'wallet/src/state/createMigrate'
+import { RootReducerNames, sharedPersistedStateWhitelist } from 'wallet/src/state/reducer'
+
+// Only include here things that need to be persisted and shared between different instances of the sidebar.
+// Only one sidebar can write to the storage at a time, so we need to be careful about what we persist.
+// Things that only belong to a single instance of the sidebar (for example, dapp requests) should not be whitelisted.
+const whitelist: Array<ReducerNames | RootReducerNames> = [...sharedPersistedStateWhitelist, 'dappRequests', 'alerts']
+
+const persistConfig = {
+  key: PERSIST_KEY,
+  storage: localStorage,
+  whitelist,
+  version: EXTENSION_STATE_VERSION,
+  migrate: createMigrate(migrations),
+}
+
+const persistedReducer = enhancePersistReducer(persistReducer(persistConfig, webReducer))
+
+const sentryReduxEnhancer = createReduxEnhancer({
+  // TODO(EXT-1022): uncomment this once we add an analytics opt-out setting.
+  // stateTransformer: (state: WebState): Maybe<WebState> => {
+  // Do not log the state if a user has opted out of analytics.
+  // if (state.telemetry.allowAnalytics) {
+  //   return state
+  // } else {
+  //   return null
+  // }
+  // },
+})
+
+const setupStore = (preloadedState?: PreloadedState<WebState>): ReturnType<typeof createStore> => {
+  return createStore({
+    reducer: persistedReducer,
+    preloadedState,
+    additionalSagas: [webRootSaga],
+    middlewareBefore: __DEV__ ? [loggerMiddleware] : [],
+    enhancers: [sentryReduxEnhancer],
+  })
+}
+
+let store: ReturnType<typeof setupStore> | undefined
+let persistor: ReturnType<typeof persistStore> | undefined
+
+export async function initializeReduxStore(): Promise<{
+  store: ReturnType<typeof setupStore>
+  persistor: ReturnType<typeof persistStore>
+}> {
+  // Migrate the old `reduxed-chrome-storage` persisted state to `redux-persist`.
+  // TODO(EXT-985): we might need to pass the old store through `createMigrations` when we implement migrations.
+  const oldStore = await readDeprecatedReduxedChromeStorage()
+
+  store = setupStore(oldStore)
+  persistor = persistStore(store)
+
+  // We wait a few seconds to make sure the store is fully initialized and persisted before deleting the old storage.
+  // This is needed because otherwise the background script might think the user is not onboarded if it reads the storage while it's being migrated.
+  if (oldStore) {
+    setTimeout(deleteDeprecatedReduxedChromeStorage, 5000)
+  }
+
+  return { store, persistor }
+}
+
+export function getReduxStore(): ReturnType<typeof setupStore> {
+  if (!store) {
+    throw new Error('Invalid call to `getReduxStore` before store has been initialized')
+  }
+  return store
+}
+
+export function getReduxPersistor(): ReturnType<typeof persistStore> {
+  if (!persistor) {
+    throw new Error('Invalid call to `getReduxPersistor` before store has been initialized')
+  }
+  return persistor
+}
+
+// TODO(EXT-1021): consider removing this helper in favor of using `useDispatch` directly.
+export const useAppDispatch: () => AppDispatch = useDispatch
+export const useAppSelector: TypedUseSelectorHook<WebState> = useSelector
+
+// Use in sagas for better typing when selecting from redux state
+export function* appSelect<T>(fn: (state: WebState) => T): SagaGenerator<T> {
+  const state = yield* select(fn)
+  return state
+}
+
+export type AppDispatch = ReturnType<typeof setupStore>['dispatch']
+export type AppStore = ReturnType<typeof setupStore>
+export type AppSelector<T> = (state: WebState) => T
diff --git a/apps/extension/src/store/storeSynchronization.ts b/apps/extension/src/store/storeSynchronization.ts
new file mode 100644
index 00000000000..8c114e0a459
--- /dev/null
+++ b/apps/extension/src/store/storeSynchronization.ts
@@ -0,0 +1,156 @@
+import { useEffect, useState } from 'react'
+import { getReduxPersistor, initializeReduxStore } from 'src/store/store'
+import { logger } from 'utilities/src/logger/logger'
+import { v4 as uuid } from 'uuid'
+import { PersistedStorage } from 'wallet/src/utils/persistedStorage'
+
+/**
+ * We want only one instance of the app to be persisting the redux store to disk at a time.
+ * To accomplish this, we use the concept of "primary instance", which is the instance of the app that is currently being used.
+ *
+ * An instance of the app is the primary instance when:
+ *  - It is the only instance of the app running.
+ *  - There are multiple instances of the app running, and this is the instance of the sidebar that lives in the window that is currently (or was last) focused.
+ *  - When there is a sidebar and an onboarding instance running on the same window, whichever is currently focused will be the primary.
+ */
+
+const PRIMARY_APP_INSTANCE_ID_KEY = 'primaryAppInstanceId'
+
+const isInitialized = false
+let isPrimaryAppInstance = false
+const terminate: (() => Promise<void>) | null = null
+
+const STORAGE_NAMESPACE = 'session'
+const sessionStorage = new PersistedStorage(STORAGE_NAMESPACE)
+const currentAppInstanceId = uuid()
+
+// These listeners are meant for `useIsPrimaryAppInstance()` to listen for changes.
+const primaryAppInstanceListeners = new Set<(isPrimary: boolean) => void>()
+
+export enum ExtensionAppLocation {
+  SidePanel,
+  Tab,
+}
+
+async function initPrimaryInstanceHandler(appLocation: ExtensionAppLocation): Promise<void> {
+  if (isInitialized) {
+    // This is just to prevent bugs being introduced in the future.
+    logger.error(new Error('`initPrimaryInstanceHandler` called when already initialized'), {
+      tags: {
+        file: 'storeSynchronization.ts',
+        function: 'initPrimaryInstanceHandler',
+      },
+    })
+    return
+  }
+
+  await initializeReduxStore()
+
+  const onStorageChangedListener: Parameters<typeof chrome.storage.onChanged.addListener>[0] = async (
+    changes,
+    namespace,
+  ) => {
+    if (namespace === STORAGE_NAMESPACE && changes[PRIMARY_APP_INSTANCE_ID_KEY]) {
+      const wasPrimaryAppInstance = isPrimaryAppInstance
+      isPrimaryAppInstance = currentAppInstanceId === changes[PRIMARY_APP_INSTANCE_ID_KEY].newValue
+
+      if (wasPrimaryAppInstance === isPrimaryAppInstance) {
+        return
+      }
+
+      const persistor = getReduxPersistor()
+
+      if (isPrimaryAppInstance) {
+        logger.debug('store-synchronization', 'chrome.storage.onChanged', 'Resuming redux persistor')
+
+        persistor.persist()
+      } else {
+        logger.debug('store-synchronization', 'chrome.storage.onChanged', 'Pausing redux persistor')
+        await persistor.flush()
+        persistor.pause()
+      }
+
+      primaryAppInstanceListeners.forEach((listener) => listener(isPrimaryAppInstance))
+    }
+  }
+
+  const onFocusChangedListener: Parameters<typeof chrome.windows.onFocusChanged.addListener>[0] = async (
+    focusedWindowId,
+  ) => {
+    const { id: currentWindowId } = await chrome.windows.getCurrent()
+
+    if (focusedWindowId === currentWindowId) {
+      logger.debug('store-synchronization', 'chrome.windows.onFocusChanged', 'Window focused')
+      await sessionStorage.setItem(PRIMARY_APP_INSTANCE_ID_KEY, currentAppInstanceId)
+    }
+  }
+
+  const onWindowFocusListener: Parameters<typeof window.addEventListener>[1] = async () => {
+    // We set a slight delay to ensure that the `chrome.windows.onFocusChanged` listener runs first.
+    // This is to handle the case where we have a sidebar and an onboarding instance running on the same window.
+    setTimeout(async () => {
+      logger.debug('store-synchronization', 'window.onFocus', 'Window focused')
+      await sessionStorage.setItem(PRIMARY_APP_INSTANCE_ID_KEY, currentAppInstanceId)
+    }, 25)
+  }
+
+  chrome.storage.onChanged.addListener(onStorageChangedListener)
+
+  if (appLocation === ExtensionAppLocation.SidePanel) {
+    chrome.windows.onFocusChanged.addListener(onFocusChangedListener)
+  }
+
+  window.addEventListener('focus', onWindowFocusListener)
+
+  // We always set the current app instance as the primary when it first launches.
+  await sessionStorage.setItem(PRIMARY_APP_INSTANCE_ID_KEY, currentAppInstanceId)
+
+  // This will be used in the onboarding flow when the user completes onboarding but the tab remains open.
+  // We don't want this tab to become the primary ever again when it's focused.
+  StoreSynchronization.terminate = async (): Promise<void> => {
+    chrome.storage.onChanged.removeListener(onStorageChangedListener)
+    chrome.windows.onFocusChanged.removeListener(onFocusChangedListener)
+    window.removeEventListener('focus', onWindowFocusListener)
+
+    const persistor = getReduxPersistor()
+    await persistor.flush()
+    persistor.pause()
+
+    isPrimaryAppInstance = false
+    primaryAppInstanceListeners.forEach((listener) => listener(isPrimaryAppInstance))
+  }
+}
+
+export function useIsPrimaryAppInstance(): boolean {
+  const [isPrimary, setIsPrimary] = useState(isPrimaryAppInstance)
+
+  useEffect(() => {
+    const listener = (_isPrimary: boolean): void => {
+      setIsPrimary(_isPrimary)
+    }
+
+    primaryAppInstanceListeners.add(listener)
+
+    return () => {
+      primaryAppInstanceListeners.delete(listener)
+    }
+  }, [])
+
+  return isPrimary
+}
+
+export function terminateStoreSynchronization(): void {
+  StoreSynchronization.terminate?.().catch((error) => {
+    logger.error(error, {
+      tags: { file: 'storeSynchronization.ts', function: 'useTerminateStoreSynchronization' },
+    })
+  })
+}
+
+export const StoreSynchronization: {
+  init: typeof initPrimaryInstanceHandler
+  terminate: (() => Promise<void>) | null
+} = {
+  init: initPrimaryInstanceHandler,
+  terminate,
+}
diff --git a/apps/extension/src/store/webReducer.ts b/apps/extension/src/store/webReducer.ts
new file mode 100644
index 00000000000..2606cdc3941
--- /dev/null
+++ b/apps/extension/src/store/webReducer.ts
@@ -0,0 +1,20 @@
+import { combineReducers } from 'redux'
+import { dappRequestReducer } from 'src/app/features/dappRequests/slice'
+import { alertsReducer } from 'src/app/features/onboarding/alerts/slice'
+import { popupsReducer } from 'src/app/features/popups/slice'
+import { monitoredSagaReducers } from 'src/app/saga'
+import { RootState } from 'wallet/src/state'
+import { sharedReducers } from 'wallet/src/state/reducer'
+
+export const webReducers = {
+  ...sharedReducers,
+  saga: monitoredSagaReducers,
+  dappRequests: dappRequestReducer,
+  popups: popupsReducer,
+  alerts: alertsReducer,
+} as const
+
+export const webReducer = combineReducers(webReducers)
+
+export type WebState = ReturnType<typeof webReducer> & RootState
+export type ReducerNames = keyof typeof webReducers
diff --git a/apps/extension/src/test/__mocks__/@react-native-masked-view/masked-view.ts b/apps/extension/src/test/__mocks__/@react-native-masked-view/masked-view.ts
new file mode 100644
index 00000000000..66e67ac38c1
--- /dev/null
+++ b/apps/extension/src/test/__mocks__/@react-native-masked-view/masked-view.ts
@@ -0,0 +1,13 @@
+import React, { PropsWithChildren, ReactNode } from 'react'
+import { View, ViewProps } from 'react-native'
+
+// react-native-masked-view for Storybook web
+// https://github.com/react-native-masked-view/masked-view/issues/70#issuecomment-1171801526
+function MaskedViewWeb({
+  maskElement,
+  ...props
+}: PropsWithChildren<{ maskElement: ReactNode }>): React.CElement<ViewProps, View> {
+  return React.createElement(View, props, maskElement)
+}
+
+export default MaskedViewWeb
diff --git a/apps/extension/src/test/__mocks__/@shopify/react-native-skia.ts b/apps/extension/src/test/__mocks__/@shopify/react-native-skia.ts
new file mode 100644
index 00000000000..766d3d19967
--- /dev/null
+++ b/apps/extension/src/test/__mocks__/@shopify/react-native-skia.ts
@@ -0,0 +1,19 @@
+import React, { PropsWithChildren } from 'react'
+import { View, ViewProps } from 'react-native'
+
+// Source: https://github.com/Shopify/react-native-skia/issues/548#issuecomment-1157609472
+
+const PlainView = ({ children, ...props }: PropsWithChildren<unknown>): React.CElement<ViewProps, View> => {
+  return React.createElement(View, props, children)
+}
+const noop = (): null => null
+
+export const BlurMask = PlainView
+export const Canvas = PlainView
+export const Circle = PlainView
+export const Group = PlainView
+export const LinearGradient = PlainView
+export const Mask = PlainView
+export const Path = PlainView
+export const Rect = PlainView
+export const vec = noop
diff --git a/apps/extension/src/test/babel.config.js b/apps/extension/src/test/babel.config.js
new file mode 100644
index 00000000000..7d99c5aa06b
--- /dev/null
+++ b/apps/extension/src/test/babel.config.js
@@ -0,0 +1,25 @@
+// This file is used only by jest in the test environment. To check the extension
+// build set up, see the webpack.config.js file.
+
+module.exports = function (api) {
+  api.cache.using(() => process.env.NODE_ENV)
+  var plugins = [
+    "react-native-web",
+    [
+      'module:react-native-dotenv',
+      {
+        moduleName: 'react-native-dotenv',
+        path: '../../.env.defaults',
+        safe: true,
+        allowUndefined: false,
+      },
+    ],
+    // https://github.com/software-mansion/react-native-reanimated/issues/3364#issuecomment-1268591867
+    '@babel/plugin-proposal-export-namespace-from',
+  ].filter(Boolean)
+
+  return {
+    presets: ['module:@react-native/babel-preset'],
+    plugins,
+  }
+}
diff --git a/apps/extension/src/test/fixtures/redux.ts b/apps/extension/src/test/fixtures/redux.ts
new file mode 100644
index 00000000000..3a33c1cffd4
--- /dev/null
+++ b/apps/extension/src/test/fixtures/redux.ts
@@ -0,0 +1,13 @@
+import { PreloadedState } from 'redux'
+import { WebState } from 'src/store/webReducer'
+import { SharedState } from 'wallet/src/state/reducer'
+import { preloadedSharedState } from 'wallet/src/test/fixtures'
+import { createFixture } from 'wallet/src/test/utils'
+
+type PreloadedExtensionStateOptions = Record<string, never>
+
+export const preloadedExtensionState = createFixture<PreloadedState<WebState>, PreloadedExtensionStateOptions>({})(
+  () => ({
+    ...(preloadedSharedState() as PreloadedState<SharedState>),
+  }),
+)
diff --git a/apps/extension/src/test/jest-resolver.js b/apps/extension/src/test/jest-resolver.js
new file mode 100644
index 00000000000..c7a1c69072d
--- /dev/null
+++ b/apps/extension/src/test/jest-resolver.js
@@ -0,0 +1,33 @@
+const fs = require('fs')
+const path = require('path')
+
+const platformExtensions = ['native', 'ios', 'android']
+const targetExtensions = ['web', '']
+
+module.exports = (request, options) => {
+  const { defaultResolver } = options
+  const resolvedPath = defaultResolver(request, options)
+
+  const parsedPath = path.parse(resolvedPath)
+  const isPlatformSpecific = platformExtensions.some((ext) => parsedPath.name.endsWith(`.${ext}`))
+
+  if (isPlatformSpecific) {
+    const index = parsedPath.name.lastIndexOf('.')
+    const strippedName = parsedPath.name.slice(0, index)
+
+    for (const targetExt of targetExtensions) {
+      const candidatePath = path.format({
+        dir: parsedPath.dir,
+        name: targetExt ? `${strippedName}.${targetExt}` : strippedName,
+        ext: parsedPath.ext,
+      })
+
+      if (fs.existsSync(candidatePath)) {
+        return candidatePath
+      }
+    }
+  }
+
+  // Return default resolved path if no replacement is found
+  return resolvedPath
+}
diff --git a/apps/extension/src/test/render.tsx b/apps/extension/src/test/render.tsx
new file mode 100644
index 00000000000..ae21971273c
--- /dev/null
+++ b/apps/extension/src/test/render.tsx
@@ -0,0 +1,132 @@
+import type { EnhancedStore, PreloadedState } from '@reduxjs/toolkit'
+import { configureStore } from '@reduxjs/toolkit'
+import {
+  render as ReactRender,
+  renderHook as ReactRenderHook,
+  RenderHookOptions,
+  RenderHookResult,
+  RenderOptions,
+  RenderResult,
+} from '@testing-library/react'
+import React, { PropsWithChildren } from 'react'
+import { AppStore } from 'src/store/store'
+import { WebState, webReducer } from 'src/store/webReducer'
+import { Resolvers } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
+import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
+import { SharedProvider } from 'wallet/src/provider'
+import { AutoMockedApolloProvider } from 'wallet/src/test/mocks'
+
+// This type extends the default options for render from RTL, as well
+// as allows the user to specify other things such as initialState, store.
+type ExtendedRenderOptions = RenderOptions & {
+  resolvers?: Resolvers
+  preloadedState?: PreloadedState<WebState>
+  store?: AppStore
+}
+
+/**
+ *
+ * @param ui Component to render
+ * @param resolvers Custom resolvers that override the default ones
+ * @param preloadedState and store
+ * @returns `ui` wrapped with providers
+ */
+export function renderWithProviders(
+  ui: React.ReactElement,
+  {
+    resolvers,
+    preloadedState = {},
+    // Automatically create a store instance if no store was passed in
+    store = configureStore({
+      reducer: webReducer,
+      preloadedState,
+      middleware: (getDefaultMiddleware) => getDefaultMiddleware(),
+    }),
+    ...renderOptions
+  }: ExtendedRenderOptions = {},
+): RenderResult & {
+  store: EnhancedStore
+} {
+  function Wrapper({ children }: PropsWithChildren<unknown>): JSX.Element {
+    return (
+      <AutoMockedApolloProvider resolvers={resolvers}>
+        <SharedProvider reduxStore={store}>
+          <UnitagUpdaterContextProvider>{children}</UnitagUpdaterContextProvider>
+        </SharedProvider>
+      </AutoMockedApolloProvider>
+    )
+  }
+
+  // Return an object with the store and all of RTL's query functions
+  return { store, ...ReactRender(ui, { wrapper: Wrapper, ...renderOptions }) }
+}
+
+// This type extends the default options for render from RTL, as well
+// as allows the user to specify other things such as initialState, store.
+type ExtendedRenderHookOptions<P> = RenderHookOptions<P> & {
+  resolvers?: Resolvers
+  preloadedState?: PreloadedState<WebState>
+  store?: AppStore
+}
+
+type RenderHookWithProvidersResult<R, P = undefined> = Omit<RenderHookResult<R, P>, 'rerender'> & {
+  store: EnhancedStore
+  rerender: (args?: P) => void
+}
+
+// Don't require hookOptions if hook doesn't take any arguments
+export function renderHookWithProviders<R>(
+  hook: () => R,
+  hookOptions?: ExtendedRenderHookOptions<undefined>,
+): RenderHookWithProvidersResult<R>
+
+// Require hookOptions if hook takes arguments
+export function renderHookWithProviders<R, P>(
+  hook: (args: P) => R,
+  hookOptions: ExtendedRenderHookOptions<P>,
+): RenderHookWithProvidersResult<R, P>
+
+/**
+ *
+ * @param hook Hook to render
+ * @param resolvers Custom resolvers that override the default ones
+ * @param preloadedState and store
+ * @returns `hook` wrapped with providers
+ */
+export function renderHookWithProviders<P, R>(
+  hook: (args: P) => R,
+  hookOptions?: ExtendedRenderHookOptions<P>,
+): RenderHookWithProvidersResult<R, P> {
+  const {
+    resolvers,
+    preloadedState = {},
+    // Automatically create a store instance if no store was passed in
+    store = configureStore({
+      reducer: webReducer,
+      preloadedState,
+      middleware: (getDefaultMiddleware) => getDefaultMiddleware(),
+    }),
+    ...renderOptions
+  } = (hookOptions ?? {}) as ExtendedRenderHookOptions<P>
+
+  function Wrapper({ children }: PropsWithChildren<unknown>): JSX.Element {
+    return (
+      <AutoMockedApolloProvider resolvers={resolvers}>
+        <SharedProvider reduxStore={store}>{children}</SharedProvider>
+      </AutoMockedApolloProvider>
+    )
+  }
+
+  const options: RenderHookOptions<P> = {
+    wrapper: Wrapper,
+    ...(renderOptions as RenderHookOptions<P>),
+  }
+
+  const { ...rest } = ReactRenderHook<R, P>((args: P) => hook(args), options)
+
+  // Return an object with the store and all of RTL's query functions
+  return {
+    store,
+    ...rest,
+  }
+}
diff --git a/apps/extension/src/test/test-utils.ts b/apps/extension/src/test/test-utils.ts
new file mode 100644
index 00000000000..2abe0a1491a
--- /dev/null
+++ b/apps/extension/src/test/test-utils.ts
@@ -0,0 +1,6 @@
+import { renderHookWithProviders, renderWithProviders } from 'src/test/render'
+
+// re-export everything
+export * from '@testing-library/react'
+// override render method
+export { renderWithProviders as render, renderHookWithProviders as renderHook }
diff --git a/apps/extension/tsconfig.json b/apps/extension/tsconfig.json
new file mode 100644
index 00000000000..c87e5f89d74
--- /dev/null
+++ b/apps/extension/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Web App",
+  "extends": "tsconfig/nextjs.json",
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/*.json",
+    "../../declarations.d.ts",
+  ],
+  "exclude": [
+    "node_modules"
+  ],
+  "references": [
+    {
+      "path": "../../packages/ui"
+    },
+    {
+      "path": "../../packages/utilities"
+    },
+    {
+      "path": "../../packages/wallet"
+    }
+  ],
+  "compilerOptions": {
+    "baseUrl": "./",
+    "types": [
+      "chrome",
+      "jest"
+    ]
+  }
+}
diff --git a/apps/extension/webpack.config.js b/apps/extension/webpack.config.js
new file mode 100644
index 00000000000..096cb64fd24
--- /dev/null
+++ b/apps/extension/webpack.config.js
@@ -0,0 +1,361 @@
+const { CleanWebpackPlugin } = require('clean-webpack-plugin')
+const { ProgressPlugin, ProvidePlugin, DefinePlugin } = require('webpack')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const path = require('path')
+const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin')
+const fs = require('fs')
+const DotenvPlugin = require('dotenv-webpack')
+const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
+const { sentryWebpackPlugin } = require('@sentry/webpack-plugin')
+
+const NODE_ENV = process.env.NODE_ENV || 'development'
+
+// if not set tamagui wont add nice data-at, data-in etc debug attributes
+process.env.NODE_ENV = NODE_ENV
+
+const isDevelopment = NODE_ENV === 'development'
+const appDirectory = path.resolve(__dirname)
+const manifest = require('./src/manifest.json')
+
+// Add all node modules that have to be compiled
+const compileNodeModules = [
+  // These libraries export JSX code from files with .js extension, which aren't transpiled
+  // in the library to code that doesn't use JSX syntax. This file extension is not automatically
+  // recognized as extension for files containing JSX, so we have to manually add them to
+  // the build proess (to the appropriate loader) and don't exclude them with other node_modules
+  'expo-clipboard',
+  'expo-linear-gradient',
+]
+
+// This is needed for webpack to compile JavaScript.
+// Many OSS React Native packages are not compiled to ES5 before being
+// published. If you depend on uncompiled packages they may cause webpack build
+// errors. To fix this webpack can be configured to compile to the necessary
+// `node_module`.
+const babelLoaderConfiguration = {
+  test: /\.js$/,
+  // Add every directory that needs to be compiled by Babel during the build.
+  include: [
+    // path.resolve(appDirectory, "index.web.js"),
+    // path.resolve(appDirectory, "src"),
+    path.resolve(appDirectory, 'node_modules/react-native-uncompiled'),
+  ],
+  use: {
+    loader: 'babel-loader',
+    options: {
+      cacheDirectory: true,
+      // The 'metro-react-native-babel-preset' preset is recommended to match React Native's packager
+      presets: ['module:@react-native/babel-preset'],
+      // Re-write paths to import only the modules needed by the app
+      plugins: ['react-native-web'],
+    },
+  },
+}
+
+const swcLoader = {
+  loader: 'swc-loader',
+  options: {
+    // parseMap: true, // required when using with babel-loader
+    env: {
+      targets: require('./package.json').browserslist,
+    },
+    sourceMap: isDevelopment,
+    jsc: {
+      parser: {
+        syntax: 'typescript',
+        tsx: true,
+        dynamicImport: true,
+      },
+      transform: {
+        react: {
+          development: isDevelopment,
+          refresh: isDevelopment,
+        },
+      },
+    },
+  },
+}
+
+const swcLoaderConfiguration = {
+  test: ['.jsx', '.js', '.tsx', '.ts'].map((ext) => new RegExp(`${ext}$`)),
+  exclude: new RegExp(`node_modules/(?!(${compileNodeModules.join('|')})/)`),
+  use: swcLoader,
+}
+
+const fileExtensions = ['eot', 'gif', 'jpeg', 'jpg', 'otf', 'png', 'ttf', 'woff', 'woff2', 'mp4']
+
+const {
+  dir,
+  plugins = [],
+  ...extras
+} = isDevelopment
+  ? {
+      dir: 'dev',
+      devServer: {
+        // watchFiles: ['src/**/*', 'webpack.config.js'],
+        host: '127.0.0.1',
+        port: 9997,
+        server: fs.existsSync('localhost.pem')
+          ? {
+              type: 'https',
+              options: {
+                key: 'localhost-key.pem',
+                cert: 'localhost.pem',
+              },
+            }
+          : {},
+        compress: false,
+        static: {
+          directory: path.join(__dirname, '../dev'),
+        },
+        client: {
+          // logging: "info",
+          progress: true,
+          reconnect: false,
+          overlay: {
+            errors: true,
+            warnings: false,
+            // disable resize observer error
+            // NOTE: ideally would use the function format (error) => boolean
+            //       however, I was not able to get past CSP with that solution
+            runtimeErrors: false,
+          },
+        },
+        devMiddleware: {
+          writeToDisk: true,
+        },
+      },
+      devtool: 'cheap-module-source-map',
+      plugins: [new ReactRefreshWebpackPlugin()],
+    }
+  : {
+      dir: 'build',
+      plugins: [],
+    }
+
+module.exports = (env) => {
+  // Build env is either 'dev', 'beta', or 'prod'
+  if (!isDevelopment && env.BUILD_ENV !== 'prod' && env.BUILD_ENV !== 'beta' && env.BUILD_ENV !== 'dev') {
+    throw new Error('Must set BUILD_ENV env variable to either prod, beta or dev')
+  }
+
+  // Build num is the fourth number in the extension version (<major>.<release>.<patch>.<build-num>). It will come from GH actions when building this to publish
+  if (!isDevelopment && (env.BUILD_NUM === undefined || env.BUILD_NUM < 0)) {
+    throw new Error('Must set BUILD_NUM env variable to a number >= 0')
+  }
+
+  const BUILD_ENV = env.BUILD_ENV
+  const BUILD_NUM = env.BUILD_NUM || 0
+
+  // Title Postfix
+  const EXTENSION_NAME_POSTFIX = BUILD_ENV === 'dev' ? 'DEV' : BUILD_ENV === 'beta' ? 'BETA' : ''
+
+  // Description
+  let EXTENSION_DESCRIPTION = manifest.description
+  if (BUILD_ENV === 'beta') {
+    EXTENSION_DESCRIPTION = 'THIS EXTENSION IS FOR BETA TESTING'
+  }
+  if (BUILD_ENV === 'dev') {
+    EXTENSION_DESCRIPTION = 'THIS EXTENSION IS FOR DEV TESTING'
+  }
+
+  // Version
+  const EXTENSION_VERSION = manifest.version + '.' + BUILD_NUM
+
+  return {
+    mode: NODE_ENV,
+    entry: {
+      background: './src/background/background.ts',
+      onboarding: './src/onboarding/onboarding.tsx',
+      loadSidebar: './src/sidebar/loadSidebar.ts',
+      sidebar: './src/sidebar/sidebar.tsx',
+      injected: './src/contentScript/injected.ts',
+      ethereum: './src/contentScript/ethereum.ts',
+    },
+    output: {
+      filename: '[name].js',
+      chunkFilename: '[name].js',
+      path: path.resolve(__dirname, dir),
+      clean: true,
+      publicPath: '',
+    },
+    // https://webpack.js.org/configuration/other-options/#level
+    infrastructureLogging: { level: 'warn' },
+    module: {
+      rules: [
+        // Use this rule together with other rules specified for the same pattern
+        {
+          test: /\.m?js$/,
+          resolve: {
+            fullySpecified: false, // disable the behaviour
+          },
+        },
+        {
+          oneOf: [
+            {
+              test: /\.(woff|woff2)$/,
+              use: { loader: 'file-loader' },
+            },
+
+            {
+              test: /\.css$/,
+              use: [
+                {
+                  loader: 'style-loader',
+                },
+                {
+                  loader: 'css-loader',
+                },
+              ],
+            },
+
+            {
+              type: 'javascript/auto',
+              test: /\.json$/,
+              use: ['file-loader'],
+              include: /tokenlist/,
+            },
+
+            // Used for creating SVG React components (similar to react=native-svg-transformer on mobile)
+            {
+              test: /\.svg$/,
+              use: ['@svgr/webpack'],
+            },
+
+            {
+              test: new RegExp('.(' + fileExtensions.join('|') + ')$'),
+              type: 'asset/resource',
+            },
+
+            {
+              test: /.tsx?$/,
+              exclude: (file) => file.includes('node_modules'),
+              use: [
+                // one after to remove the jsx
+                swcLoader,
+
+                // tamagui optimizes the jsx
+                {
+                  loader: 'tamagui-loader',
+                  options: {
+                    config: '../../packages/ui/src/tamagui.config.ts',
+                    components: ['ui'],
+                    // add files here that should be parsed by the compiler from within any of the apps/*
+                    // for example if you have constants.ts then constants.js goes here and it will eval them
+                    // at build time and if it can flatten views even if they use imports from that file
+                    importsWhitelist: ['constants.js'],
+                    disableExtraction: process.env.NODE_ENV === 'development',
+                  },
+                },
+
+                // one before to remove types
+                {
+                  loader: 'esbuild-loader',
+                  options: {
+                    target: 'es2022',
+                    jsx: 'preserve',
+                    minify: false,
+                  },
+                },
+              ],
+            },
+
+            babelLoaderConfiguration,
+            swcLoaderConfiguration,
+          ],
+        },
+      ],
+    },
+    resolve: {
+      alias: {
+        'react-native$': 'react-native-web',
+        'react-native-reanimated$': require.resolve('react-native-reanimated'),
+        'react-native-vector-icons$': 'react-native-vector-icons/dist',
+        src: path.resolve(__dirname, 'src'), // absolute imports in apps/web
+        'react-native-gesture-handler$': require.resolve('react-native-gesture-handler'),
+      },
+      // Add support for web-based extensions so we can share code between mobile/extension
+      extensions: [
+        '.web.js',
+        '.web.jsx',
+        '.web.ts',
+        '.web.tsx',
+        ...fileExtensions.map((e) => `.${e}`),
+        ...['.js', '.jsx', '.ts', '.tsx', '.css'],
+      ],
+      fallback: {
+        fs: false,
+      },
+    },
+    devtool: 'source-map',
+    plugins: [
+      new DotenvPlugin({
+        path: '../../.env',
+        defaults: true,
+      }),
+      new DefinePlugin({
+        __DEV__: NODE_ENV === 'development' ? 'true' : 'false',
+        'process.env.IS_STATIC': '""',
+        'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
+        'process.env.DEBUG': JSON.stringify(process.env.DEBUG || '0'),
+        'process.env.VERSION': JSON.stringify(EXTENSION_VERSION),
+        'process.env.IS_UNISWAP_EXTENSION': '"true"',
+      }),
+      new CleanWebpackPlugin(),
+      new NodePolyfillPlugin(), // necessary to compile with reactnative-dotenv
+      ...plugins,
+      new MiniCssExtractPlugin(),
+      new ProgressPlugin(),
+      new ProvidePlugin({
+        process: 'process/browser',
+        React: 'react',
+        Buffer: ['buffer', 'Buffer'],
+      }),
+      new CopyWebpackPlugin({
+        patterns: [
+          {
+            from: 'src/manifest.json',
+            force: true,
+            transform(content) {
+              return Buffer.from(
+                JSON.stringify(
+                  {
+                    ...manifest,
+                    description: EXTENSION_DESCRIPTION,
+                    version: EXTENSION_VERSION,
+                    name: EXTENSION_NAME_POSTFIX ? manifest.name + ' ' + EXTENSION_NAME_POSTFIX : manifest.name,
+                  },
+                  null,
+                  2,
+                ),
+              )
+            },
+          },
+          {
+            from: 'src/assets/fonts/*.{woff,woff2,ttf}',
+            to: 'assets/fonts/[name][ext]',
+            force: true,
+          },
+          {
+            from: 'src/assets/*.{html,png,svg}',
+            to: 'assets/[name][ext]',
+            force: true,
+          },
+          {
+            from: 'src/*.{html,png,svg}',
+            to: '[name][ext]',
+            force: true,
+          },
+        ],
+      }),
+      sentryWebpackPlugin({
+        authToken: env.SENTRY_AUTH_TOKEN,
+        org: 'uniswap-labs',
+        project: 'extension-wallet',
+        telemetry: process.env.NODE_ENV === 'production',
+      }),
+    ],
+    ...extras,
+  }
+}
diff --git a/apps/mobile/__mocks__/@react-navigation/native.js b/apps/mobile/__mocks__/@react-navigation/native.js
deleted file mode 100644
index ce368193060..00000000000
--- a/apps/mobile/__mocks__/@react-navigation/native.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copied from:
-// https://gist.github.com/phcbarros/bd90825863c3573cc0a28e90db17d1a4
-const RNN = require('@react-navigation/native')
-let listeners = {}
-const setOptions = jest.fn()
-const navigate = jest.fn()
-
-const navigation = {
-  setOptions,
-  navigate,
-  addListener: jest.fn((name, l) => (listeners[name] = l)),
-  getListener: (name) => listeners[name],
-  triggerListener: (name, ...params) => listeners[name](...params),
-  resetListeners: () => {
-    listeners = {}
-  },
-}
-
-const useNavigation = () => navigation
-let params = {}
-const useRoute = () => ({
-  params,
-})
-
-module.exports = {
-  ...RNN,
-  useNavigation,
-  useRoute,
-  setParams: (p) => (params = { ...params, ...p }),
-}
diff --git a/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInput.kt b/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInput.kt
index 0770108f68b..7f7bda84d6d 100644
--- a/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInput.kt
+++ b/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInput.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -142,29 +141,26 @@ fun SeedPhraseInput(
 private fun SeedPhraseError(viewModel: SeedPhraseInputViewModel) {
   val status = viewModel.status
   val rnStrings = viewModel.rnStrings
-  var text = ""
 
   if (status is Error) {
-    text = when (val error = status.error) {
+    val text = when (val error = status.error) {
       is InvalidWord -> "${rnStrings.errorInvalidWord} ${error.word}"
       is NotEnoughWords, TooManyWords -> rnStrings.errorPhraseLength
       is WrongRecoveryPhrase -> rnStrings.errorWrongPhrase
       is InvalidPhrase -> rnStrings.errorInvalidPhrase
     }
-  }
-
-  Row(
-    horizontalArrangement = Arrangement.spacedBy(UniswapTheme.spacing.spacing4),
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.alpha(if (text.isEmpty()) 0f else 1f)
-  ) {
-    Icon(
-      painter = painterResource(id = R.drawable.uniswap_icon_alert_triangle),
-      tint = UniswapTheme.colors.statusCritical,
-      contentDescription = null,
-      modifier = Modifier.size(16.dp)
-    )
-    Text(text, style = UniswapTheme.typography.body3, color = UniswapTheme.colors.statusCritical)
+    Row(
+      horizontalArrangement = Arrangement.spacedBy(UniswapTheme.spacing.spacing4),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      Icon(
+        painter = painterResource(id = R.drawable.uniswap_icon_alert_triangle),
+        tint = UniswapTheme.colors.statusCritical,
+        contentDescription = null,
+        modifier = Modifier.size(16.dp)
+      )
+      Text(text, style = UniswapTheme.typography.body3, color = UniswapTheme.colors.statusCritical)
+    }
   }
 }
 
diff --git a/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInputViewModel.kt b/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInputViewModel.kt
index f9d839e1dda..32768d11bf8 100644
--- a/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInputViewModel.kt
+++ b/apps/mobile/android/app/src/main/java/com/uniswap/onboarding/import/SeedPhraseInputViewModel.kt
@@ -6,13 +6,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.uniswap.EthersRs
 import com.uniswap.RnEthersRs
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 class SeedPhraseInputViewModel(
   private val ethersRs: RnEthersRs,
@@ -60,26 +55,13 @@ class SeedPhraseInputViewModel(
     private set
   var status by mutableStateOf<Status>(Status.None)
     private set
-  private var validateLastWordTimeout: Long = 1000
-  private var validateLastWordJob: Job? = null
 
   fun handleInputChange(value: TextFieldValue) {
     input = value
 
     val normalized = normalizeInput(value)
     val skipLastWord = normalized.lastOrNull() != ' '
-    validateInput(normalized, skipLastWord)
-
-    validateLastWordJob?.cancel()
-
-    validateLastWordJob = viewModelScope.launch(Dispatchers.Default) {
-      delay(validateLastWordTimeout)
-      validateInput(normalized, false)
-    }
-  }
-
-  private fun validateInput(normalizedInput: String, skipLastWord: Boolean) {
-    val mnemonic = normalizedInput.trim()
+    val mnemonic = normalized.trim()
     val words = mnemonic.split(" ")
 
     if (words.isEmpty()) {
@@ -89,14 +71,14 @@ class SeedPhraseInputViewModel(
 
     val isValidLength = words.size in MIN_LENGTH..MAX_LENGTH
     val firstInvalidWord = EthersRs.findInvalidWord(mnemonic)
-    status = if (firstInvalidWord == words.last() && skipLastWord) {
-      Status.None
+    if (firstInvalidWord == words.last() && skipLastWord) {
+      status = Status.None
     } else if (firstInvalidWord.isEmpty() && isValidLength) {
-      Status.Valid
+      status = Status.Valid
     } else if (firstInvalidWord.isNotEmpty()) {
-      Status.Error(MnemonicError.InvalidWord(firstInvalidWord))
+      status = Status.Error(MnemonicError.InvalidWord(firstInvalidWord))
     } else {
-      Status.None
+      status = Status.None
     }
 
     val canSubmit = status !is Status.Error && mnemonic != "" && firstInvalidWord.isEmpty()
diff --git a/apps/mobile/android/settings.gradle b/apps/mobile/android/settings.gradle
index abce13dff8c..556232de3e9 100644
--- a/apps/mobile/android/settings.gradle
+++ b/apps/mobile/android/settings.gradle
@@ -8,6 +8,6 @@ apply from: new File(["node", "--print", "require.resolve('../../../node_modules
 useExpoModules()
 
 include ':@sentry_react-native'
-
+project(':@sentry_react-native').projectDir = new File('../../../node_modules/@sentry/react-native/android')
 include ':detox'
 project(':detox').projectDir = new File('../../../node_modules/detox/android/detox')
diff --git a/apps/mobile/e2e/Home.e2e.ts b/apps/mobile/e2e/Home.e2e.ts
deleted file mode 100644
index b3ecd4a6112..00000000000
--- a/apps/mobile/e2e/Home.e2e.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { HomeBasicInteractions } from 'e2e/usecases/home/HomeBasicInteractions'
-import { WatchWallet } from 'e2e/usecases/onboarding/WatchWallet'
-
-describe('Home', () => {
-  beforeEach(async () => {
-    await device.launchApp()
-    await WatchWallet()
-  })
-
-  it('tests basic home screen interactions', HomeBasicInteractions)
-})
diff --git a/apps/mobile/e2e/Onboarding.e2e.ts b/apps/mobile/e2e/Onboarding.e2e.ts
index 8a23dd2871b..efb67731ed3 100644
--- a/apps/mobile/e2e/Onboarding.e2e.ts
+++ b/apps/mobile/e2e/Onboarding.e2e.ts
@@ -1,5 +1,4 @@
 import { CreateNewWallet } from 'e2e/usecases/onboarding/CreateNewWallet'
-import { ImportWallet } from 'e2e/usecases/onboarding/ImportWallet'
 import { WatchWallet } from 'e2e/usecases/onboarding/WatchWallet'
 
 describe('Onboarding', () => {
@@ -8,12 +7,13 @@ describe('Onboarding', () => {
   })
 
   afterEach(async () => {
-    await device.clearKeychain()
     await device.uninstallApp()
     await device.installApp()
   })
 
   it('creates a new wallet', CreateNewWallet)
   it('watches wallet', WatchWallet)
-  it('imports a testing wallet using recovery phrase', ImportWallet)
+  // TODO: find the way to test native input
+  // eslint-disable-next-line jest/no-commented-out-tests
+  // it('imports a testing wallet using recovery phrase', ImportWallet)
 })
diff --git a/apps/mobile/e2e/README.md b/apps/mobile/e2e/README.md
index 881e91cc6d2..89b2fc88a4e 100644
--- a/apps/mobile/e2e/README.md
+++ b/apps/mobile/e2e/README.md
@@ -29,12 +29,6 @@ Run ios e2e tests in debug mode:
 yarn mobile e2e:ios:test:debug
 ```
 
-Useful perameters:
-
-`--testNamePattern test-name` to run a single test, replace `test-name` with test file name without extension e.g.: `Swap` or `Onboarding`.
-
-`--reuse` to start the test from a current app state. Useful for testing nested screen behaviour without going through onboarding and navigation steps.
-
 #### Release mode
 
 To run tests in release mode:
@@ -51,10 +45,6 @@ E2E tests should remain as close as possible to production, but sometimes mockin
 
 Only mocking entire files is supported at the moment, so you may need to reorganize functions. To mock a file, create a new one with the same name and extension `mock.ts` (e.g. `AnimatedHeader.ts` -> `AnimatedHeader.mock.ts`) in the same directory. The metro bundler will override any file that has a `mock.ts` equivalent in Detox runs.
 
-Android native views based on jetpack compose and libraries utilizing long-running asynchronouse background processes like sentry are not supported by detox currently. Imports mocking is unfortunatelly not supported by detox yet. If such problems occur, the entire component using problematic library needs to be mocked or a component exposing only targeted library needs to be created and then it can be mocked, precisely replacing only targeted library.
-
-To mock a component for specific platform follow this pattern:
-iOS: `AnimatedHeader.ts` -> `AnimatedHeader.ios.mock.ts`
-Android: `AnimatedHeader.ts` -> `AnimatedHeader.android.mock.ts`
+Native views, libraries relying on the native code and libraries utilizing long-running asynchronouse background processes like sentry are not supported by detox currently. Imports mocking is unfortunatelly not supported by detox yet. If such problems occur, the entire component using problematic library needs to be mocked or a component exposing only targeted library needs to be created and then it can be mocked, precisely replacing only targeted library.
 
 Read more here https://wix.github.io/Detox/docs/guide/mocking/
diff --git a/apps/mobile/e2e/usecases/home/HomeBasicInteractions.ts b/apps/mobile/e2e/usecases/home/HomeBasicInteractions.ts
deleted file mode 100644
index 339b10d1cd1..00000000000
--- a/apps/mobile/e2e/usecases/home/HomeBasicInteractions.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { by, element, expect } from 'detox'
-import { TestWatchedWallet } from 'e2e/utils/fixtures'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
-
-export async function HomeBasicInteractions(): Promise<void> {
-  await expect(element(by.text(TestWatchedWallet.displayName))).toBeVisible()
-  await expect(element(by.id(TestID.Swap))).toBeVisible()
-  await expect(element(by.id(TestID.SearchTokensAndWallets))).toBeVisible()
-
-  // opens AccountSwitcherModal by clicking on account avatar
-  await expect(element(by.id(TestID.AccountHeaderAvatar))).toBeVisible()
-
-  // checks if portfolio balance is visible
-  await expect(element(by.id(TestID.PortfolioBalance))).toBeVisible()
-
-  // copies wallet address from AccountSwitcherModal
-  await element(by.id(TestID.AccountHeaderCopyAddress)).tap()
-
-  // checks if notification toast is visible with title "Address copied"
-  await expect(element(by.id(TestID.NotificationToastTitle))).toBeVisible()
-  await expect(element(by.id(TestID.NotificationToastTitle))).toHaveText('Address copied')
-
-  // checks if list was rendered properly by checking if the first item is visible
-  await expect(element(by.id('token-list-item-0'))).toBeVisible()
-
-  // scrolls to the bottom of the token list
-  await element(by.id('token-list-item-0')).swipe('up')
-
-  // checks if only tabs headers are visible then scrolled to bottom
-  await expect(element(by.id(TestID.AccountHeaderAvatar))).not.toBeVisible()
-  await expect(element(by.id(TestID.PortfolioBalance))).not.toBeVisible()
-  // for some reason react-native-tab-view renders headers twice, thats why first matching item was picked
-  await expect(element(by.id('home-tab-Tokens')).atIndex(0)).toBeVisible()
-  await expect(element(by.id('home-tab-NFTs')).atIndex(0)).toBeVisible()
-  await expect(element(by.id('home-tab-Activity')).atIndex(0)).toBeVisible()
-
-  // checks if the first item of hidden list is not visible
-  await expect(element(by.id('token-list-item-0'))).not.toBeVisible()
-
-  // hidden item does not exist
-  await expect(element(by.id('token-list-item-25'))).not.toExist()
-
-  // taps on "show" button to show hidden elements
-  await element(by.id(TestID.ShowHiddenTokens)).tap()
-
-  // checks if first hidden element is visible
-  await expect(element(by.id('token-list-item-25'))).toExist()
-
-  // taps on "hide" button to show hidden elements
-  await element(by.id(TestID.ShowHiddenTokens)).tap()
-
-  // checks if first item of the hidden item is not visible again
-  await expect(element(by.id('token-list-item-25'))).not.toExist()
-
-  // switches to NFTs tab
-  await element(by.id('home-tab-NFTs')).atIndex(0).tap()
-
-  // checks is if tokens are visible
-  await expect(element(by.id('nfts-list-item-0'))).toBeVisible()
-
-  // switches to Activity tab
-  await element(by.id('home-tab-Activity')).atIndex(0).tap()
-
-  // checks is if tokens are visible
-  await expect(element(by.id('activity-list-item-0'))).toBeVisible()
-
-  // switches back to tokens tab
-  await element(by.id('home-tab-Tokens')).atIndex(0).tap()
-
-  // scrolls to the bottom of the token list
-  await element(by.id('token-list-item-16')).swipe('down')
-
-  // checks if list of tokens was rendered properly by checking first token visibility
-  await expect(element(by.id('token-list-item-0'))).toBeVisible()
-}
diff --git a/apps/mobile/e2e/usecases/onboarding/ImportWallet.ts b/apps/mobile/e2e/usecases/onboarding/ImportWallet.ts
index 539b64cb548..70b742b7a34 100644
--- a/apps/mobile/e2e/usecases/onboarding/ImportWallet.ts
+++ b/apps/mobile/e2e/usecases/onboarding/ImportWallet.ts
@@ -10,6 +10,7 @@ export async function ImportWallet(): Promise<void> {
   await element(by.id(TestID.OnboardingImportSeedPhrase)).tap()
 
   // Checks if recovery phase input is in focus and types recovery phrase in
+  await expect(element(by.id(TestID.ImportAccountInput))).toBeFocused()
   await element(by.id(TestID.ImportAccountInput)).typeText(TestWallet.recoveryPhrase)
 
   // Taps continue navigating to SelectWalletScreen
diff --git a/apps/mobile/e2e/usecases/swap/SwapBasicInteractions.ts b/apps/mobile/e2e/usecases/swap/SwapBasicInteractions.ts
index 7d7414f0c65..4fb54b3deef 100644
--- a/apps/mobile/e2e/usecases/swap/SwapBasicInteractions.ts
+++ b/apps/mobile/e2e/usecases/swap/SwapBasicInteractions.ts
@@ -18,43 +18,41 @@ export async function SwapBasicInteractions(): Promise<void> {
   // Picks usdc output token
   await element(by.text('USDC')).atIndex(0).tap()
 
-  // Taps .98765432101 into the swap input
-  await element(by.id('decimal-pad-.')).tap()
-  await element(by.id('decimal-pad-9')).tap()
-  await element(by.id('decimal-pad-8')).tap()
-  await element(by.id('decimal-pad-7')).tap()
-  await element(by.id('decimal-pad-6')).tap()
-  await element(by.id('decimal-pad-5')).tap()
-  await element(by.id('decimal-pad-4')).tap()
-  await element(by.id('decimal-pad-3')).tap()
-  await element(by.id('decimal-pad-2')).tap()
+  // Taps 1234567890 number into swap input
   await element(by.id('decimal-pad-1')).tap()
+  await element(by.id('decimal-pad-2')).tap()
+  await element(by.id('decimal-pad-3')).tap()
+  await element(by.id('decimal-pad-4')).tap()
+  await element(by.id('decimal-pad-5')).tap()
+  await element(by.id('decimal-pad-6')).tap()
+  await element(by.id('decimal-pad-7')).tap()
+  await element(by.id('decimal-pad-8')).tap()
+  await element(by.id('decimal-pad-.')).tap()
   await element(by.id('decimal-pad-0')).tap()
+  await element(by.id('decimal-pad-9')).tap()
   await element(by.id('decimal-pad-1')).tap()
-
-  // Taps a backspace button leaving .9876543210 value in the input field
   await element(by.id('decimal-pad-backspace')).tap()
 
-  // Checks if expected input expected value: ".9876543210"
-  await expect(element(by.id(TestID.AmountInputIn))).toHaveText('.9876543210')
+  // Checks if expected input expected value: "12345678.09"
+  await expect(element(by.id(TestID.AmountInputIn))).toHaveValue('12345678.09')
 
   // Checks if expected error is displayed
   await expect(element(by.text('You don’t have enough ETH'))).toBeVisible()
 
   // Checks if expected output expected value: "0"
-  await expect(element(by.id(TestID.AmountInputOut))).not.toHaveText('0')
+  await expect(element(by.id(TestID.AmountInputOut))).not.toHaveValue('0')
 
   // Swaps input and output currencies
   await element(by.id(TestID.SwitchCurrenciesButton)).tap()
 
   // Checks if expected input expected value: "0"
-  await expect(element(by.id(TestID.AmountInputIn))).not.toHaveText('0')
+  await expect(element(by.id(TestID.AmountInputIn))).toHaveValue('0')
 
   // Checks if expected error is displayed
-  await expect(element(by.text('You don’t have enough USDC'))).toBeVisible()
+  await expect(element(by.text('Not enough liquidity'))).toBeVisible()
 
-  // Checks if expected output expected value: ".9876543210"
-  await expect(element(by.id(TestID.AmountInputOut))).toHaveText('.9876543210')
+  // Checks if expected output expected value: "12345678.09"
+  await expect(element(by.id(TestID.AmountInputOut))).toHaveValue('12345678.09')
 
   // Swaps input and output currencies
   await element(by.id(TestID.SwitchCurrenciesButton)).tap()
@@ -70,10 +68,10 @@ export async function SwapBasicInteractions(): Promise<void> {
   await element(by.id('decimal-pad-3')).tap()
 
   // Checks if output has expected value: "123"
-  await expect(element(by.id(TestID.AmountInputOut))).toHaveText('123')
+  await expect(element(by.id(TestID.AmountInputOut))).toHaveValue('123')
 
   // Checks if expected input value to be cleared
-  await expect(element(by.id(TestID.AmountInputIn))).not.toHaveText('0')
+  await expect(element(by.id(TestID.AmountInputIn))).not.toHaveValue('0')
 
   // Checks dollar value to be visible
   await expect(element(by.text('$123.00'))).toBeVisible()
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputManager.m b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputManager.m
index 71430dc2682..2342c17486a 100644
--- a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputManager.m
+++ b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputManager.m
@@ -16,7 +16,6 @@ @interface RCT_EXTERN_MODULE(SeedPhraseInputManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(onPasteStart, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onPasteEnd, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onHeightMeasured, RCTDirectEventBlock);
-RCT_EXPORT_VIEW_PROPERTY(testID, NSString?)
 RCT_EXTERN_METHOD(handleSubmit: (nonnull NSNumber *)node)
 
 @end
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputView.swift b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputView.swift
index 55781b4ef48..f2dda700695 100644
--- a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputView.swift
+++ b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputView.swift
@@ -78,12 +78,6 @@ class SeedPhraseInputView: UIView {
     set { vc.rootView.viewModel.onHeightMeasured = newValue }
     get { return vc.rootView.viewModel.onHeightMeasured }
   }
-
-  @objc
-  var testID: String? {
-    get { vc.rootView.viewModel.testID }
-    set { vc.rootView.viewModel.testID = newValue }
-  }
   
   @objc
   var handleSubmit: () -> Void {
@@ -118,14 +112,12 @@ struct SeedPhraseInput: View {
     VStack(spacing: 12) {
       VStack {
         VStack {
-          ZStack(alignment: .topLeading) {
+          ZStack(alignment: .leading) {
             TextEditor(text: $viewModel.input)
               .focused($focused)
               .autocorrectionDisabled()
               .textInputAutocapitalization(.never)
               .modifier(TextEditModifier())
-              .frame(minHeight: 96) // 120 - 2 * 12 for padding
-              .accessibility(identifier: viewModel.testID ?? "import-account-input")
             
             if (viewModel.input.isEmpty) {
               Text(viewModel.strings.inputPlaceholder)
@@ -139,6 +131,7 @@ struct SeedPhraseInput: View {
           .fixedSize(horizontal: false, vertical: true)
           .background(Colors.surface1)
           .padding(12) // Adds to default TextEditor padding 8
+          .frame(minHeight: 120, alignment: .top)
           .cornerRadius(16)
           .overlay(
             RoundedRectangle(cornerRadius: 16)
@@ -148,7 +141,7 @@ struct SeedPhraseInput: View {
           .onTapGesture {
             focused = true
           }
-          .onAppear {
+          .onAppear() {
             DispatchQueue.main.async {
               focused = true
             }
@@ -196,7 +189,7 @@ struct SeedPhraseInput: View {
         }
       )
     }
-    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+    .frame(maxWidth:.infinity, maxHeight: .infinity, alignment: .top)
     .font(font)
   }
 
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputViewModel.swift b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputViewModel.swift
index b6d9f2fc896..62432057f05 100644
--- a/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputViewModel.swift
+++ b/apps/mobile/ios/Uniswap/Onboarding/Import/SeedPhraseInputViewModel.swift
@@ -36,9 +36,6 @@ class SeedPhraseInputViewModel: ObservableObject {
   
   // Following block of variables will come from RN
   @Published var targetMnemonicId: String? = nil
-
-  @Published var testID: String? = nil
-  
   @Published var rawRNStrings: Dictionary<String, String> = Dictionary<String, String>() {
     didSet {
       strings = ReactNativeStrings(
@@ -65,15 +62,11 @@ class SeedPhraseInputViewModel: ObservableObject {
   @Published var onPasteEnd: RCTDirectEventBlock = { _ in }
   @Published var onHeightMeasured: RCTDirectEventBlock = { _ in }
   
-  private var lastWordValidationTimer: Timer?
-  private let lastWordValidationTimeout: TimeInterval = 1.0
-  
   @Published var input = "" {
     didSet {
-      handleInputChange()
+      validateInput()
     }
   }
-  @Published var skipLastWord = true
   @Published var status: Status = .none
   @Published var error: MnemonicError? = nil
   
@@ -142,26 +135,10 @@ class SeedPhraseInputViewModel: ObservableObject {
     return value.trimmingCharacters(in: .whitespacesAndNewlines)
   }
   
-  private func handleInputChange() {
+  private func validateInput() {
     let normalized = normalizeInput(value: input)
     let skipLastWord = normalized.last != " "
-    validateInput(normalizedInput: normalized, skipLastWord: skipLastWord)
-    
-    lastWordValidationTimer?.invalidate()
-    
-    if (skipLastWord) {
-      lastWordValidationTimer = Timer.scheduledTimer(
-        withTimeInterval: lastWordValidationTimeout,
-        repeats: false) { _ in
-            DispatchQueue.global(qos: .background).async {
-                self.validateInput(normalizedInput: normalized, skipLastWord: false)
-            }
-        }
-    }
-  }
-  
-  private func validateInput(normalizedInput: String, skipLastWord: Bool) {
-    let mnemonic = trimInput(value: normalizedInput)
+    let mnemonic = trimInput(value: normalized)
 
     let words = mnemonic.components(separatedBy: " ")
     
diff --git a/apps/mobile/jest-setup.js b/apps/mobile/jest-setup.js
index eead5ec6431..084c8648abc 100644
--- a/apps/mobile/jest-setup.js
+++ b/apps/mobile/jest-setup.js
@@ -122,3 +122,8 @@ jest.mock('wallet/src/features/appearance/hooks', () => {
     useSelectedColorScheme: () => 'light',
   }
 })
+
+jest.mock('wallet/src/features/fiatOnRamp/api', () => ({
+  ...jest.requireActual('wallet/src/features/fiatOnRamp/api'),
+  useFiatOnRampIpAddressQuery: jest.fn().mockReturnValue({}),
+}))
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 26f39ae3b5a..4cc4190305a 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -33,7 +33,7 @@
     "link:assets": "react-native-asset",
     "graphql:generate:swift": "cd ios && ./Pods/Apollo/apollo-ios-cli generate",
     "hardhat": "hardhat node",
-    "check:circular": "../../scripts/check-circular-imports.sh ./src/app/App.tsx 5",
+    "check:circular": "../../scripts/check-circular-imports.sh ./src/app/App.tsx 6",
     "ios": "yarn ios:prebuild && SKIP_BUNDLING=1 react-native run-ios",
     "ios:prebuild": "yarn graphql:generate:swift && cd ios/WidgetsCore/MobileSchema && rm -rf !(README.md) && cd ../../.. && yarn graphql:generate:swift && yarn env:local:copy:swift",
     "ios:smol": "SKIP_BUNDLING=1 react-native run-ios --simulator=\"iPhone SE (3rd generation)\"",
@@ -83,7 +83,7 @@
     "@shopify/react-native-performance-navigation": "3.0.0",
     "@shopify/react-native-skia": "1.2.0",
     "@uniswap/analytics": "1.7.0",
-    "@uniswap/analytics-events": "2.34.0",
+    "@uniswap/analytics-events": "2.32.0",
     "@uniswap/ethers-rs-mobile": "0.0.5",
     "@uniswap/sdk-core": "5.3.0",
     "@uniswap/v3-sdk": "3.13.0",
@@ -171,7 +171,7 @@
     "babel-plugin-module-resolver": "5.0.0",
     "babel-plugin-react-native-web": "0.17.5",
     "core-js": "2.6.12",
-    "detox": "20.23.0",
+    "detox": "20.18.1",
     "eslint": "8.44.0",
     "expo-modules-core": "1.11.13",
     "hardhat": "2.14.0",
diff --git a/apps/mobile/scripts/podinstall.sh b/apps/mobile/scripts/podinstall.sh
index fc7d144225a..e6b5f42feaa 100755
--- a/apps/mobile/scripts/podinstall.sh
+++ b/apps/mobile/scripts/podinstall.sh
@@ -1,26 +1,2 @@
 #!/bin/bash
-
-set -e
-
-REQUIRED_XCODE_VERSION="15.2"
-
-check_xcode_version() {
-    local current_version=$(xcodebuild -version | grep "Xcode" | cut -d' ' -f2)
-    if [ "$current_version" != "$REQUIRED_XCODE_VERSION" ]; then
-        echo "Error: Xcode version mismatch"
-        echo "Required: $REQUIRED_XCODE_VERSION"
-        echo "Current: $current_version"
-        exit 1
-    fi
-    echo "Xcode version check passed: $current_version"
-}
-
-# Check Xcode version
-check_xcode_version
-
-# Install pods
-cd ios/
-bundle install
-bundle exec pod install
-cd ..
-
+cd ios/ && bundle install && bundle exec pod install && cd ..
diff --git a/apps/mobile/src/app/App.tsx b/apps/mobile/src/app/App.tsx
index 95b75963cda..8e1520e9ac3 100644
--- a/apps/mobile/src/app/App.tsx
+++ b/apps/mobile/src/app/App.tsx
@@ -12,10 +12,9 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { MMKV } from 'react-native-mmkv'
 import { SafeAreaProvider } from 'react-native-safe-area-context'
 import { enableFreeze } from 'react-native-screens'
-import { useDispatch } from 'react-redux'
 import { PersistGate } from 'redux-persist/integration/react'
 import { MobileWalletNavigationProvider } from 'src/app/MobileWalletNavigationProvider'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { AppModals } from 'src/app/modals/AppModals'
 import { NavigationContainer } from 'src/app/navigation/NavigationContainer'
 import { useIsPartOfNavigationTree } from 'src/app/navigation/hooks'
@@ -256,7 +255,7 @@ function AppOuter(): JSX.Element | null {
 }
 
 function AppInner(): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isDarkMode = useIsDarkMode()
   const themeSetting = useCurrentAppearanceSetting()
   const allowAnalytics = useAppSelector(selectAllowAnalytics)
diff --git a/apps/mobile/src/app/MobileWalletNavigationProvider.tsx b/apps/mobile/src/app/MobileWalletNavigationProvider.tsx
index 567bc98e84b..f39d6ceb534 100644
--- a/apps/mobile/src/app/MobileWalletNavigationProvider.tsx
+++ b/apps/mobile/src/app/MobileWalletNavigationProvider.tsx
@@ -1,6 +1,6 @@
 import { PropsWithChildren, useCallback } from 'react'
 import { Share } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { exploreNavigationRef } from 'src/app/navigation/navigation'
 import { useAppStackNavigation } from 'src/app/navigation/types'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
@@ -24,6 +24,7 @@ import {
   getNavigateToSendFlowArgsInitialState,
   getNavigateToSwapFlowArgsInitialState,
 } from 'wallet/src/contexts/WalletNavigationContext'
+import { useFiatOnRampIpAddressQuery } from 'wallet/src/features/fiatOnRamp/api'
 import { getNftUrl, getTokenUrl } from 'wallet/src/utils/linking'
 
 export function MobileWalletNavigationProvider({ children }: PropsWithChildren): JSX.Element {
@@ -113,7 +114,7 @@ function useNavigateToHomepageTab(tab: HomeScreenTabIndex): () => void {
 }
 
 function useNavigateToReceive(): () => void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   return useCallback((): void => {
     dispatch(openModal({ name: ModalName.WalletConnectScan, initialState: ScannerModalState.WalletQr }))
@@ -121,7 +122,7 @@ function useNavigateToReceive(): () => void {
 }
 
 function useNavigateToSend(): (args: NavigateToSendFlowArgs) => void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   return useCallback(
     (args: NavigateToSendFlowArgs) => {
@@ -133,7 +134,7 @@ function useNavigateToSend(): (args: NavigateToSendFlowArgs) => void {
 }
 
 function useNavigateToSwapFlow(): (args: NavigateToSwapFlowArgs) => void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   return useCallback(
     (args: NavigateToSwapFlowArgs): void => {
@@ -191,8 +192,10 @@ function useNavigateToNftCollection(): (args: NavigateToNftCollectionArgs) => vo
 }
 
 function useNavigateToBuyOrReceiveWithEmptyWallet(): () => void {
-  const dispatch = useDispatch()
-  // This flag is enabled only for supported countries.
+  const dispatch = useAppDispatch()
+
+  const { data } = useFiatOnRampIpAddressQuery()
+  const moonpayFiatOnRampEligible = Boolean(data?.isBuyAllowed)
   const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregator)
 
   return useCallback((): void => {
@@ -200,6 +203,8 @@ function useNavigateToBuyOrReceiveWithEmptyWallet(): () => void {
 
     if (forAggregatorEnabled) {
       dispatch(openModal({ name: ModalName.FiatOnRampAggregator }))
+    } else if (moonpayFiatOnRampEligible) {
+      dispatch(openModal({ name: ModalName.FiatOnRamp }))
     } else {
       dispatch(
         openModal({
@@ -208,5 +213,5 @@ function useNavigateToBuyOrReceiveWithEmptyWallet(): () => void {
         }),
       )
     }
-  }, [dispatch, forAggregatorEnabled])
+  }, [dispatch, forAggregatorEnabled, moonpayFiatOnRampEligible])
 }
diff --git a/apps/mobile/src/app/hooks.ts b/apps/mobile/src/app/hooks.ts
index 639606da04f..050c29e024b 100644
--- a/apps/mobile/src/app/hooks.ts
+++ b/apps/mobile/src/app/hooks.ts
@@ -1,13 +1,16 @@
 import { useFocusEffect } from '@react-navigation/core'
+import { ThunkDispatch } from '@reduxjs/toolkit'
 import { useCallback, useRef, useState } from 'react'
 import { LayoutChangeEvent } from 'react-native'
-import { TypedUseSelectorHook, useSelector } from 'react-redux'
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
 import type { MobileState } from 'src/app/reducer'
+import type { AppDispatch } from 'src/app/store'
 import { SagaGenerator, select } from 'typed-redux-saga'
 import { spacing } from 'ui/src/theme'
 
 // Use throughout the app instead of plain `useDispatch` and `useSelector`
-
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const useAppDispatch = (): ThunkDispatch<any, any, any> => useDispatch<AppDispatch>()
 export const useAppSelector: TypedUseSelectorHook<MobileState> = useSelector
 
 // Use in sagas for better typing when selecting from redux state
diff --git a/apps/mobile/src/app/migrations.test.ts b/apps/mobile/src/app/migrations.test.ts
index fc3078f59a8..82073bc0c06 100644
--- a/apps/mobile/src/app/migrations.test.ts
+++ b/apps/mobile/src/app/migrations.test.ts
@@ -81,7 +81,10 @@ import { initialWalletConnectState } from 'src/features/walletConnect/walletConn
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
-import { ExtensionOnboardingState, initialBehaviorHistoryState } from 'wallet/src/features/behaviorHistory/slice'
+import {
+  ExtensionOnboardingState,
+  initialBehaviorHistoryState,
+} from 'wallet/src/features/behaviorHistory/slice'
 import { initialFavoritesState } from 'wallet/src/features/favorites/slice'
 import { initialFiatCurrencyState } from 'wallet/src/features/fiatCurrency/slice'
 import { initialLanguageState } from 'wallet/src/features/language/slice'
@@ -91,12 +94,20 @@ import { initialTelemetryState } from 'wallet/src/features/telemetry/slice'
 import { initialTokensState } from 'wallet/src/features/tokens/tokensSlice'
 import { initialTransactionsState } from 'wallet/src/features/transactions/slice'
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
-import { Account, AccountType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
+import {
+  Account,
+  AccountType,
+  SignerMnemonicAccount,
+} from 'wallet/src/features/wallet/accounts/types'
 import { initialWalletState, SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
 import { createMigrate } from 'wallet/src/state/createMigrate'
 import { testActivatePendingAccounts } from 'wallet/src/state/sharedMigrationsTests'
 import { getAllKeysOfNestedObject } from 'wallet/src/state/testUtils'
-import { fiatPurchaseTransactionInfo, signerMnemonicAccount, transactionDetails } from 'wallet/src/test/fixtures'
+import {
+  fiatPurchaseTransactionInfo,
+  signerMnemonicAccount,
+  transactionDetails,
+} from 'wallet/src/test/fixtures'
 
 expect.extend({ toIncludeSameMembers })
 
@@ -278,17 +289,21 @@ describe('Redux state migrations', () => {
     expect(newSchema.transactions[UniverseChainId.Mainnet]).toBeUndefined()
     expect(newSchema.transactions.lastTxHistoryUpdate).toBeUndefined()
 
-    expect(newSchema.transactions['0xShadowySuperCoder'][UniverseChainId.Mainnet]['0'].status).toEqual(
-      TransactionStatus.Pending,
-    )
+    expect(
+      newSchema.transactions['0xShadowySuperCoder'][UniverseChainId.Mainnet]['0'].status
+    ).toEqual(TransactionStatus.Pending)
     expect(newSchema.transactions['0xKingHodler'][UniverseChainId.Mainnet]).toBeUndefined()
     expect(newSchema.transactions['0xKingHodler'][UniverseChainId.Goerli]['0']).toBeUndefined()
-    expect(newSchema.transactions['0xKingHodler'][UniverseChainId.Goerli]['1'].from).toEqual('0xKingHodler')
+    expect(newSchema.transactions['0xKingHodler'][UniverseChainId.Goerli]['1'].from).toEqual(
+      '0xKingHodler'
+    )
 
     expect(newSchema.notifications.lastTxNotificationUpdate).toBeDefined()
-    expect(newSchema.notifications.lastTxNotificationUpdate['0xShadowySuperCoder'][UniverseChainId.Mainnet]).toEqual(
-      12345678912345,
-    )
+    expect(
+      newSchema.notifications.lastTxNotificationUpdate['0xShadowySuperCoder'][
+        UniverseChainId.Mainnet
+      ]
+    ).toEqual(12345678912345)
   })
 
   it('migrates from v0 to v1', () => {
@@ -393,7 +408,12 @@ describe('Redux state migrations', () => {
   })
 
   it('migrates from v6 to v7', () => {
-    const TEST_ADDRESSES: [string, string, string, string] = ['0xTest', '0xTest2', '0xTest3', '0xTest4']
+    const TEST_ADDRESSES: [string, string, string, string] = [
+      '0xTest',
+      '0xTest2',
+      '0xTest3',
+      '0xTest4',
+    ]
     const TEST_IMPORT_TIME_MS = 12345678912345
 
     const v6SchemaStub = {
@@ -451,7 +471,12 @@ describe('Redux state migrations', () => {
   })
 
   it('migrates from v8 to v9', () => {
-    const TEST_ADDRESSES: [string, string, string, string] = ['0xTest', '0xTest2', '0xTest3', '0xTest4']
+    const TEST_ADDRESSES: [string, string, string, string] = [
+      '0xTest',
+      '0xTest2',
+      '0xTest3',
+      '0xTest4',
+    ]
     const TEST_IMPORT_TIME_MS = 12345678912345
 
     const v8SchemaStub = {
@@ -487,18 +512,15 @@ describe('Redux state migrations', () => {
     const TEST_ADDRESSES = ['0xTest', OLD_DEMO_ACCOUNT_ADDRESS, '0xTest2', '0xTest3']
     const TEST_IMPORT_TIME_MS = 12345678912345
 
-    const accounts = TEST_ADDRESSES.reduce(
-      (acc, address) => {
-        acc[address] = {
-          address,
-          timeImportedMs: TEST_IMPORT_TIME_MS,
-          type: 'native',
-        } as unknown as Account
+    const accounts = TEST_ADDRESSES.reduce((acc, address) => {
+      acc[address] = {
+        address,
+        timeImportedMs: TEST_IMPORT_TIME_MS,
+        type: 'native',
+      } as unknown as Account
 
-        return acc
-      },
-      {} as { [address: string]: Account },
-    )
+      return acc
+    }, {} as { [address: string]: Account })
 
     const v9SchemaStub = {
       ...v9Schema,
@@ -976,18 +998,34 @@ describe('Redux state migrations', () => {
     const v30 = migrations[30](v29Stub)
 
     // expect fiat onramp txdetails to change
-    expect(v30.transactions[account.address][UniverseChainId.Mainnet]['0'].typeInfo).toEqual(expectedTypeInfo)
+    expect(v30.transactions[account.address][UniverseChainId.Mainnet]['0'].typeInfo).toEqual(
+      expectedTypeInfo
+    )
     expect(v30.transactions[account.address][UniverseChainId.Goerli]['0']).toBeUndefined()
     expect(v30.transactions[account.address][UniverseChainId.ArbitrumOne]).toBeUndefined() // does not create an object for chain
-    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.ArbitrumOne]['0'].typeInfo).toEqual(expectedTypeInfo)
-    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['0'].typeInfo).toEqual(expectedTypeInfo)
-    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['1'].typeInfo).toEqual(expectedTypeInfo)
+    expect(
+      v30.transactions['0xshadowySuperCoder'][UniverseChainId.ArbitrumOne]['0'].typeInfo
+    ).toEqual(expectedTypeInfo)
+    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['0'].typeInfo).toEqual(
+      expectedTypeInfo
+    )
+    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['1'].typeInfo).toEqual(
+      expectedTypeInfo
+    )
     expect(v30.transactions['0xdeleteMe']).toBe(undefined)
     // expect non-for txDetails to not change
-    expect(v30.transactions[account.address][UniverseChainId.Mainnet]['1']).toEqual(txDetailsConfirmed)
-    expect(v30.transactions[account.address][UniverseChainId.Goerli]['1']).toEqual(txDetailsConfirmed)
-    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.ArbitrumOne]['1']).toEqual(txDetailsConfirmed)
-    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['2']).toEqual(txDetailsConfirmed)
+    expect(v30.transactions[account.address][UniverseChainId.Mainnet]['1']).toEqual(
+      txDetailsConfirmed
+    )
+    expect(v30.transactions[account.address][UniverseChainId.Goerli]['1']).toEqual(
+      txDetailsConfirmed
+    )
+    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.ArbitrumOne]['1']).toEqual(
+      txDetailsConfirmed
+    )
+    expect(v30.transactions['0xshadowySuperCoder'][UniverseChainId.Optimism]['2']).toEqual(
+      txDetailsConfirmed
+    )
   })
 
   it('migrates from v31 to 32', () => {
@@ -1060,16 +1098,24 @@ describe('Redux state migrations', () => {
 
     const v36Stub = { ...v36Schema, transactions }
 
-    expect(v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id1].typeInfo.id).toBeUndefined()
-    expect(v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id2].typeInfo.id).toBeUndefined()
+    expect(
+      v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id1].typeInfo.id
+    ).toBeUndefined()
+    expect(
+      v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id2].typeInfo.id
+    ).toBeUndefined()
 
     const v37 = migrations[37](v36Stub)
 
     expect(v37.transactions[account.address]?.[UniverseChainId.Mainnet][id1].typeInfo.id).toEqual(
-      fiatOnRampTxDetailsFailed.typeInfo.id,
+      fiatOnRampTxDetailsFailed.typeInfo.id
+    )
+    expect(
+      v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id2].typeInfo.id
+    ).toBeUndefined()
+    expect(v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id3]).toEqual(
+      txDetailsConfirmed
     )
-    expect(v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id2].typeInfo.id).toBeUndefined()
-    expect(v36Stub.transactions[account.address]?.[UniverseChainId.Mainnet][id3]).toEqual(txDetailsConfirmed)
   })
 
   it('migrates from v37 to 38', () => {
diff --git a/apps/mobile/src/app/modals/AccountSwitcherModal.tsx b/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
index deedeec4b0c..6e16db031bc 100644
--- a/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
+++ b/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
@@ -1,9 +1,8 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { Action } from 'redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { AccountList } from 'src/components/accounts/AccountList'
 import { isCloudStorageAvailable } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
@@ -31,7 +30,7 @@ import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
 import { openSettings } from 'wallet/src/utils/linking'
 
 export function AccountSwitcherModal(): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
 
   return (
@@ -60,7 +59,7 @@ export function AccountSwitcher({ onClose }: { onClose: () => void }): JSX.Eleme
   const dimensions = useDeviceDimensions()
   const { t } = useTranslation()
   const activeAccountAddress = useActiveAccountAddress()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const hasImportedSeedPhrase = useNativeAccountExists()
   const modalState = useAppSelector(selectModalState(ModalName.AccountSwitcher))
   const sortedMnemonicAccounts = useAppSelector(selectSortedSignerMnemonicAccounts)
diff --git a/apps/mobile/src/app/modals/AppModals.tsx b/apps/mobile/src/app/modals/AppModals.tsx
index 005668f9205..450c5ae231a 100644
--- a/apps/mobile/src/app/modals/AppModals.tsx
+++ b/apps/mobile/src/app/modals/AppModals.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
 import { AccountSwitcherModal } from 'src/app/modals/AccountSwitcherModal'
 import { ExperimentsModal } from 'src/app/modals/ExperimentsModal'
 import { ExploreModal } from 'src/app/modals/ExploreModal'
@@ -8,13 +7,14 @@ import { TransferTokenModal } from 'src/app/modals/TransferTokenModal'
 import { ViewOnlyExplainerModal } from 'src/app/modals/ViewOnlyExplainerModal'
 import { LazyModalRenderer } from 'src/app/modals/utils'
 import { RemoveWalletModal } from 'src/components/RemoveWallet/RemoveWalletModal'
-import { WalletConnectModals } from 'src/components/Requests/WalletConnectModals'
 import { RestoreWalletModal } from 'src/components/RestoreWalletModal/RestoreWalletModal'
+import { WalletConnectModals } from 'src/components/WalletConnect/WalletConnectModals'
 import { ForceUpgradeModal } from 'src/components/forceUpgrade/ForceUpgradeModal'
 import { UnitagsIntroModal } from 'src/components/unitags/UnitagsIntroModal'
 import { LockScreenModal } from 'src/features/authentication/LockScreenModal'
 import { ExchangeTransferModal } from 'src/features/fiatOnRamp/ExchangeTransferModal'
 import { FiatOnRampAggregatorModal } from 'src/features/fiatOnRamp/FiatOnRampAggregatorModal'
+import { FiatOnRampModal } from 'src/features/fiatOnRamp/FiatOnRampModal'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { ScantasticModal } from 'src/features/scantastic/ScantasticModal'
 import { ReceiveCryptoModal } from 'src/screens/ReceiveCryptoModal'
@@ -22,9 +22,10 @@ import { SettingsFiatCurrencyModal } from 'src/screens/SettingsFiatCurrencyModal
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { SettingsLanguageModal } from 'wallet/src/components/settings/language/SettingsLanguageModal'
 import { QueuedOrderModal } from 'wallet/src/features/transactions/swap/modals/QueuedOrderModal'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function AppModals(): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const onCloseLanguageModal = useCallback(() => {
     dispatch(closeModal({ name: ModalName.LanguageSelector }))
@@ -40,6 +41,10 @@ export function AppModals(): JSX.Element {
         <ExperimentsModal />
       </LazyModalRenderer>
 
+      <LazyModalRenderer name={ModalName.FiatOnRamp}>
+        <FiatOnRampModal />
+      </LazyModalRenderer>
+
       <LazyModalRenderer name={ModalName.FiatOnRampAggregator}>
         <FiatOnRampAggregatorModal />
       </LazyModalRenderer>
diff --git a/apps/mobile/src/app/modals/ExperimentsModal.tsx b/apps/mobile/src/app/modals/ExperimentsModal.tsx
index 55d42893e1a..61107c204a3 100644
--- a/apps/mobile/src/app/modals/ExperimentsModal.tsx
+++ b/apps/mobile/src/app/modals/ExperimentsModal.tsx
@@ -1,9 +1,8 @@
 import { useApolloClient } from '@apollo/client'
 import React, { useState } from 'react'
 import { ScrollView } from 'react-native-gesture-handler'
-import { useDispatch } from 'react-redux'
 import { Action } from 'redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectCustomEndpoint } from 'src/features/tweaks/selectors'
 import { setCustomEndpoint } from 'src/features/tweaks/slice'
@@ -16,7 +15,7 @@ import { AccordionHeader, GatingOverrides } from 'wallet/src/components/gating/G
 
 export function ExperimentsModal(): JSX.Element {
   const insets = useDeviceInsets()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const customEndpoint = useAppSelector(selectCustomEndpoint)
 
   const apollo = useApolloClient()
diff --git a/apps/mobile/src/app/modals/ExploreModal.tsx b/apps/mobile/src/app/modals/ExploreModal.tsx
index fcd7fda8845..8b5229d0903 100644
--- a/apps/mobile/src/app/modals/ExploreModal.tsx
+++ b/apps/mobile/src/app/modals/ExploreModal.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { ExploreStackNavigator } from 'src/app/navigation/navigation'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { useSporeColors } from 'ui/src'
@@ -8,7 +8,7 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 
 export function ExploreModal(): JSX.Element {
   const colors = useSporeColors()
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
 
   const onClose = (): void => {
     appDispatch(closeModal({ name: ModalName.Explore }))
diff --git a/apps/mobile/src/app/modals/SwapModal.tsx b/apps/mobile/src/app/modals/SwapModal.tsx
index a54f83c9486..581bf3fba20 100644
--- a/apps/mobile/src/app/modals/SwapModal.tsx
+++ b/apps/mobile/src/app/modals/SwapModal.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect } from 'react'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { BiometricsIcon } from 'src/components/icons/BiometricsIcon'
 import { useBiometricAppSettings, useBiometricPrompt, useOsBiometricAuthEnabled } from 'src/features/biometrics/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
@@ -12,7 +11,7 @@ import { SwapFlow } from 'wallet/src/features/transactions/swap/SwapFlow'
 import { useSwapPrefilledState } from 'wallet/src/features/transactions/swap/hooks/useSwapPrefilledState'
 
 export function SwapModal(): JSX.Element {
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   const { initialState } = useAppSelector(selectModalState(ModalName.Swap))
 
   const onClose = useCallback((): void => {
diff --git a/apps/mobile/src/app/modals/TransferTokenModal.tsx b/apps/mobile/src/app/modals/TransferTokenModal.tsx
index 95bc22c9265..a98009dd521 100644
--- a/apps/mobile/src/app/modals/TransferTokenModal.tsx
+++ b/apps/mobile/src/app/modals/TransferTokenModal.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
 import { TransferFlow } from 'src/features/transactions/transfer/TransferFlow'
@@ -13,7 +12,7 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 
 export function TransferTokenModal(): JSX.Element {
   const colors = useSporeColors()
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   const modalState = useAppSelector(selectModalState(ModalName.Send))
 
   const onClose = useCallback((): void => {
diff --git a/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx b/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
index 5266bad6bd3..0acabb272ce 100644
--- a/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
+++ b/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
@@ -1,5 +1,4 @@
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
 import { Button, Flex, Text, useIsDarkMode } from 'ui/src'
@@ -10,13 +9,14 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { ImportType, OnboardingEntryPoint } from 'uniswap/src/types/onboarding'
 import { MobileScreens, OnboardingScreens } from 'uniswap/src/types/screens/mobile'
 import { useActiveAccountAddress, useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 const WALLET_IMAGE_ASPECT_RATIO = 327 / 215
 
 export function ViewOnlyExplainerModal(): JSX.Element {
   const { t } = useTranslation()
   const activeAccountAddress = useActiveAccountAddress()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const hasImportedSeedPhrase = useNativeAccountExists()
   const isDarkMode = useIsDarkMode()
 
diff --git a/apps/mobile/src/app/navigation/NavBar.tsx b/apps/mobile/src/app/navigation/NavBar.tsx
index ca600672974..a6ddcc0bc3d 100644
--- a/apps/mobile/src/app/navigation/NavBar.tsx
+++ b/apps/mobile/src/app/navigation/NavBar.tsx
@@ -11,7 +11,7 @@ import {
   useAnimatedStyle,
   useSharedValue,
 } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { pulseAnimation } from 'src/components/buttons/utils'
 import { openModal } from 'src/features/modals/modalSlice'
 import {
@@ -32,11 +32,11 @@ import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
-import { opacify } from 'uniswap/src/utils/colors'
 import { isAndroid, isIOS } from 'utilities/src/platform'
 import { useHighestBalanceNativeCurrencyId } from 'wallet/src/features/dataApi/balances'
 import { prepareSwapFormState } from 'wallet/src/features/transactions/swap/utils'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { opacify } from 'wallet/src/utils/colors'
 
 export const NAV_BAR_HEIGHT_XS = 52
 export const NAV_BAR_HEIGHT_SM = 72
@@ -106,7 +106,7 @@ type SwapTabBarButtonProps = {
 
 const SwapFAB = memo(function _SwapFAB({ activeScale = 0.96 }: SwapTabBarButtonProps) {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const isDarkMode = useIsDarkMode()
 
@@ -182,7 +182,7 @@ type ExploreTabBarButtonProps = {
 }
 
 function ExploreTabBarButton({ activeScale = 0.98 }: ExploreTabBarButtonProps): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
   const isDarkMode = useIsDarkMode()
   const { t } = useTranslation()
diff --git a/apps/mobile/src/app/navigation/NavigationContainer.tsx b/apps/mobile/src/app/navigation/NavigationContainer.tsx
index f2bbb93034b..1d46a5feb89 100644
--- a/apps/mobile/src/app/navigation/NavigationContainer.tsx
+++ b/apps/mobile/src/app/navigation/NavigationContainer.tsx
@@ -7,7 +7,7 @@ import {
 import { SharedEventName } from '@uniswap/analytics-events'
 import React, { FC, PropsWithChildren, useCallback, useState } from 'react'
 import { Linking } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { RootParamList } from 'src/app/navigation/types'
 import { openDeepLink } from 'src/features/deepLinking/handleDeepLinkSaga'
 import { DIRECT_LOG_ONLY_SCREENS } from 'src/features/telemetry/directLogScreens'
@@ -82,7 +82,7 @@ export const NavigationContainer: FC<PropsWithChildren<Props>> = ({ children, on
 }
 
 export const useManageDeepLinks = (): void => {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const manageDeepLinks = useCallback(async () => {
     const url = await Linking.getInitialURL()
     if (url) {
diff --git a/apps/mobile/src/app/navigation/components.tsx b/apps/mobile/src/app/navigation/components.tsx
deleted file mode 100644
index ea31bfb4a44..00000000000
--- a/apps/mobile/src/app/navigation/components.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BackButton } from 'src/components/buttons/BackButton'
-import { RotatableChevron } from 'ui/src/components/icons'
-import { iconSizes } from 'ui/src/theme'
-
-export const renderHeaderBackButton = (): JSX.Element => <BackButton color="$neutral2" size={iconSizes.icon28} />
-
-export const renderHeaderBackImage = (): JSX.Element => (
-  <RotatableChevron color="$neutral2" height={iconSizes.icon28} width={iconSizes.icon28} />
-)
diff --git a/apps/mobile/src/app/navigation/navigation.tsx b/apps/mobile/src/app/navigation/navigation.tsx
index cbb449b805b..460483d4ff2 100644
--- a/apps/mobile/src/app/navigation/navigation.tsx
+++ b/apps/mobile/src/app/navigation/navigation.tsx
@@ -3,7 +3,6 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import { createStackNavigator, TransitionPresets } from '@react-navigation/stack'
 import React from 'react'
 import { useAppSelector } from 'src/app/hooks'
-import { renderHeaderBackButton, renderHeaderBackImage } from 'src/app/navigation/components'
 import {
   AppStackParamList,
   AppStackScreenProp,
@@ -13,6 +12,7 @@ import {
   SettingsStackParamList,
   UnitagStackParamList,
 } from 'src/app/navigation/types'
+import { BackButton } from 'src/components/buttons/BackButton'
 import { HorizontalEdgeGestureTarget } from 'src/components/layout/screens/EdgeGestureTarget'
 import { useBiometricCheck } from 'src/features/biometrics/useBiometricCheck'
 import { FiatOnRampProvider } from 'src/features/fiatOnRamp/FiatOnRampContext'
@@ -65,6 +65,7 @@ import { SettingsWalletManageConnection } from 'src/screens/SettingsWalletManage
 import { TokenDetailsScreen } from 'src/screens/TokenDetailsScreen'
 import { WebViewScreen } from 'src/screens/WebViewScreen'
 import { useDeviceInsets, useSporeColors } from 'ui/src'
+import { RotatableChevron } from 'ui/src/components/icons'
 import { spacing } from 'ui/src/theme'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
@@ -200,6 +201,8 @@ export function FiatOnRampStackNavigator(): JSX.Element {
   )
 }
 
+const renderHeaderBackButton = (): JSX.Element => <BackButton color="$neutral2" size={28} />
+
 export function OnboardingStackNavigator(): JSX.Element {
   const colors = useSporeColors()
   const seedPhraseRefactorEnabled = useFeatureFlag(FeatureFlags.SeedPhraseRefactorNative)
@@ -213,8 +216,7 @@ export function OnboardingStackNavigator(): JSX.Element {
         <OnboardingStack.Group
           screenOptions={{
             headerTitle: '',
-            gestureEnabled: true,
-            headerBackVisible: false,
+            headerBackTitleVisible: false,
             headerLeft: renderHeaderBackButton,
             headerTransparent: true,
             headerTintColor: colors.neutral2.val,
@@ -285,6 +287,8 @@ export function OnboardingStackNavigator(): JSX.Element {
   )
 }
 
+const renderHeaderBackImage = (): JSX.Element => <RotatableChevron color="$neutral2" height={28} width={28} />
+
 export function UnitagStackNavigator(): JSX.Element {
   const colors = useSporeColors()
   const insets = useDeviceInsets()
diff --git a/apps/mobile/src/app/store.ts b/apps/mobile/src/app/store.ts
index 9d0cc056850..7305e6bef0e 100644
--- a/apps/mobile/src/app/store.ts
+++ b/apps/mobile/src/app/store.ts
@@ -6,9 +6,10 @@ import { Storage, persistReducer, persistStore } from 'redux-persist'
 import { MOBILE_STATE_VERSION, migrations } from 'src/app/migrations'
 import { MobileState, ReducerNames, mobileReducer } from 'src/app/reducer'
 import { mobileSaga } from 'src/app/saga'
-import { fiatOnRampAggregatorApi } from 'uniswap/src/features/fiatOnRamp/api'
+import { fiatOnRampAggregatorApi as sharedFiatOnRampAggregatorApi } from 'uniswap/src/features/fiatOnRamp/api'
 import { isNonJestDev } from 'utilities/src/environment/constants'
 import { logger } from 'utilities/src/logger/logger'
+import { fiatOnRampAggregatorApi, fiatOnRampApi } from 'wallet/src/features/fiatOnRamp/api'
 import { createStore } from 'wallet/src/state'
 import { createMigrate } from 'wallet/src/state/createMigrate'
 import { RootReducerNames, sharedPersistedStateWhitelist } from 'wallet/src/state/reducer'
@@ -81,7 +82,11 @@ const sentryReduxEnhancer = Sentry.createReduxEnhancer({
   },
 })
 
-const middlewares: Middleware[] = [fiatOnRampAggregatorApi.middleware]
+const middlewares: Middleware[] = [
+  fiatOnRampApi.middleware,
+  fiatOnRampAggregatorApi.middleware,
+  sharedFiatOnRampAggregatorApi.middleware,
+]
 if (isNonJestDev) {
   const createDebugger = require('redux-flipper').default
   middlewares.push(createDebugger())
@@ -102,3 +107,6 @@ export const setupStore = (
 export const store = setupStore()
 
 export const persistor = persistStore(store)
+
+export type AppDispatch = typeof store.dispatch
+export type AppStore = typeof store
diff --git a/apps/mobile/src/components/NFT/NftView.tsx b/apps/mobile/src/components/NFT/NftView.tsx
index 2884773ec21..d7996c2a047 100644
--- a/apps/mobile/src/components/NFT/NftView.tsx
+++ b/apps/mobile/src/components/NFT/NftView.tsx
@@ -7,17 +7,7 @@ import { ESTIMATED_NFT_LIST_ITEM_SIZE, MAX_NFT_IMAGE_SIZE } from 'wallet/src/fea
 import { NFTItem } from 'wallet/src/features/nfts/types'
 import { useNFTContextMenu } from 'wallet/src/features/nfts/useNftContextMenu'
 
-export function NftView({
-  owner,
-  item,
-  onPress,
-  index,
-}: {
-  owner: Address
-  item: NFTItem
-  index?: number
-  onPress: () => void
-}): JSX.Element {
+export function NftView({ owner, item, onPress }: { owner: Address; item: NFTItem; onPress: () => void }): JSX.Element {
   const { menuActions, onContextMenuPress } = useNFTContextMenu({
     contractAddress: item.contractAddress,
     tokenId: item.tokenId,
@@ -37,7 +27,6 @@ export function NftView({
           hapticFeedback
           activeOpacity={1}
           hapticStyle={ImpactFeedbackStyle.Light}
-          testID={`nfts-list-item-${index ?? 0}`}
           // Needed to fix long press issue with context menu on Android
           onLongPress={noop}
           onPress={onPress}
diff --git a/apps/mobile/src/components/PriceExplorer/useChartDimensions.test.ts b/apps/mobile/src/components/PriceExplorer/useChartDimensions.test.ts
index 91cb356dedd..463fca48452 100644
--- a/apps/mobile/src/components/PriceExplorer/useChartDimensions.test.ts
+++ b/apps/mobile/src/components/PriceExplorer/useChartDimensions.test.ts
@@ -12,7 +12,9 @@ const sharedDimensions = {
 
 describe(useChartDimensions, () => {
   it('returns small chart height for small screens', () => {
-    jest.spyOn(Dimensions, 'get').mockReturnValue({ ...sharedDimensions, height: heightBreakpoints.short - 1 })
+    jest
+      .spyOn(Dimensions, 'get')
+      .mockReturnValue({ ...sharedDimensions, height: heightBreakpoints.short - 1 })
     const { result } = renderHook(() => useChartDimensions())
 
     expect(result.current).toEqual({
@@ -24,7 +26,9 @@ describe(useChartDimensions, () => {
   })
 
   it('returns large chart height for large screens', () => {
-    jest.spyOn(Dimensions, 'get').mockReturnValue({ ...sharedDimensions, height: heightBreakpoints.short })
+    jest
+      .spyOn(Dimensions, 'get')
+      .mockReturnValue({ ...sharedDimensions, height: heightBreakpoints.short })
     const { result } = renderHook(() => useChartDimensions())
 
     expect(result.current).toEqual({
diff --git a/apps/mobile/src/components/PriceExplorer/usePrice.test.ts b/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
index 563ea30d6fc..83ed0a3307f 100644
--- a/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
@@ -6,7 +6,10 @@ import {
   useLineChartPrice as useRNWagmiChartLineChartPrice,
 } from 'react-native-wagmi-charts'
 import { act } from 'react-test-renderer'
-import { useLineChartPrice, useLineChartRelativeChange } from 'src/components/PriceExplorer/usePrice'
+import {
+  useLineChartPrice,
+  useLineChartRelativeChange,
+} from 'src/components/PriceExplorer/usePrice'
 import { renderHookWithProviders } from 'src/test/render'
 
 jest.mock('react-native-wagmi-charts')
@@ -17,7 +20,9 @@ const cursorFormattedValue = makeMutable('-')
 const currentIndex = makeMutable(0)
 const isActive = makeMutable(false)
 
-const mockData = (args: { data?: TLineChartData; currentIndex?: number; isActive?: boolean } = {}): void => {
+const mockData = (
+  args: { data?: TLineChartData; currentIndex?: number; isActive?: boolean } = {}
+): void => {
   currentIndex.value = args.currentIndex ?? 0
   isActive.value = args.isActive ?? false
   // react-native-wagmi-charts is mocked so we can mock the return
@@ -47,7 +52,9 @@ describe(useLineChartPrice, () => {
   beforeEach(() => {
     const originalModule = jest.requireActual('react-native-wagmi-charts')
     ;(useLineChart as ReturnType<typeof jest.fn>).mockImplementation(originalModule.useLineChart)
-    ;(useRNWagmiChartLineChartPrice as ReturnType<typeof jest.fn>).mockImplementation(originalModule.useLineChartPrice)
+    ;(useRNWagmiChartLineChartPrice as ReturnType<typeof jest.fn>).mockImplementation(
+      originalModule.useLineChartPrice
+    )
   })
 
   afterAll(() => {
@@ -165,7 +172,7 @@ describe(useLineChartPrice, () => {
         expect.objectContaining({
           value: expect.objectContaining({ value: 1 }),
           formatted: expect.objectContaining({ value: '$1.00' }),
-        }),
+        })
       )
 
       mockCursorPrice('2') // updates shared values
@@ -175,7 +182,7 @@ describe(useLineChartPrice, () => {
           expect.objectContaining({
             value: expect.objectContaining({ value: 2 }),
             formatted: expect.objectContaining({ value: '$2.00' }),
-          }),
+          })
         )
       })
     })
@@ -192,7 +199,7 @@ describe(useLineChartPrice, () => {
           expect.objectContaining({
             value: expect.objectContaining({ value: 1 }),
             shouldAnimate: expect.objectContaining({ value: true }),
-          }),
+          })
         )
       })
 
@@ -205,7 +212,7 @@ describe(useLineChartPrice, () => {
           expect.objectContaining({
             value: expect.objectContaining({ value: 2 }),
             shouldAnimate: expect.objectContaining({ value: false }),
-          }),
+          })
         )
       })
     })
@@ -260,7 +267,7 @@ describe(useLineChartRelativeChange, () => {
         expect.objectContaining({
           value: expect.objectContaining({ value: 400 }),
           formatted: expect.objectContaining({ value: '400.00%' }),
-        }),
+        })
       )
 
       currentIndex.value = 2
@@ -272,7 +279,7 @@ describe(useLineChartRelativeChange, () => {
           expect.objectContaining({
             value: expect.objectContaining({ value: 900 }),
             formatted: expect.objectContaining({ value: '900.00%' }),
-          }),
+          })
         )
       })
     })
diff --git a/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts b/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
index 3d9347d4c95..173d629de2e 100644
--- a/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
@@ -161,7 +161,12 @@ describe(useTokenPriceHistory, () => {
       const { resolvers } = queryResolvers({
         tokenProjects: () => [
           usdcTokenProject({
-            priceHistory: [undefined, timestampedAmount({ value: 1 }), undefined, timestampedAmount({ value: 2 })],
+            priceHistory: [
+              undefined,
+              timestampedAmount({ value: 1 }),
+              undefined,
+              timestampedAmount({ value: 2 }),
+            ],
           }),
         ],
       })
@@ -217,7 +222,10 @@ describe(useTokenPriceHistory, () => {
 
     describe('when duration is set to default value (day)', () => {
       it('returns correct price history', async () => {
-        const { result } = renderHookWithProviders(() => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1), { resolvers })
+        const { result } = renderHookWithProviders(
+          () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1),
+          { resolvers }
+        )
 
         await waitFor(() => {
           expect(result.current).toEqual(
@@ -227,13 +235,16 @@ describe(useTokenPriceHistory, () => {
                 spot: expect.anything(),
               },
               selectedDuration: HistoryDuration.Day,
-            }),
+            })
           )
         })
       })
 
       it('returns correct spot price', async () => {
-        const { result } = renderHookWithProviders(() => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1), { resolvers })
+        const { result } = renderHookWithProviders(
+          () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1),
+          { resolvers }
+        )
 
         await waitFor(() => {
           expect(result.current.data?.spot).toEqual({
@@ -250,7 +261,7 @@ describe(useTokenPriceHistory, () => {
       it('returns correct price history', async () => {
         const { result } = renderHookWithProviders(
           () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1, jest.fn(), HistoryDuration.Year),
-          { resolvers },
+          { resolvers }
         )
 
         await waitFor(() => {
@@ -261,7 +272,7 @@ describe(useTokenPriceHistory, () => {
                 spot: expect.anything(),
               },
               selectedDuration: HistoryDuration.Year,
-            }),
+            })
           )
         })
       })
@@ -269,7 +280,7 @@ describe(useTokenPriceHistory, () => {
       it('returns correct spot price', async () => {
         const { result } = renderHookWithProviders(
           () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1, jest.fn(), HistoryDuration.Year),
-          { resolvers },
+          { resolvers }
         )
         await waitFor(() => {
           expect(result.current.data?.spot).toEqual({
@@ -285,9 +296,10 @@ describe(useTokenPriceHistory, () => {
     describe('when duration is changed', () => {
       it('re-fetches data', async () => {
         const onCompleted = jest.fn()
-        const { result } = renderHookWithProviders(() => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1, onCompleted), {
-          resolvers,
-        })
+        const { result } = renderHookWithProviders(
+          () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1, onCompleted),
+          { resolvers }
+        )
 
         await waitFor(() => {
           expect(result.current).toEqual(
@@ -295,7 +307,7 @@ describe(useTokenPriceHistory, () => {
               loading: false,
               error: false,
               selectedDuration: HistoryDuration.Day,
-            }),
+            })
           )
         })
 
@@ -312,7 +324,7 @@ describe(useTokenPriceHistory, () => {
               loading: false,
               error: false,
               selectedDuration: HistoryDuration.Week,
-            }),
+            })
           )
         })
 
@@ -320,7 +332,10 @@ describe(useTokenPriceHistory, () => {
       })
 
       it('returns new price history and spot price', async () => {
-        const { result } = renderHookWithProviders(() => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1), { resolvers })
+        const { result } = renderHookWithProviders(
+          () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1),
+          { resolvers }
+        )
 
         await waitFor(() => {
           expect(result.current.data).toEqual({
@@ -361,9 +376,10 @@ describe(useTokenPriceHistory, () => {
             throw new Error('error')
           },
         })
-        const { result } = renderHookWithProviders(() => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1), {
-          resolvers: errorResolvers,
-        })
+        const { result } = renderHookWithProviders(
+          () => useTokenPriceHistory(SAMPLE_CURRENCY_ID_1),
+          { resolvers: errorResolvers }
+        )
 
         await waitFor(() => {
           expect(result.current.loading).toBe(false)
diff --git a/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts b/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
index 601a89000de..94e7474609a 100644
--- a/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
@@ -9,8 +9,8 @@ import {
   useTokenPriceHistoryQuery,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { GqlResult } from 'uniswap/src/data/types'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 
 export type TokenSpotData = {
diff --git a/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx b/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
index b132c5c7939..b548fd02e67 100644
--- a/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
+++ b/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
@@ -13,9 +13,9 @@ import { Global, Photo } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { iconSizes, spacing } from 'ui/src/theme'
-import PasteButton from 'uniswap/src/components/buttons/PasteButton'
 import { Sentry } from 'utilities/src/logger/Sentry'
 import { DevelopmentOnly } from 'wallet/src/components/DevelopmentOnly/DevelopmentOnly'
+import PasteButton from 'wallet/src/components/buttons/PasteButton'
 import { openSettings } from 'wallet/src/utils/linking'
 
 type QRCodeScannerProps = {
diff --git a/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx b/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
index ad42e86c55f..9607054f176 100644
--- a/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
+++ b/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
@@ -4,7 +4,7 @@ import { Alert } from 'react-native'
 import 'react-native-reanimated'
 import { useAppSelector } from 'src/app/hooks'
 import { QRCodeScanner } from 'src/components/QRCodeScanner/QRCodeScanner'
-import { getSupportedURI, URIType } from 'src/components/Requests/ScanSheet/util'
+import { getSupportedURI, URIType } from 'src/components/WalletConnect/ScanSheet/util'
 import { Flex, HapticFeedback, Text, TouchableArea, useIsDarkMode, useSporeColors } from 'ui/src'
 import Scan from 'ui/src/assets/icons/receive.svg'
 import ScanQRIcon from 'ui/src/assets/icons/scan.svg'
diff --git a/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx b/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
index eb1c26b97cc..14b6a26a772 100644
--- a/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
+++ b/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
@@ -75,7 +75,6 @@ export function _RecipientSelect({
           value={pattern ?? ''}
           onBack={recipient ? onHideRecipientSelector : undefined}
           onChangeText={setPattern}
-          onDismiss={() => Keyboard.dismiss()}
         />
         {!sections.length ? (
           <Flex centered gap="$spacing12" mt="$spacing24" px="$spacing24">
diff --git a/apps/mobile/src/components/RecipientSelect/hooks.test.ts b/apps/mobile/src/components/RecipientSelect/hooks.test.ts
index 0157de8eeb3..6221a1b8e61 100644
--- a/apps/mobile/src/components/RecipientSelect/hooks.test.ts
+++ b/apps/mobile/src/components/RecipientSelect/hooks.test.ts
@@ -140,8 +140,10 @@ describe(useRecipients, () => {
 
       expect(result.current).toEqual(
         expect.objectContaining({
-          sections: expect.not.arrayContaining([expect.objectContaining({ title: 'Search results' })]),
-        }),
+          sections: expect.not.arrayContaining([
+            expect.objectContaining({ title: 'Search results' }),
+          ]),
+        })
       )
     })
 
@@ -168,7 +170,7 @@ describe(useRecipients, () => {
             data: expect.objectContaining({ address: SAMPLE_SEED_ADDRESS_1 }),
             key: SAMPLE_SEED_ADDRESS_1,
           },
-        ]),
+        ])
       )
     })
   })
@@ -183,7 +185,7 @@ describe(useRecipients, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           sections: expect.not.arrayContaining([expect.objectContaining({ title: 'Recent' })]),
-        }),
+        })
       )
     })
 
@@ -212,7 +214,7 @@ describe(useRecipients, () => {
               ],
             },
           ]),
-        }),
+        })
       )
     })
 
@@ -221,9 +223,18 @@ describe(useRecipients, () => {
         preloadedState: getPreloadedState({
           transactions: {
             [activeAccount.address]: {
-              [UniverseChainId.Base as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
-              [UniverseChainId.Mainnet as WalletChainId]: [sendTxDetailsConfirmed, sendTxDetailsFailed],
-              [UniverseChainId.Bnb as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
+              [UniverseChainId.Base as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
+              [UniverseChainId.Mainnet as WalletChainId]: [
+                sendTxDetailsConfirmed,
+                sendTxDetailsFailed,
+              ],
+              [UniverseChainId.Bnb as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
             },
           },
         }),
@@ -254,7 +265,11 @@ describe(useRecipients, () => {
         preloadedState: getPreloadedState({
           transactions: {
             [activeAccount.address]: {
-              [sendTxDetailsPending.chainId]: [sendTxDetailsPending, sendTxDetailsFailed, sendTxDetailsConfirmed],
+              [sendTxDetailsPending.chainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsFailed,
+                sendTxDetailsConfirmed,
+              ],
             },
           },
         }),
@@ -264,7 +279,7 @@ describe(useRecipients, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           sections: expect.arrayContaining([recentRecipientsSectionResult]),
-        }),
+        })
       )
     })
 
@@ -273,9 +288,18 @@ describe(useRecipients, () => {
         preloadedState: getPreloadedState({
           transactions: {
             [activeAccount.address]: {
-              [UniverseChainId.Base as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
-              [UniverseChainId.Mainnet as WalletChainId]: [sendTxDetailsConfirmed, sendTxDetailsFailed],
-              [UniverseChainId.Bnb as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
+              [UniverseChainId.Base as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
+              [UniverseChainId.Mainnet as WalletChainId]: [
+                sendTxDetailsConfirmed,
+                sendTxDetailsFailed,
+              ],
+              [UniverseChainId.Bnb as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
             },
           },
         }),
@@ -295,8 +319,10 @@ describe(useRecipients, () => {
 
       expect(result.current).toEqual(
         expect.objectContaining({
-          sections: expect.not.arrayContaining([expect.objectContaining({ title: 'Your wallets' })]),
-        }),
+          sections: expect.not.arrayContaining([
+            expect.objectContaining({ title: 'Your wallets' }),
+          ]),
+        })
       )
     })
 
@@ -309,7 +335,7 @@ describe(useRecipients, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           sections: expect.arrayContaining([inactiveWalletsSectionResult]),
-        }),
+        })
       )
     })
 
@@ -322,7 +348,7 @@ describe(useRecipients, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           searchableRecipientOptions: [{ data: inactiveAccount, key: inactiveAccount.address }],
-        }),
+        })
       )
     })
   })
@@ -336,8 +362,10 @@ describe(useRecipients, () => {
 
       expect(result.current).toEqual(
         expect.objectContaining({
-          sections: expect.not.arrayContaining([expect.objectContaining({ title: 'Favorite wallets' })]),
-        }),
+          sections: expect.not.arrayContaining([
+            expect.objectContaining({ title: 'Favorite wallets' }),
+          ]),
+        })
       )
     })
 
@@ -352,7 +380,7 @@ describe(useRecipients, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           sections: expect.arrayContaining([favoriteWalletsSectionResult]),
-        }),
+        })
       )
     })
   })
@@ -365,9 +393,18 @@ describe(useRecipients, () => {
           hasInactiveAccounts: true,
           transactions: {
             [activeAccount.address]: {
-              [UniverseChainId.Base as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
-              [UniverseChainId.Mainnet as WalletChainId]: [sendTxDetailsConfirmed, sendTxDetailsFailed],
-              [UniverseChainId.Bnb as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
+              [UniverseChainId.Base as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
+              [UniverseChainId.Mainnet as WalletChainId]: [
+                sendTxDetailsConfirmed,
+                sendTxDetailsFailed,
+              ],
+              [UniverseChainId.Bnb as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
             },
           },
         }),
@@ -383,7 +420,7 @@ describe(useRecipients, () => {
               inactiveWalletsSectionResult,
               favoriteWalletsSectionResult,
             ]),
-          }),
+          })
         )
       })
     })
@@ -395,9 +432,18 @@ describe(useRecipients, () => {
           hasInactiveAccounts: true,
           transactions: {
             [activeAccount.address]: {
-              [UniverseChainId.Base as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
-              [UniverseChainId.Mainnet as WalletChainId]: [sendTxDetailsConfirmed, sendTxDetailsFailed],
-              [UniverseChainId.Bnb as WalletChainId]: [sendTxDetailsPending, sendTxDetailsConfirmed],
+              [UniverseChainId.Base as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
+              [UniverseChainId.Mainnet as WalletChainId]: [
+                sendTxDetailsConfirmed,
+                sendTxDetailsFailed,
+              ],
+              [UniverseChainId.Bnb as WalletChainId]: [
+                sendTxDetailsPending,
+                sendTxDetailsConfirmed,
+              ],
             },
           },
         }),
diff --git a/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx b/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
index 896dc9e9af5..758c391223c 100644
--- a/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
+++ b/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
@@ -1,8 +1,7 @@
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAnimatedStyle, withTiming } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { AssociatedAccountsList } from 'src/components/RemoveWallet/AssociatedAccountsList'
 import { RemoveLastMnemonicWalletFooter } from 'src/components/RemoveWallet/RemoveLastMnemonicWalletFooter'
@@ -30,7 +29,7 @@ import { setFinishedOnboarding } from 'wallet/src/features/wallet/slice'
 export function RemoveWalletModal(): JSX.Element | null {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const addressToAccount = useAccounts()
   const associatedAccounts = useAppSelector(selectSignerMnemonicAccounts)
diff --git a/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx b/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
index 6445b7550db..82051d7da9d 100644
--- a/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
+++ b/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { closeAllModals, closeModal } from 'src/features/modals/modalSlice'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
@@ -15,7 +15,7 @@ import { MobileScreens, OnboardingScreens } from 'uniswap/src/types/screens/mobi
 export function RestoreWalletModal(): JSX.Element | null {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const onDismiss = (): void => {
     dispatch(closeModal({ name: ModalName.RestoreWallet }))
diff --git a/apps/mobile/src/components/Settings/SettingsRow.tsx b/apps/mobile/src/components/Settings/SettingsRow.tsx
index 01d7dbf911b..b3895b5e547 100644
--- a/apps/mobile/src/components/Settings/SettingsRow.tsx
+++ b/apps/mobile/src/components/Settings/SettingsRow.tsx
@@ -1,7 +1,6 @@
 import { NavigatorScreenParams } from '@react-navigation/core'
 import React from 'react'
 import { ValueOf } from 'react-native-gesture-handler/lib/typescript/typeUtils'
-import { useDispatch } from 'react-redux'
 import {
   OnboardingStackNavigationProp,
   OnboardingStackParamList,
@@ -14,9 +13,10 @@ import { RotatableChevron } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
-import { openUri } from 'uniswap/src/utils/linking'
 import { Switch } from 'wallet/src/components/buttons/Switch'
 import { Arrow } from 'wallet/src/components/icons/Arrow'
+import { useAppDispatch } from 'wallet/src/state'
+import { openUri } from 'wallet/src/utils/linking'
 
 export interface SettingsSection {
   subTitle: string
@@ -67,7 +67,7 @@ export function SettingsRow({
   navigation,
 }: SettingsRowProps): JSX.Element {
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const handleRow = async (): Promise<void> => {
     if (onToggle) {
diff --git a/apps/mobile/src/components/TokenBalanceList/TokenBalanceItemContextMenu.tsx b/apps/mobile/src/components/TokenBalanceList/TokenBalanceItemContextMenu.tsx
index 09b3cc3d30c..f19d8be83bd 100644
--- a/apps/mobile/src/components/TokenBalanceList/TokenBalanceItemContextMenu.tsx
+++ b/apps/mobile/src/components/TokenBalanceList/TokenBalanceItemContextMenu.tsx
@@ -1,7 +1,6 @@
 import React, { memo, useMemo } from 'react'
 import ContextMenu from 'react-native-context-menu-view'
 import { borderRadii } from 'ui/src/theme'
-import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
 import { useTokenContextMenu } from 'wallet/src/features/portfolio/useTokenContextMenu'
 
@@ -14,7 +13,6 @@ export const TokenBalanceItemContextMenu = memo(function _TokenBalanceItem({
 }) {
   const { menuActions, onContextMenuPress } = useTokenContextMenu({
     currencyId: portfolioBalance.currencyInfo.currencyId,
-    isBlocked: portfolioBalance.currencyInfo.safetyLevel === SafetyLevel.Blocked,
     portfolioBalance,
   })
 
diff --git a/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx b/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
index 09eb1ea3e1f..6dba5b58aa6 100644
--- a/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
+++ b/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
@@ -61,7 +61,6 @@ export const TokenBalanceListInner = forwardRef<FlatList<TokenBalanceListRow>, T
       refreshing,
       headerHeight = 0,
       onRefresh,
-      testID,
     },
     ref,
   ) {
@@ -125,9 +124,7 @@ export const TokenBalanceListInner = forwardRef<FlatList<TokenBalanceListRow>, T
     // In order to avoid unnecessary re-renders of the entire FlatList, the `renderItem` function should never change.
     // That's why we use a context provider so that each row can read from there instead of passing down new props every time the data changes.
     const renderItem = useCallback(
-      ({ item, index }: { item: TokenBalanceListRow; index: number }): JSX.Element => (
-        <TokenBalanceItemRow index={index} item={item} />
-      ),
+      ({ item }: { item: TokenBalanceListRow }): JSX.Element => <TokenBalanceItemRow item={item} />,
       [],
     )
 
@@ -212,7 +209,6 @@ export const TokenBalanceListInner = forwardRef<FlatList<TokenBalanceListRow>, T
           renderItem={renderItem}
           scrollEventThrottle={containerProps?.scrollEventThrottle ?? TAB_VIEW_SCROLL_THROTTLE}
           showsVerticalScrollIndicator={false}
-          testID={testID}
           updateCellsBatchingPeriod={10}
           windowSize={isFocused ? 10 : 3}
           onContentSizeChange={onContentSizeChange}
@@ -226,13 +222,7 @@ export const TokenBalanceListInner = forwardRef<FlatList<TokenBalanceListRow>, T
   },
 )
 
-const TokenBalanceItemRow = memo(function TokenBalanceItemRow({
-  item,
-  index,
-}: {
-  item: TokenBalanceListRow
-  index?: number
-}) {
+const TokenBalanceItemRow = memo(function TokenBalanceItemRow({ item }: { item: TokenBalanceListRow }) {
   const {
     balancesById,
     hiddenTokensCount,
@@ -272,7 +262,6 @@ const TokenBalanceItemRow = memo(function TokenBalanceItemRow({
     <TokenBalanceItemContextMenu portfolioBalance={portfolioBalance}>
       <TokenBalanceItem
         padded
-        index={index}
         isLoading={isWarmLoading}
         portfolioBalance={portfolioBalance}
         onPressToken={onPressToken}
diff --git a/apps/mobile/src/components/TokenDetails/LinkButton.tsx b/apps/mobile/src/components/TokenDetails/LinkButton.tsx
index 83b7a1e4359..6e142670840 100644
--- a/apps/mobile/src/components/TokenDetails/LinkButton.tsx
+++ b/apps/mobile/src/components/TokenDetails/LinkButton.tsx
@@ -1,7 +1,7 @@
 import { SharedEventName } from '@uniswap/analytics-events'
 import React from 'react'
 import { SvgProps } from 'react-native-svg'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { Flex, IconProps, Text, TouchableArea, useSporeColors } from 'ui/src'
 import CopyIcon from 'ui/src/assets/icons/copy-sheets.svg'
 import { iconSizes } from 'ui/src/theme'
@@ -9,10 +9,10 @@ import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, ElementNameType } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
-import { openUri } from 'uniswap/src/utils/linking'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+import { openUri } from 'wallet/src/utils/linking'
 
 export enum LinkButtonType {
   Copy = 'copy',
@@ -36,7 +36,7 @@ export function LinkButton({
   isSafeUri?: boolean
   value: string
 }): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
 
   const copyValue = async (): Promise<void> => {
diff --git a/apps/mobile/src/components/TokenDetails/TokenBalances.tsx b/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
index 91bbe252934..e07f223e637 100644
--- a/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
@@ -5,13 +5,13 @@ import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { Flex, Separator, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
-import { InlineNetworkPill } from 'uniswap/src/components/network/NetworkPill'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { NumberType } from 'utilities/src/format/types'
+import { InlineNetworkPill } from 'wallet/src/components/network/NetworkPill'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccount, useDisplayName } from 'wallet/src/features/wallet/hooks'
diff --git a/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx b/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
index 862fc21a98d..fc9aa3cb5ec 100644
--- a/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
@@ -4,7 +4,7 @@ import { Button, Flex, useSporeColors } from 'ui/src'
 import { opacify, validColor } from 'ui/src/theme'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, ElementNameType, SectionName } from 'uniswap/src/features/telemetry/constants'
-import { getContrastPassingTextColor } from 'uniswap/src/utils/colors'
+import { getContrastPassingTextColor } from 'wallet/src/utils/colors'
 
 function CTAButton({
   title,
diff --git a/apps/mobile/src/components/TokenDetails/hooks.test.ts b/apps/mobile/src/components/TokenDetails/hooks.test.ts
index e585980d644..0360234c757 100644
--- a/apps/mobile/src/components/TokenDetails/hooks.test.ts
+++ b/apps/mobile/src/components/TokenDetails/hooks.test.ts
@@ -1,8 +1,8 @@
 import { useCrossChainBalances, useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { preloadedMobileState } from 'src/test/fixtures'
 import { act, renderHook, waitFor } from 'src/test/test-utils'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import {
   SAMPLE_CURRENCY_ID_1,
   portfolio,
@@ -41,7 +41,7 @@ describe(useCrossChainBalances, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           currentChainBalance: null,
-        }),
+        })
       )
     })
 
@@ -51,16 +51,19 @@ describe(useCrossChainBalances, () => {
       const { resolvers } = queryResolvers({
         portfolios: () => [Portfolio],
       })
-      const { result } = renderHook(() => useCrossChainBalances(currentChainBalance.currencyInfo.currencyId, null), {
-        preloadedState: preloadedMobileState(),
-        resolvers,
-      })
+      const { result } = renderHook(
+        () => useCrossChainBalances(currentChainBalance.currencyInfo.currencyId, null),
+        {
+          preloadedState: preloadedMobileState(),
+          resolvers,
+        }
+      )
 
       await waitFor(() => {
         expect(result.current).toEqual(
           expect.objectContaining({
             currentChainBalance,
-          }),
+          })
         )
       })
     })
@@ -77,12 +80,15 @@ describe(useCrossChainBalances, () => {
       expect(result.current).toEqual(
         expect.objectContaining({
           otherChainBalances: null,
-        }),
+        })
       )
     })
 
     it('does not include current chain balance in other chain balances', async () => {
-      const tokenBalances = [tokenBalance({ token: usdcBaseToken() }), tokenBalance({ token: usdcArbitrumToken() })]
+      const tokenBalances = [
+        tokenBalance({ token: usdcBaseToken() }),
+        tokenBalance({ token: usdcArbitrumToken() }),
+      ]
 
       const bridgeInfo = tokenBalances.map((balance) => ({
         chain: balance.token.chain,
@@ -101,11 +107,13 @@ describe(useCrossChainBalances, () => {
         {
           preloadedState: preloadedMobileState(),
           resolvers,
-        },
+        }
       )
 
       await waitFor(() => {
-        expect(result.current).toEqual(expect.objectContaining({ currentChainBalance, otherChainBalances }))
+        expect(result.current).toEqual(
+          expect.objectContaining({ currentChainBalance, otherChainBalances })
+        )
       })
     })
   })
diff --git a/apps/mobile/src/components/TokenDetails/hooks.ts b/apps/mobile/src/components/TokenDetails/hooks.ts
index 1e5775b0a1e..17347681a22 100644
--- a/apps/mobile/src/components/TokenDetails/hooks.ts
+++ b/apps/mobile/src/components/TokenDetails/hooks.ts
@@ -7,9 +7,9 @@ import {
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { buildCurrencyId, buildNativeCurrencyId, currencyIdToChain } from 'wallet/src/utils/currencyId'
 
 /** Helper hook to retrieve balances across chains for a given currency, for the active account. */
diff --git a/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx b/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
index 092fe8f62e0..b7f196bbb98 100644
--- a/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
@@ -1,17 +1,14 @@
 import { BottomSheetFlatList } from '@gorhom/bottom-sheet'
 import React, { memo, useCallback, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, ListRenderItemInfo } from 'react-native'
+import { ListRenderItemInfo } from 'react-native'
 import { Flex, Inset, Loader } from 'ui/src'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
-import { TokenOptionItem } from 'uniswap/src/components/TokenSelector/TokenOptionItem'
-import { useBottomSheetFocusHook } from 'uniswap/src/components/modals/hooks'
 import { FiatOnRampCurrency } from 'uniswap/src/features/fiatOnRamp/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
-import { NumberType } from 'utilities/src/format/types'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
+import { TokenOptionItem } from 'wallet/src/components/TokenSelector/TokenOptionItem'
+import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
 
 interface Props {
   onSelectCurrency: (currency: FiatOnRampCurrency) => void
@@ -37,8 +34,6 @@ function TokenOptionItemWrapper({
     [currencyInfo],
   )
   const onPress = useCallback(() => onSelectCurrency?.(currency), [currency, onSelectCurrency])
-  const { tokenWarningDismissed, dismissWarningCallback } = useTokenWarningDismissed(currencyInfo?.currencyId)
-  const { convertFiatAmountFormatted, formatNumberOrString } = useLocalizationContext()
 
   if (!option) {
     return null
@@ -46,15 +41,9 @@ function TokenOptionItemWrapper({
 
   return (
     <TokenOptionItem
-      balance={convertFiatAmountFormatted(option.balanceUSD, NumberType.FiatTokenPrice)}
-      dismissWarningCallback={dismissWarningCallback}
       option={option}
-      quantity={option.quantity}
-      quantityFormatted={formatNumberOrString({ value: option.quantity, type: NumberType.TokenTx })}
       showNetworkPill={currencyInfo?.currency.chainId !== UniverseChainId.Mainnet}
       showWarnings={true}
-      tokenWarningDismissed={tokenWarningDismissed}
-      onDismiss={() => Keyboard.dismiss()}
       onPress={onPress}
     />
   )
diff --git a/apps/mobile/src/components/Requests/ConnectedDapps/ConnectedDappsList.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
similarity index 93%
rename from apps/mobile/src/components/Requests/ConnectedDapps/ConnectedDappsList.tsx
rename to apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
index c87a625b624..d0259062591 100644
--- a/apps/mobile/src/components/Requests/ConnectedDapps/ConnectedDappsList.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
@@ -2,9 +2,9 @@ import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { DappConnectedNetworkModal } from 'src/components/Requests/ConnectedDapps/DappConnectedNetworksModal'
-import { DappConnectionItem } from 'src/components/Requests/ConnectedDapps/DappConnectionItem'
+import { useAppDispatch } from 'src/app/hooks'
+import { DappConnectedNetworkModal } from 'src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal'
+import { DappConnectionItem } from 'src/components/WalletConnect/ConnectedDapps/DappConnectionItem'
 import { BackButton } from 'src/components/buttons/BackButton'
 import { openModal } from 'src/features/modals/modalSlice'
 import { WalletConnectSession, removePendingSession } from 'src/features/walletConnect/walletConnectSlice'
@@ -22,7 +22,7 @@ type ConnectedDappsProps = {
 }
 
 export function ConnectedDappsList({ backButton, sessions }: ConnectedDappsProps): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const { fullHeight } = useDeviceDimensions()
   const [isEditing, setIsEditing] = useState(false)
diff --git a/apps/mobile/src/components/Requests/ConnectedDapps/DappConnectedNetworksModal.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
similarity index 96%
rename from apps/mobile/src/components/Requests/ConnectedDapps/DappConnectedNetworksModal.tsx
rename to apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
index bce5adb51ec..0409dd49391 100644
--- a/apps/mobile/src/components/Requests/ConnectedDapps/DappConnectedNetworksModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
@@ -2,8 +2,8 @@ import { getSdkError } from '@walletconnect/utils'
 import React from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { DappHeaderIcon } from 'src/components/Requests/DappHeaderIcon'
+import { useAppDispatch } from 'src/app/hooks'
+import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { WalletConnectSession, removeSession } from 'src/features/walletConnect/walletConnectSlice'
 import { Button, Flex, Text } from 'ui/src'
@@ -26,7 +26,7 @@ interface DappConnectedNetworkModalProps {
 export function DappConnectedNetworkModal({ session, onClose }: DappConnectedNetworkModalProps): JSX.Element {
   const { t } = useTranslation()
   const address = useActiveAccountAddressWithThrow()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { dapp, id } = session
 
   const onDisconnect = async (): Promise<void> => {
diff --git a/apps/mobile/src/components/Requests/ConnectedDapps/DappConnectionItem.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
similarity index 95%
rename from apps/mobile/src/components/Requests/ConnectedDapps/DappConnectionItem.tsx
rename to apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
index 70fac046a8a..ba21b45ba84 100644
--- a/apps/mobile/src/components/Requests/ConnectedDapps/DappConnectionItem.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
@@ -5,18 +5,18 @@ import { NativeSyntheticEvent, StyleSheet } from 'react-native'
 import ContextMenu, { ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
 import 'react-native-reanimated'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { DappHeaderIcon } from 'src/components/Requests/DappHeaderIcon'
+import { useAppDispatch } from 'src/app/hooks'
+import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { WalletConnectSession, removeSession } from 'src/features/walletConnect/walletConnectSlice'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { AnimatedTouchableArea, Flex, ImpactFeedbackStyle, Text, TouchableArea } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
-import { NetworkLogos } from 'uniswap/src/components/network/NetworkLogos'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { NetworkLogos } from 'wallet/src/components/network/NetworkLogos'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
@@ -32,7 +32,7 @@ export function DappConnectionItem({
 }): JSX.Element {
   const { t } = useTranslation()
   const { dapp } = session
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const address = useActiveAccountAddressWithThrow()
 
   const onDisconnect = async (): Promise<void> => {
@@ -134,7 +134,6 @@ export function DappConnectionItem({
             borderRadius="$roundedFull"
             chains={session.chains}
             p="$spacing8"
-            size={iconSizes.icon16}
           />
         </TouchableArea>
       </Flex>
diff --git a/apps/mobile/src/components/Requests/DappHeaderIcon.tsx b/apps/mobile/src/components/WalletConnect/DappHeaderIcon.tsx
similarity index 100%
rename from apps/mobile/src/components/Requests/DappHeaderIcon.tsx
rename to apps/mobile/src/components/WalletConnect/DappHeaderIcon.tsx
diff --git a/apps/mobile/src/components/Requests/ModalWithOverlay/ModalWithOverlay.tsx b/apps/mobile/src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay.tsx
similarity index 98%
rename from apps/mobile/src/components/Requests/ModalWithOverlay/ModalWithOverlay.tsx
rename to apps/mobile/src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay.tsx
index b0b5550e94e..6be33be4328 100644
--- a/apps/mobile/src/components/Requests/ModalWithOverlay/ModalWithOverlay.tsx
+++ b/apps/mobile/src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay.tsx
@@ -12,7 +12,7 @@ import {
   ViewStyle,
 } from 'react-native'
 import { AnimatedStyle, useDerivedValue } from 'react-native-reanimated'
-import { ScrollDownOverlay } from 'src/components/Requests/ModalWithOverlay/ScrollDownOverlay'
+import { ScrollDownOverlay } from 'src/components/WalletConnect/ModalWithOverlay/ScrollDownOverlay'
 import { Button, Flex, useDeviceInsets } from 'ui/src'
 import { spacing } from 'ui/src/theme'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
diff --git a/apps/mobile/src/components/Requests/ModalWithOverlay/ScrollDownOverlay.tsx b/apps/mobile/src/components/WalletConnect/ModalWithOverlay/ScrollDownOverlay.tsx
similarity index 100%
rename from apps/mobile/src/components/Requests/ModalWithOverlay/ScrollDownOverlay.tsx
rename to apps/mobile/src/components/WalletConnect/ModalWithOverlay/ScrollDownOverlay.tsx
diff --git a/apps/mobile/src/components/Requests/RequestModal/ClientDetails.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/ClientDetails.tsx
similarity index 89%
rename from apps/mobile/src/components/Requests/RequestModal/ClientDetails.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/ClientDetails.tsx
index 156a8c25602..61a947265cc 100644
--- a/apps/mobile/src/components/Requests/RequestModal/ClientDetails.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/ClientDetails.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { LinkButton } from 'src/components/buttons/LinkButton'
-import { DappHeaderIcon } from 'src/components/Requests/DappHeaderIcon'
-import { HeaderText } from 'src/components/Requests/RequestModal/HeaderText'
+import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
+import { HeaderText } from 'src/components/WalletConnect/RequestModal/HeaderText'
 import { WalletConnectRequest } from 'src/features/walletConnect/walletConnectSlice'
 import { Flex, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
diff --git a/apps/mobile/src/components/Requests/RequestModal/HeaderText.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx
similarity index 100%
rename from apps/mobile/src/components/Requests/RequestModal/HeaderText.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx
diff --git a/apps/mobile/src/components/Requests/RequestModal/KidSuperCheckinModal.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/KidSuperCheckinModal.tsx
similarity index 89%
rename from apps/mobile/src/components/Requests/RequestModal/KidSuperCheckinModal.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/KidSuperCheckinModal.tsx
index 5db87b36a44..0e4b2ccef7d 100644
--- a/apps/mobile/src/components/Requests/RequestModal/KidSuperCheckinModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/KidSuperCheckinModal.tsx
@@ -1,9 +1,9 @@
 import { useBottomSheetInternal } from '@gorhom/bottom-sheet'
 import { useTranslation } from 'react-i18next'
 import Animated, { useAnimatedStyle } from 'react-native-reanimated'
-import { ModalWithOverlay } from 'src/components/Requests/ModalWithOverlay/ModalWithOverlay'
-import { RequestDetailsContent } from 'src/components/Requests/RequestModal/RequestDetails'
-import { useUwuLinkContractAllowlist } from 'src/components/Requests/ScanSheet/util'
+import { ModalWithOverlay } from 'src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay'
+import { RequestDetailsContent } from 'src/components/WalletConnect/RequestModal/RequestDetails'
+import { useUwuLinkContractAllowlist } from 'src/components/WalletConnect/ScanSheet/util'
 import { SignRequest } from 'src/features/walletConnect/walletConnectSlice'
 import { Flex, useIsDarkMode } from 'ui/src'
 import { spacing } from 'ui/src/theme'
diff --git a/apps/mobile/src/components/Requests/RequestModal/RequestDetails.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
similarity index 94%
rename from apps/mobile/src/components/Requests/RequestModal/RequestDetails.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
index e1834f6d89d..e1bdbc3249e 100644
--- a/apps/mobile/src/components/Requests/RequestModal/RequestDetails.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
@@ -55,7 +55,7 @@ const MAX_TYPED_DATA_PARSE_DEPTH = 3
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getParsedObjectDisplay = (chainId: number, obj: any, depth = 0): JSX.Element => {
   if (depth === MAX_TYPED_DATA_PARSE_DEPTH + 1) {
-    return <Text variant="body3">...</Text>
+    return <Text variant="monospace">...</Text>
   }
 
   return (
@@ -66,7 +66,7 @@ const getParsedObjectDisplay = (chainId: number, obj: any, depth = 0): JSX.Eleme
         if (typeof childValue === 'object') {
           return (
             <Flex key={objKey} gap="$spacing4">
-              <Text color="$neutral2" variant="body3">
+              <Text color="$neutral2" style={{ marginLeft: depth * 10 }} variant="monospace">
                 {objKey}
               </Text>
               {getParsedObjectDisplay(chainId, childValue, depth + 1)}
@@ -76,17 +76,15 @@ const getParsedObjectDisplay = (chainId: number, obj: any, depth = 0): JSX.Eleme
 
         if (typeof childValue === 'string') {
           return (
-            <Flex key={objKey} row alignItems="flex-start" gap="$spacing8">
-              <Text color="$neutral2" py="$spacing4" variant="body3">
+            <Flex key={objKey} row alignItems="flex-start" gap="$spacing8" style={{ marginLeft: depth * 10 }}>
+              <Text color="$neutral2" py="$spacing4" variant="monospace">
                 {objKey}
               </Text>
               <Flex shrink gap="$spacing16">
                 {getValidAddress(childValue, true) ? (
-                  <Flex py="$spacing4">
-                    <AddressButton address={childValue} chainId={chainId} textVariant="body3" />
-                  </Flex>
+                  <AddressButton address={childValue} chainId={chainId} textVariant="monospace" />
                 ) : (
-                  <Text py="$spacing4" variant="body3">
+                  <Text py="$spacing4" variant="monospace">
                     {childValue}
                   </Text>
                 )}
diff --git a/apps/mobile/src/components/Requests/RequestModal/UwULinkErc20SendModal.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/UwULinkErc20SendModal.tsx
similarity index 97%
rename from apps/mobile/src/components/Requests/RequestModal/UwULinkErc20SendModal.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/UwULinkErc20SendModal.tsx
index 1eefd9fdda1..d25fc089c3c 100644
--- a/apps/mobile/src/components/Requests/RequestModal/UwULinkErc20SendModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/UwULinkErc20SendModal.tsx
@@ -2,7 +2,7 @@ import { useBottomSheetInternal } from '@gorhom/bottom-sheet'
 import { formatUnits } from 'ethers/lib/utils'
 import { useTranslation } from 'react-i18next'
 import Animated, { useAnimatedStyle } from 'react-native-reanimated'
-import { ModalWithOverlay } from 'src/components/Requests/ModalWithOverlay/ModalWithOverlay'
+import { ModalWithOverlay } from 'src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay'
 import { UwuLinkErc20Request } from 'src/features/walletConnect/walletConnectSlice'
 import { Flex, SpinningLoader, Text, useIsDarkMode } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
@@ -10,7 +10,6 @@ import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { NetworkFee } from 'wallet/src/components/network/NetworkFee'
@@ -18,6 +17,7 @@ import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { RemoteImage } from 'wallet/src/features/images/RemoteImage'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useOnChainCurrencyBalance } from 'wallet/src/features/portfolio/api'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
diff --git a/apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModal.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
similarity index 92%
rename from apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModal.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
index db9d610cf01..07a5ca086ab 100644
--- a/apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
@@ -3,16 +3,15 @@ import { getSdkError } from '@walletconnect/utils'
 import { providers } from 'ethers'
 import React, { useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
-import { ModalWithOverlay } from 'src/components/Requests/ModalWithOverlay/ModalWithOverlay'
-import { KidSuperCheckinModal } from 'src/components/Requests/RequestModal/KidSuperCheckinModal'
-import { UwULinkErc20SendModal } from 'src/components/Requests/RequestModal/UwULinkErc20SendModal'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { ModalWithOverlay } from 'src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay'
+import { KidSuperCheckinModal } from 'src/components/WalletConnect/RequestModal/KidSuperCheckinModal'
+import { UwULinkErc20SendModal } from 'src/components/WalletConnect/RequestModal/UwULinkErc20SendModal'
 import {
   WalletConnectRequestModalContent,
   methodCostsGas,
-} from 'src/components/Requests/RequestModal/WalletConnectRequestModalContent'
-import { useHasSufficientFunds } from 'src/components/Requests/RequestModal/hooks'
+} from 'src/components/WalletConnect/RequestModal/WalletConnectRequestModalContent'
+import { useHasSufficientFunds } from 'src/components/WalletConnect/RequestModal/hooks'
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
 import { returnToPreviousApp } from 'src/features/walletConnect/WalletConnect'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
@@ -99,7 +98,7 @@ export function WalletConnectRequestModal({ onClose, request }: Props): JSX.Elem
   }
 
   const confirmEnabled = checkConfirmEnabled()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   /**
    * TODO: [MOB-239] implement this behavior in a less janky way. Ideally if we can distinguish between `onClose` being called programmatically and `onClose` as a results of a user dismissing the modal then we can determine what this value should be without this class variable.
    * Indicates that the modal can reject the request when the modal happens. This will be false when the modal closes as a result of the user explicitly confirming or rejecting a request and true otherwise.
@@ -137,14 +136,11 @@ export function WalletConnectRequestModal({ onClose, request }: Props): JSX.Elem
   }
 
   const onConfirm = async (): Promise<void> => {
-    if (!confirmEnabled || !signerAccount) {
+    if (!confirmEnabled || !signerAccount || !tx) {
       return
     }
 
     if (request.type === EthMethod.EthSendTransaction || request.type === UwULinkMethod.Erc20Send) {
-      if (!tx) {
-        return
-      }
       const txnWithFormattedGasEstimates = formatExternalTxnWithGasEstimates({
         transaction: tx,
         gasFeeResult: gasFee,
diff --git a/apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModalContent.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModalContent.tsx
similarity index 95%
rename from apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModalContent.tsx
rename to apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModalContent.tsx
index 253121d298e..f1fd7ad1aa1 100644
--- a/apps/mobile/src/components/Requests/RequestModal/WalletConnectRequestModalContent.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModalContent.tsx
@@ -4,8 +4,8 @@ import React, { PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleProp, ViewStyle } from 'react-native'
 import Animated, { useAnimatedStyle } from 'react-native-reanimated'
-import { ClientDetails, PermitInfo } from 'src/components/Requests/RequestModal/ClientDetails'
-import { RequestDetails } from 'src/components/Requests/RequestModal/RequestDetails'
+import { ClientDetails, PermitInfo } from 'src/components/WalletConnect/RequestModal/ClientDetails'
+import { RequestDetails } from 'src/components/WalletConnect/RequestModal/RequestDetails'
 import {
   SignRequest,
   TransactionRequest,
@@ -16,12 +16,12 @@ import { Flex, Text, useSporeColors } from 'ui/src'
 import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 import { iconSizes } from 'ui/src/theme'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { EthMethod, isPrimaryTypePermit } from 'uniswap/src/types/walletConnect'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
 import { useUSDValue } from 'wallet/src/features/gas/hooks'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { AddressFooter } from 'wallet/src/features/transactions/TransactionRequest/AddressFooter'
 import { NetworkFeeFooter } from 'wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter'
 import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
diff --git a/apps/mobile/src/components/Requests/RequestModal/hooks.ts b/apps/mobile/src/components/WalletConnect/RequestModal/hooks.ts
similarity index 94%
rename from apps/mobile/src/components/Requests/RequestModal/hooks.ts
rename to apps/mobile/src/components/WalletConnect/RequestModal/hooks.ts
index 2f8066028ac..f741c31bbde 100644
--- a/apps/mobile/src/components/Requests/RequestModal/hooks.ts
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/hooks.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { useOnChainNativeCurrencyBalance } from 'wallet/src/features/portfolio/api'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { hasSufficientFundsIncludingGas } from 'wallet/src/features/transactions/utils'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
diff --git a/apps/mobile/src/components/Requests/ScanSheet/PendingConnectionModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
similarity index 95%
rename from apps/mobile/src/components/Requests/ScanSheet/PendingConnectionModal.tsx
rename to apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
index 551fa807775..480b0c61421 100644
--- a/apps/mobile/src/components/Requests/ScanSheet/PendingConnectionModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
@@ -3,12 +3,11 @@ import { getSdkError } from '@walletconnect/utils'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Animated, { useAnimatedStyle } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
-import { DappHeaderIcon } from 'src/components/Requests/DappHeaderIcon'
-import { ModalWithOverlay } from 'src/components/Requests/ModalWithOverlay/ModalWithOverlay'
-import { PendingConnectionSwitchAccountModal } from 'src/components/Requests/ScanSheet/PendingConnectionSwitchAccountModal'
-import { truncateQueryParams } from 'src/components/Requests/ScanSheet/util'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
+import { ModalWithOverlay } from 'src/components/WalletConnect/ModalWithOverlay/ModalWithOverlay'
+import { PendingConnectionSwitchAccountModal } from 'src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal'
+import { truncateQueryParams } from 'src/components/WalletConnect/ScanSheet/util'
 import { LinkButton } from 'src/components/buttons/LinkButton'
 import { returnToPreviousApp } from 'src/features/walletConnect/WalletConnect'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
@@ -22,7 +21,6 @@ import {
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { Check, RotatableChevron, X } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { NetworkLogos } from 'uniswap/src/components/network/NetworkLogos'
 import { MobileEventName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
@@ -30,6 +28,7 @@ import { WalletChainId } from 'uniswap/src/types/chains'
 import { WCEventType, WCRequestOutcome, WalletConnectEvent } from 'uniswap/src/types/walletConnect'
 import { formatDappURL } from 'utilities/src/format/urls'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { NetworkLogos } from 'wallet/src/components/network/NetworkLogos'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { AddressFooter } from 'wallet/src/features/transactions/TransactionRequest/AddressFooter'
@@ -151,7 +150,7 @@ const SwitchAccountRow = ({ activeAddress, setModalState }: SwitchAccountProps):
 export const PendingConnectionModal = ({ pendingSession, onClose }: Props): JSX.Element => {
   const { t } = useTranslation()
 
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAddress = useActiveAccountAddressWithThrow()
   const activeAccount = useActiveAccountWithThrow()
   const didOpenFromDeepLink = useAppSelector(selectDidOpenFromDeepLink)
diff --git a/apps/mobile/src/components/Requests/ScanSheet/PendingConnectionSwitchAccountModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
similarity index 93%
rename from apps/mobile/src/components/Requests/ScanSheet/PendingConnectionSwitchAccountModal.tsx
rename to apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
index 85263b4621b..a46e395af34 100644
--- a/apps/mobile/src/components/Requests/ScanSheet/PendingConnectionSwitchAccountModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { SwitchAccountOption } from 'src/components/Requests/ScanSheet/SwitchAccountOption'
+import { SwitchAccountOption } from 'src/components/WalletConnect/ScanSheet/SwitchAccountOption'
 import { Flex, Text } from 'ui/src'
 import { ActionSheetModal } from 'uniswap/src/components/modals/ActionSheetModal'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
diff --git a/apps/mobile/src/components/Requests/ScanSheet/PendingConnectionSwitchNetworkModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
similarity index 100%
rename from apps/mobile/src/components/Requests/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
rename to apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
diff --git a/apps/mobile/src/components/Requests/ScanSheet/SwitchAccountOption.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx
similarity index 100%
rename from apps/mobile/src/components/Requests/ScanSheet/SwitchAccountOption.tsx
rename to apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx
diff --git a/apps/mobile/src/components/Requests/ScanSheet/WalletConnectModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
similarity index 98%
rename from apps/mobile/src/components/Requests/ScanSheet/WalletConnectModal.tsx
rename to apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
index 39a40355dd2..7bf42b92845 100644
--- a/apps/mobile/src/components/Requests/ScanSheet/WalletConnectModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
@@ -2,10 +2,10 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
 import 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useEagerExternalProfileRootNavigation } from 'src/app/navigation/hooks'
 import { QRCodeScanner } from 'src/components/QRCodeScanner/QRCodeScanner'
-import { ConnectedDappsList } from 'src/components/Requests/ConnectedDapps/ConnectedDappsList'
+import { ConnectedDappsList } from 'src/components/WalletConnect/ConnectedDapps/ConnectedDappsList'
 import {
   URIType,
   UWULINK_PREFIX,
@@ -14,7 +14,7 @@ import {
   isAllowedUwuLinkRequest,
   toTokenTransferRequest,
   useUwuLinkContractAllowlist,
-} from 'src/components/Requests/ScanSheet/util'
+} from 'src/components/WalletConnect/ScanSheet/util'
 import { BackButtonView } from 'src/components/layout/BackButtonView'
 import { openDeepLink } from 'src/features/deepLinking/handleDeepLinkSaga'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
@@ -54,7 +54,7 @@ export function WalletConnectModal({
   const [currentScreenState, setCurrentScreenState] = useState<ScannerModalState>(initialScreenState)
   const [shouldFreezeCamera, setShouldFreezeCamera] = useState(false)
   const { preload, navigate } = useEagerExternalProfileRootNavigation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isUwULinkEnabled = useFeatureFlag(FeatureFlags.UwULink)
   const isScantasticEnabled = useFeatureFlag(FeatureFlags.Scantastic)
 
diff --git a/apps/mobile/src/components/Requests/ScanSheet/util.test.ts b/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
similarity index 97%
rename from apps/mobile/src/components/Requests/ScanSheet/util.test.ts
rename to apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
index fe61ac39333..d6f94a93e30 100644
--- a/apps/mobile/src/components/Requests/ScanSheet/util.test.ts
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
@@ -1,5 +1,9 @@
 import * as wcUtils from '@walletconnect/utils'
-import { CUSTOM_UNI_QR_CODE_PREFIX, URIType, getSupportedURI } from 'src/components/Requests/ScanSheet/util'
+import {
+  CUSTOM_UNI_QR_CODE_PREFIX,
+  URIType,
+  getSupportedURI,
+} from 'src/components/WalletConnect/ScanSheet/util'
 import {
   wcAsParamInUniwapScheme,
   wcInUniwapScheme,
diff --git a/apps/mobile/src/components/Requests/ScanSheet/util.ts b/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
similarity index 92%
rename from apps/mobile/src/components/Requests/ScanSheet/util.ts
rename to apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
index 4567cd8461a..1eba555ae17 100644
--- a/apps/mobile/src/components/Requests/ScanSheet/util.ts
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
@@ -6,9 +6,8 @@ import {
   UNISWAP_URL_SCHEME_WALLETCONNECT_AS_PARAM,
   UNISWAP_WALLETCONNECT_URL,
 } from 'src/features/deepLinking/constants'
-import { AssetType } from 'uniswap/src/entities/assets'
-import { DynamicConfigs, UwuLinkConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import { RPCType } from 'uniswap/src/types/chains'
 import {
   EthMethod,
@@ -19,6 +18,7 @@ import {
 } from 'uniswap/src/types/walletConnect'
 import { areAddressesEqual, getValidAddress } from 'uniswap/src/utils/addresses'
 import { logger } from 'utilities/src/logger/logger'
+import { AssetType } from 'wallet/src/entities/assets'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
 import { ProviderManager } from 'wallet/src/features/providers'
 import { ScantasticParams, ScantasticParamsSchema } from 'wallet/src/features/scantastic/types'
@@ -151,26 +151,8 @@ function isUwULink(uri: string): boolean {
 // Gets the UWULink contract allow list from statsig dynamic config.
 // We can safely cast as long as the statsig config format matches our `UwuLinkAllowlist` type.
 export function useUwuLinkContractAllowlist(): UwULinkAllowlist {
-  return useDynamicConfigValue(
-    DynamicConfigs.UwuLink,
-    UwuLinkConfigKey.Allowlist,
-    {
-      contracts: [],
-      tokenRecipients: [],
-    },
-    (x: unknown) => {
-      const hasFields =
-        x !== null && typeof x === 'object' && Object.hasOwn(x, 'contracts') && Object.hasOwn(x, 'tokenRecipients')
-
-      if (!hasFields) {
-        return false
-      }
-
-      const castedObj = x as { contracts: unknown; tokenRecipients: unknown }
-
-      return Array.isArray(castedObj.contracts) && Array.isArray(castedObj.tokenRecipients)
-    },
-  )
+  const uwuLinkConfig = useDynamicConfig(DynamicConfigs.UwuLink)
+  return uwuLinkConfig.getValue('allowlist') as UwULinkAllowlist
 }
 
 export function findAllowedTokenRecipient(
diff --git a/apps/mobile/src/components/Requests/WalletConnectModals.tsx b/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
similarity index 91%
rename from apps/mobile/src/components/Requests/WalletConnectModals.tsx
rename to apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
index 8a0bf942ecb..46490cf4667 100644
--- a/apps/mobile/src/components/Requests/WalletConnectModals.tsx
+++ b/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
-import { WalletConnectRequestModal } from 'src/components/Requests/RequestModal/WalletConnectRequestModal'
-import { PendingConnectionModal } from 'src/components/Requests/ScanSheet/PendingConnectionModal'
-import { WalletConnectModal } from 'src/components/Requests/ScanSheet/WalletConnectModal'
+import { useAppDispatch } from 'src/app/hooks'
+import { WalletConnectRequestModal } from 'src/components/WalletConnect/RequestModal/WalletConnectRequestModal'
+import { PendingConnectionModal } from 'src/components/WalletConnect/ScanSheet/PendingConnectionModal'
+import { WalletConnectModal } from 'src/components/WalletConnect/ScanSheet/WalletConnectModal'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
 import {
@@ -25,7 +25,7 @@ import { useActiveAccount, useActiveAccountAddressWithThrow, useSignerAccounts }
 
 export function WalletConnectModals(): JSX.Element {
   const activeAccount = useActiveAccount()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const { pendingRequests, modalState, pendingSession } = useWalletConnect(activeAccount?.address)
 
@@ -80,7 +80,7 @@ function RequestModal({ currRequest }: RequestModalProps): JSX.Element {
   const signerAccounts = useSignerAccounts()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
 
   // TODO: Move returnToPreviousApp() call to onClose but ensure it is not called twice
diff --git a/apps/mobile/src/components/accounts/AccountCardItem.tsx b/apps/mobile/src/components/accounts/AccountCardItem.tsx
index ec1dcf25355..8d9affed99e 100644
--- a/apps/mobile/src/components/accounts/AccountCardItem.tsx
+++ b/apps/mobile/src/components/accounts/AccountCardItem.tsx
@@ -2,7 +2,7 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { NotificationBadge } from 'src/components/notifications/Badge'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
@@ -12,13 +12,13 @@ import { iconSizes } from 'ui/src/theme'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { NumberType } from 'utilities/src/format/types'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { useAccountList } from 'wallet/src/features/accounts/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 type AccountCardItemProps = {
   address: Address
@@ -73,7 +73,7 @@ export function AccountCardItem({
 }: AccountCardItemProps): JSX.Element {
   const { t } = useTranslation()
 
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const onPressCopyAddress = async (): Promise<void> => {
     await HapticFeedback.impact()
diff --git a/apps/mobile/src/components/accounts/AccountHeader.test.tsx b/apps/mobile/src/components/accounts/AccountHeader.test.tsx
index 10369dd039f..9bc71ffe413 100644
--- a/apps/mobile/src/components/accounts/AccountHeader.test.tsx
+++ b/apps/mobile/src/components/accounts/AccountHeader.test.tsx
@@ -5,7 +5,6 @@ import { AccountHeader } from 'src/components/accounts/AccountHeader'
 import { fireEvent, render, screen, waitFor, within } from 'src/test/test-utils'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { ON_PRESS_EVENT_PAYLOAD } from 'uniswap/src/test/fixtures'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
 import { ACCOUNT, preloadedSharedState, signerMnemonicAccount } from 'wallet/src/test/fixtures'
@@ -35,7 +34,7 @@ describe(AccountHeader, () => {
     it('renders shortened address within section address without name section', () => {
       render(<AccountHeader />, { preloadedState: stateWithoutName })
 
-      const addressSection = screen.getByTestId(TestID.AccountHeaderCopyAddress)
+      const addressSection = screen.getByTestId('account-header/address-only')
       const addressText = within(addressSection).queryByText(shortenedAddress)
 
       expect(addressText).toBeTruthy()
@@ -46,7 +45,7 @@ describe(AccountHeader, () => {
       jest.spyOn(ExpoClipboard, 'setStringAsync').mockImplementation(setStringAsync)
       render(<AccountHeader />, { preloadedState: stateWithoutName })
 
-      const addressSection = screen.getByTestId(TestID.AccountHeaderCopyAddress)
+      const addressSection = screen.getByTestId('account-header/address-only')
       fireEvent.press(addressSection, ON_PRESS_EVENT_PAYLOAD)
 
       await waitFor(() => {
diff --git a/apps/mobile/src/components/accounts/AccountHeader.tsx b/apps/mobile/src/components/accounts/AccountHeader.tsx
index a169672f6bf..3c8c3915c0a 100644
--- a/apps/mobile/src/components/accounts/AccountHeader.tsx
+++ b/apps/mobile/src/components/accounts/AccountHeader.tsx
@@ -1,7 +1,6 @@
 import { SharedEventName } from '@uniswap/analytics-events'
 import React, { useCallback, useEffect } from 'react'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { openModal } from 'src/features/modals/modalSlice'
 import { Flex, HapticFeedback, ImpactFeedbackStyle, Text, TouchableArea } from 'ui/src'
@@ -12,7 +11,6 @@ import { MobileUserPropertyName, setUserProperty } from 'uniswap/src/features/te
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { isDevEnv } from 'utilities/src/environment'
 import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { AnimatedUnitagDisplayName } from 'wallet/src/components/accounts/AnimatedUnitagDisplayName'
@@ -22,11 +20,12 @@ import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
 import { selectActiveAccount, selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 export function AccountHeader(): JSX.Element {
   const activeAddress = useAppSelector(selectActiveAccountAddress)
   const account = useAppSelector(selectActiveAccount)
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const { avatar } = useAvatar(activeAddress)
   const displayName = useDisplayName(activeAddress)
@@ -84,7 +83,7 @@ export function AccountHeader(): JSX.Element {
               flexDirection="row"
               hapticStyle={ImpactFeedbackStyle.Medium}
               hitSlop={20}
-              testID={TestID.AccountHeaderAvatar}
+              testID={TestID.Manage}
               onLongPress={async (): Promise<void> => {
                 if (isDevEnv()) {
                   await HapticFeedback.selection()
@@ -126,7 +125,7 @@ export function AccountHeader(): JSX.Element {
             <TouchableArea
               hapticFeedback
               hitSlop={20}
-              testID={TestID.AccountHeaderCopyAddress}
+              testID="account-header/address-only"
               onPress={onPressCopyAddress}
             >
               <Flex centered row shrink gap="$spacing4">
diff --git a/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap b/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap
index 8c8e8ede1cc..3c1b670cc09 100644
--- a/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap
+++ b/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`AccountHeader renders correctly 1`] = `
             ],
           }
         }
-        testID="account-header-avatar"
+        testID="manage"
       >
         <View
           style={
@@ -387,7 +387,6 @@ exports[`AccountHeader renders correctly 1`] = `
                   ],
                 }
               }
-              testID="account-header-copy-address"
             >
               <View
                 style={
diff --git a/apps/mobile/src/components/banners/ExtensionPromoBanner.tsx b/apps/mobile/src/components/banners/ExtensionPromoBanner.tsx
index 131378d5137..cd32ed0c249 100644
--- a/apps/mobile/src/components/banners/ExtensionPromoBanner.tsx
+++ b/apps/mobile/src/components/banners/ExtensionPromoBanner.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import { Keyboard, StyleProp, ViewStyle } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { Flex, Image, Text, TouchableArea, useIsDarkMode, useIsShortMobileDevice, useSporeColors } from 'ui/src'
 import { EXTENSION_PROMO_BANNER_DARK, EXTENSION_PROMO_BANNER_LIGHT } from 'ui/src/assets'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
@@ -19,7 +19,7 @@ export function ExtensionPromoBanner({
 }: {
   onShowExtensionPromoModal: () => void
 }): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const { fullWidth } = useDeviceDimensions()
   const colors = useSporeColors()
diff --git a/apps/mobile/src/components/buttons/CopyTextButton.test.tsx b/apps/mobile/src/components/buttons/CopyTextButton.test.tsx
index 423572ec10a..e7bfd831c60 100644
--- a/apps/mobile/src/components/buttons/CopyTextButton.test.tsx
+++ b/apps/mobile/src/components/buttons/CopyTextButton.test.tsx
@@ -1,8 +1,8 @@
 import { CopyTextButton } from 'src/components/buttons/CopyTextButton'
 import { act, fireEvent, render } from 'src/test/test-utils'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
-jest.mock('uniswap/src/utils/clipboard')
+jest.mock('wallet/src/utils/clipboard')
 
 describe(CopyTextButton, () => {
   beforeEach(() => {
diff --git a/apps/mobile/src/components/buttons/CopyTextButton.tsx b/apps/mobile/src/components/buttons/CopyTextButton.tsx
index 12c22aa58a6..88c95621e18 100644
--- a/apps/mobile/src/components/buttons/CopyTextButton.tsx
+++ b/apps/mobile/src/components/buttons/CopyTextButton.tsx
@@ -4,8 +4,8 @@ import { Button, useSporeColors } from 'ui/src'
 import CheckCircle from 'ui/src/assets/icons/check-circle.svg'
 import CopySheets from 'ui/src/assets/icons/copy-sheets.svg'
 import { iconSizes } from 'ui/src/theme'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { useTimeout } from 'utilities/src/time/timing'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 interface Props {
   copyText?: string
diff --git a/apps/mobile/src/components/buttons/LinkButton.test.tsx b/apps/mobile/src/components/buttons/LinkButton.test.tsx
index 457bf9e46c3..d7bee3d2088 100644
--- a/apps/mobile/src/components/buttons/LinkButton.test.tsx
+++ b/apps/mobile/src/components/buttons/LinkButton.test.tsx
@@ -2,7 +2,7 @@ import { LinkButton } from 'src/components/buttons/LinkButton'
 import { fireEvent, render } from 'src/test/test-utils'
 import { ON_PRESS_EVENT_PAYLOAD } from 'uniswap/src/test/fixtures'
 
-jest.mock('uniswap/src/utils/linking')
+jest.mock('wallet/src/utils/linking')
 
 describe(LinkButton, () => {
   it('renders without error', () => {
@@ -38,7 +38,7 @@ describe(LinkButton, () => {
       const button = getByText('link text')
       fireEvent.press(button, ON_PRESS_EVENT_PAYLOAD)
 
-      expect(require('uniswap/src/utils/linking').openUri).toHaveBeenCalledWith(
+      expect(require('wallet/src/utils/linking').openUri).toHaveBeenCalledWith(
         'https://example.com',
         openExternalBrowser,
         isSafeUri,
diff --git a/apps/mobile/src/components/buttons/LinkButton.tsx b/apps/mobile/src/components/buttons/LinkButton.tsx
index cc6cedd8932..6132dec98ac 100644
--- a/apps/mobile/src/components/buttons/LinkButton.tsx
+++ b/apps/mobile/src/components/buttons/LinkButton.tsx
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
 import { Flex, FlexProps, Text, TouchableArea, TouchableAreaProps, useSporeColors } from 'ui/src'
 import ExternalLinkIcon from 'ui/src/assets/icons/external-link.svg'
 import { TextVariantTokens, iconSizes } from 'ui/src/theme'
-import { openUri } from 'uniswap/src/utils/linking'
+import { openUri } from 'wallet/src/utils/linking'
 
 interface LinkButtonProps extends Omit<TouchableAreaProps, 'onPress'> {
   label: string
diff --git a/apps/mobile/src/components/explore/ExploreSections.tsx b/apps/mobile/src/components/explore/ExploreSections.tsx
index 3e59299f77c..d6dae1f4b92 100644
--- a/apps/mobile/src/components/explore/ExploreSections.tsx
+++ b/apps/mobile/src/components/explore/ExploreSections.tsx
@@ -26,10 +26,10 @@ import {
   useExploreTokensTabQuery,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { usePersistedError } from 'uniswap/src/features/dataApi/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { areAddressesEqual } from 'uniswap/src/utils/addresses'
 import { buildCurrencyId, buildNativeCurrencyId } from 'uniswap/src/utils/currencyId'
+import { usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { selectHasFavoriteTokens, selectHasWatchedWallets } from 'wallet/src/features/favorites/selectors'
 import { selectTokensOrderBy } from 'wallet/src/features/wallet/selectors'
 
@@ -191,7 +191,6 @@ export function ExploreSections({ listRef }: ExploreSectionsProps): JSX.Element
         contentContainerStyle={{ paddingBottom: insets.bottom }}
         data={showLoading ? undefined : topTokenItems}
         keyExtractor={tokenKey}
-        removeClippedSubviews={false}
         renderItem={renderItem}
         scrollEventThrottle={16}
         showsHorizontalScrollIndicator={false}
diff --git a/apps/mobile/src/components/explore/FavoriteTokenCard.tsx b/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
index 73f3cdfa608..e1ec81dc633 100644
--- a/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
+++ b/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
@@ -2,7 +2,7 @@ import React, { memo, useCallback } from 'react'
 import { ViewProps } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
 import { FadeIn, SharedValue } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import RemoveButton from 'src/components/explore/RemoveButton'
 import { useAnimatedCardDragStyle, useExploreTokenContextMenu } from 'src/components/explore/hooks'
@@ -17,13 +17,13 @@ import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
 import { PollingInterval } from 'uniswap/src/constants/misc'
 import { useFavoriteTokenCardQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import { SectionName } from 'uniswap/src/features/telemetry/constants'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { NumberType } from 'utilities/src/format/types'
 import { RelativeChange } from 'wallet/src/components/text/RelativeChange'
 import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { removeFavoriteToken } from 'wallet/src/features/favorites/slice'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 
@@ -45,7 +45,7 @@ function FavoriteTokenCard({
   setIsEditing,
   ...rest
 }: FavoriteTokenCardProps): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const tokenDetailsNavigation = useTokenDetailsNavigation()
   const { convertFiatAmountFormatted } = useLocalizationContext()
 
diff --git a/apps/mobile/src/components/explore/FavoriteTokensGrid.tsx b/apps/mobile/src/components/explore/FavoriteTokensGrid.tsx
index c018560a890..f9e46081ec2 100644
--- a/apps/mobile/src/components/explore/FavoriteTokensGrid.tsx
+++ b/apps/mobile/src/components/explore/FavoriteTokensGrid.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn, useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'src/app/hooks'
 import { FavoriteHeaderRow } from 'src/components/explore/FavoriteHeaderRow'
 import FavoriteTokenCard, { FAVORITE_TOKEN_CARD_LOADER_HEIGHT } from 'src/components/explore/FavoriteTokenCard'
@@ -16,6 +15,7 @@ import { Flex } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { selectFavoriteTokens } from 'wallet/src/features/favorites/selectors'
 import { setFavoriteTokens } from 'wallet/src/features/favorites/slice'
+import { useAppDispatch } from 'wallet/src/state'
 
 const NUM_COLUMNS = 2
 const ITEM_FLEX = { flex: 1 / NUM_COLUMNS }
@@ -27,7 +27,7 @@ type FavoriteTokensGridProps = AutoScrollProps & {
 /** Renders the favorite tokens section on the Explore tab */
 export function FavoriteTokensGrid({ showLoading, ...rest }: FavoriteTokensGridProps): JSX.Element | null {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const [isEditing, setIsEditing] = useState(false)
   const isTokenDragged = useSharedValue(false)
diff --git a/apps/mobile/src/components/explore/FavoriteWalletCard.tsx b/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
index 0a248995836..e7299c5cf65 100644
--- a/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
+++ b/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { ViewProps } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
 import { SharedValue } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useEagerExternalProfileNavigation } from 'src/app/navigation/hooks'
 import RemoveButton from 'src/components/explore/RemoveButton'
 import { useAnimatedCardDragStyle } from 'src/components/explore/hooks'
@@ -35,7 +35,7 @@ function FavoriteWalletCard({
   ...rest
 }: FavoriteWalletCardProps): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { preload, navigate } = useEagerExternalProfileNavigation()
 
   const displayName = useDisplayName(address)
diff --git a/apps/mobile/src/components/explore/FavoriteWalletsGrid.tsx b/apps/mobile/src/components/explore/FavoriteWalletsGrid.tsx
index a72d91eb5ae..314cd6b0d87 100644
--- a/apps/mobile/src/components/explore/FavoriteWalletsGrid.tsx
+++ b/apps/mobile/src/components/explore/FavoriteWalletsGrid.tsx
@@ -1,7 +1,6 @@
 import { default as React, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn, useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'src/app/hooks'
 import { FavoriteHeaderRow } from 'src/components/explore/FavoriteHeaderRow'
 import FavoriteWalletCard from 'src/components/explore/FavoriteWalletCard'
@@ -16,6 +15,7 @@ import { Flex } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
 import { setFavoriteWallets } from 'wallet/src/features/favorites/slice'
+import { useAppDispatch } from 'wallet/src/state'
 
 const NUM_COLUMNS = 2
 const ITEM_FLEX = { flex: 1 / NUM_COLUMNS }
@@ -27,7 +27,7 @@ type FavoriteWalletsGridProps = AutoScrollProps & {
 /** Renders the favorite wallets section on the Explore tab */
 export function FavoriteWalletsGrid({ showLoading, ...rest }: FavoriteWalletsGridProps): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const [isEditing, setIsEditing] = useState(false)
   const isTokenDragged = useSharedValue(false)
diff --git a/apps/mobile/src/components/explore/RemoveButton.tsx b/apps/mobile/src/components/explore/RemoveButton.tsx
index af9f6248873..d03f9f543ac 100644
--- a/apps/mobile/src/components/explore/RemoveButton.tsx
+++ b/apps/mobile/src/components/explore/RemoveButton.tsx
@@ -17,7 +17,6 @@ export default function RemoveButton({ visible = true, ...rest }: RemoveButtonPr
       alignItems="center"
       backgroundColor="$neutral3"
       borderRadius="$roundedFull"
-      disabled={!visible}
       height={imageSizes.image24}
       justifyContent="center"
       style={animatedVisibilityStyle}
diff --git a/apps/mobile/src/components/explore/SortButton.tsx b/apps/mobile/src/components/explore/SortButton.tsx
index 1c6bfae4674..e0d00720fe6 100644
--- a/apps/mobile/src/components/explore/SortButton.tsx
+++ b/apps/mobile/src/components/explore/SortButton.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { getTokensOrderByMenuLabel, getTokensOrderBySelectedLabel } from 'src/features/explore/utils'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { Flex, Text, TouchableArea, useIsDarkMode } from 'ui/src'
@@ -19,7 +19,7 @@ interface FilterGroupProps {
 
 function _SortButton({ orderBy }: FilterGroupProps): JSX.Element {
   const isDarkMode = useIsDarkMode()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
 
   const menuActions = useMemo(() => {
diff --git a/apps/mobile/src/components/explore/__snapshots__/FavoriteWalletCard.test.tsx.snap b/apps/mobile/src/components/explore/__snapshots__/FavoriteWalletCard.test.tsx.snap
index 1062aedd8ca..62aca13bb0b 100644
--- a/apps/mobile/src/components/explore/__snapshots__/FavoriteWalletCard.test.tsx.snap
+++ b/apps/mobile/src/components/explore/__snapshots__/FavoriteWalletCard.test.tsx.snap
@@ -232,16 +232,11 @@ exports[`FavoriteWalletCard renders without error 1`] = `
             </View>
           </View>
           <View
+            cancelable={true}
             collapsable={false}
-            disabled={true}
-            hitSlop={
-              {
-                "bottom": 5,
-                "left": 5,
-                "right": 5,
-                "top": 5,
-              }
-            }
+            disabled={false}
+            focusable={true}
+            hitSlop={[Function]}
             jestAnimatedStyle={
               {
                 "value": {
@@ -249,6 +244,14 @@ exports[`FavoriteWalletCard renders without error 1`] = `
                 },
               }
             }
+            minPressDuration={0}
+            onBlur={[Function]}
+            onFocus={[Function]}
+            onMouseEnter={[Function]}
+            onMouseLeave={[Function]}
+            onPress={[Function]}
+            onPressIn={[Function]}
+            onPressOut={[Function]}
             style={
               {
                 "alignItems": "center",
diff --git a/apps/mobile/src/components/explore/__snapshots__/TokenItem.test.tsx.snap b/apps/mobile/src/components/explore/__snapshots__/TokenItem.test.tsx.snap
index 8c3bc7d9471..9caadde96ce 100644
--- a/apps/mobile/src/components/explore/__snapshots__/TokenItem.test.tsx.snap
+++ b/apps/mobile/src/components/explore/__snapshots__/TokenItem.test.tsx.snap
@@ -234,7 +234,6 @@ exports[`TokenItem renders without error 1`] = `
                     }
                   }
                   suppressHighlighting={true}
-                  testID="portfolio-relative-change"
                 >
                   -
                 </Text>
diff --git a/apps/mobile/src/components/explore/hooks.test.ts b/apps/mobile/src/components/explore/hooks.test.ts
index 96e42dc0d5f..20c366e7d3f 100644
--- a/apps/mobile/src/components/explore/hooks.test.ts
+++ b/apps/mobile/src/components/explore/hooks.test.ts
@@ -5,9 +5,9 @@ import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
 import { renderHookWithProviders } from 'src/test/render'
 import { Resolvers } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { SectionName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { FavoritesState } from 'wallet/src/features/favorites/slice'
-import { SAMPLE_SEED_ADDRESS_1 } from 'wallet/src/test/fixtures'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { SAMPLE_SEED_ADDRESS_1 } from 'wallet/src/test/fixtures/constants'
 import { cleanup } from 'wallet/src/test/test-utils'
 
 const tokenId = SAMPLE_SEED_ADDRESS_1
@@ -30,7 +30,10 @@ describe(useExploreTokenContextMenu, () => {
 
   describe('editing favorite tokens', () => {
     it('renders proper context menu items when onEditFavorites is not provided', async () => {
-      const { result } = renderHookWithProviders(() => useExploreTokenContextMenu(tokenMenuParams), { resolvers })
+      const { result } = renderHookWithProviders(
+        () => useExploreTokenContextMenu(tokenMenuParams),
+        { resolvers }
+      )
 
       expect(result.current.menuActions).toEqual([
         expect.objectContaining({
@@ -57,7 +60,7 @@ describe(useExploreTokenContextMenu, () => {
       const onEditFavorites = jest.fn()
       const { result } = renderHookWithProviders(
         () => useExploreTokenContextMenu({ ...tokenMenuParams, onEditFavorites }),
-        { resolvers },
+        { resolvers }
       )
 
       expect(result.current.menuActions).toEqual([
@@ -85,11 +88,11 @@ describe(useExploreTokenContextMenu, () => {
       const onEditFavorites = jest.fn()
       const { result } = renderHookWithProviders(
         () => useExploreTokenContextMenu({ ...tokenMenuParams, onEditFavorites }),
-        { resolvers },
+        { resolvers }
       )
 
       const editFavoritesActionIndex = result.current.menuActions.findIndex(
-        (action: ContextMenuAction) => action.title === 'Edit favorites',
+        (action: ContextMenuAction) => action.title === 'Edit favorites'
       )
       result.current.onContextMenuPress({
         nativeEvent: { index: editFavoritesActionIndex },
@@ -102,12 +105,15 @@ describe(useExploreTokenContextMenu, () => {
 
   describe('adding / removing favorite tokens', () => {
     it('renders proper context menu items when token is favorited', async () => {
-      const { result } = renderHookWithProviders(() => useExploreTokenContextMenu(tokenMenuParams), {
-        preloadedState: {
-          favorites: { tokens: [tokenMenuParams.currencyId.toLowerCase()] } as FavoritesState,
-        },
-        resolvers,
-      })
+      const { result } = renderHookWithProviders(
+        () => useExploreTokenContextMenu(tokenMenuParams),
+        {
+          preloadedState: {
+            favorites: { tokens: [tokenMenuParams.currencyId.toLowerCase()] } as FavoritesState,
+          },
+          resolvers,
+        }
+      )
 
       expect(result.current.menuActions).toEqual([
         expect.objectContaining({
@@ -132,13 +138,13 @@ describe(useExploreTokenContextMenu, () => {
 
     it("dispatches add to favorites redux action when 'Favorite token' is pressed", async () => {
       const store = mockStore({ favorites: { tokens: [] }, appearance: { theme: 'system' } })
-      const { result } = renderHookWithProviders(() => useExploreTokenContextMenu(tokenMenuParams), {
-        resolvers,
-        store,
-      })
+      const { result } = renderHookWithProviders(
+        () => useExploreTokenContextMenu(tokenMenuParams),
+        { resolvers, store }
+      )
 
       const favoriteTokenActionIndex = result.current.menuActions.findIndex(
-        (action: ContextMenuAction) => action.title === 'Favorite token',
+        (action: ContextMenuAction) => action.title === 'Favorite token'
       )
       result.current.onContextMenuPress({
         nativeEvent: { index: favoriteTokenActionIndex },
@@ -159,13 +165,13 @@ describe(useExploreTokenContextMenu, () => {
         favorites: { tokens: [tokenMenuParams.currencyId.toLowerCase()] },
         appearance: { theme: 'system' },
       })
-      const { result } = renderHookWithProviders(() => useExploreTokenContextMenu(tokenMenuParams), {
-        resolvers,
-        store,
-      })
+      const { result } = renderHookWithProviders(
+        () => useExploreTokenContextMenu(tokenMenuParams),
+        { resolvers, store }
+      )
 
       const removeFavoriteTokenActionIndex = result.current.menuActions.findIndex(
-        (action: ContextMenuAction) => action.title === 'Remove favorite',
+        (action: ContextMenuAction) => action.title === 'Remove favorite'
       )
       result.current.onContextMenuPress({
         nativeEvent: { index: removeFavoriteTokenActionIndex },
@@ -192,7 +198,9 @@ describe(useExploreTokenContextMenu, () => {
       resolvers,
     })
 
-    const swapActionIndex = result.current.menuActions.findIndex((action: ContextMenuAction) => action.title === 'Swap')
+    const swapActionIndex = result.current.menuActions.findIndex(
+      (action: ContextMenuAction) => action.title === 'Swap'
+    )
     result.current.onContextMenuPress({
       nativeEvent: { index: swapActionIndex },
     } as NativeSyntheticEvent<ContextMenuOnPressNativeEvent>)
@@ -227,7 +235,7 @@ describe(useExploreTokenContextMenu, () => {
     jest.spyOn(Share, 'share')
 
     const shareActionIndex = result.current.menuActions.findIndex(
-      (action: ContextMenuAction) => action.title === 'Share',
+      (action: ContextMenuAction) => action.title === 'Share'
     )
     result.current.onContextMenuPress({
       nativeEvent: { index: shareActionIndex },
diff --git a/apps/mobile/src/components/explore/hooks.ts b/apps/mobile/src/components/explore/hooks.ts
index e422a93953f..16986f14310 100644
--- a/apps/mobile/src/components/explore/hooks.ts
+++ b/apps/mobile/src/components/explore/hooks.ts
@@ -4,18 +4,18 @@ import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent } from 'react-native'
 import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
 import { SharedValue, StyleProps, interpolate, useAnimatedStyle } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
 import { useSelectHasTokenFavorited, useToggleFavoriteCallback } from 'src/features/favorites/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { ElementName, ModalName, SectionNameType } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { currencyIdToAddress } from 'uniswap/src/utils/currencyId'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { AssetType } from 'wallet/src/entities/assets'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
+import { useAppDispatch } from 'wallet/src/state'
 
 interface TokenMenuParams {
   currencyId: CurrencyId
@@ -37,7 +37,7 @@ export function useExploreTokenContextMenu({
 } {
   const { t } = useTranslation()
   const isFavorited = useSelectHasTokenFavorited(currencyId)
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const { handleShareToken } = useWalletNavigation()
 
diff --git a/apps/mobile/src/components/explore/search/SearchEmptySection.tsx b/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
index 35874264ebe..4972dccc2fb 100644
--- a/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
+++ b/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
@@ -2,8 +2,7 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { SearchPopularNFTCollections } from 'src/components/explore/search/SearchPopularNFTCollections'
 import { SearchPopularTokens } from 'src/components/explore/search/SearchPopularTokens'
 import { renderSearchItem } from 'src/components/explore/search/SearchResultsSection'
@@ -13,8 +12,7 @@ import ClockIcon from 'ui/src/assets/icons/clock.svg'
 import { TrendUp } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { iconSizes } from 'ui/src/theme'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
-import { WalletSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchResultType, WalletSearchResult } from 'wallet/src/features/search/SearchResult'
 import { clearSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
 import { selectSearchHistory } from 'wallet/src/features/search/selectSearchHistory'
 
@@ -35,7 +33,7 @@ export const SUGGESTED_WALLETS: WalletSearchResult[] = [
 
 export function SearchEmptySection(): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const searchHistory = useAppSelector(selectSearchHistory)
 
   const onPressClearSearchHistory = (): void => {
diff --git a/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx b/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
index 4a78b2c2531..b7edf4c754e 100644
--- a/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
+++ b/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
@@ -2,10 +2,9 @@ import React, { useMemo } from 'react'
 import { FlatList, ListRenderItemInfo } from 'react-native'
 import { SearchNFTCollectionItem } from 'src/components/explore/search/items/SearchNFTCollectionItem'
 import { getSearchResultId, gqlNFTToNFTCollectionSearchResult } from 'src/components/explore/search/utils'
-import { Flex, Loader } from 'ui/src'
+import { Inset, Loader } from 'ui/src'
 import { useSearchPopularNftCollectionsQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
-import { NFTCollectionSearchResult } from 'wallet/src/features/search/SearchResult'
+import { NFTCollectionSearchResult, SearchResultType } from 'wallet/src/features/search/SearchResult'
 
 function isNFTCollectionSearchResult(result: NFTCollectionSearchResult | null): result is NFTCollectionSearchResult {
   return (result as NFTCollectionSearchResult).type === SearchResultType.NFTCollection
@@ -26,9 +25,9 @@ export function SearchPopularNFTCollections(): JSX.Element {
 
   if (loading) {
     return (
-      <Flex px="$spacing24" py="$spacing8">
+      <Inset all="$spacing8">
         <Loader.Token repeat={2} />
-      </Flex>
+      </Inset>
     )
   }
 
diff --git a/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx b/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
index 58ba3f57a92..5b4b60f54af 100644
--- a/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
+++ b/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
@@ -2,10 +2,9 @@ import React, { useMemo } from 'react'
 import { FlatList, ListRenderItemInfo } from 'react-native'
 import { SearchTokenItem } from 'src/components/explore/search/items/SearchTokenItem'
 import { getSearchResultId } from 'src/components/explore/search/utils'
-import { Flex, Loader } from 'ui/src'
+import { Inset, Loader } from 'ui/src'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
-import { TokenSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
 import { TopToken, usePopularTokens } from 'wallet/src/features/tokens/hooks'
 
 function gqlTokenToTokenSearchResult(token: Maybe<TopToken>): TokenSearchResult | null {
@@ -40,9 +39,9 @@ export function SearchPopularTokens(): JSX.Element {
 
   if (loading) {
     return (
-      <Flex px="$spacing24" py="$spacing8">
+      <Inset all="$spacing8">
         <Loader.Token repeat={2} />
-      </Flex>
+      </Inset>
     )
   }
 
diff --git a/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx b/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
index 544f856694e..b69014155da 100644
--- a/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
+++ b/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
@@ -15,7 +15,7 @@ export const SearchResultsLoader = (): JSX.Element => {
           icon={<Coin color="$neutral2" size="$icon.24" />}
           title={t('explore.search.section.tokens')}
         />
-        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing24">
+        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing8">
           <Loader.Token repeat={2} />
         </AnimatedFlex>
       </Flex>
@@ -24,7 +24,7 @@ export const SearchResultsLoader = (): JSX.Element => {
           icon={<Gallery color="$neutral2" size="$icon.24" />}
           title={t('explore.search.section.nft')}
         />
-        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing24">
+        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing8">
           <Loader.Token repeat={2} />
         </AnimatedFlex>
       </Flex>
@@ -33,7 +33,7 @@ export const SearchResultsLoader = (): JSX.Element => {
           icon={<Person color="$neutral2" size="$icon.24" />}
           title={t('explore.search.section.wallets')}
         />
-        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing24">
+        <AnimatedFlex entering={FadeIn} exiting={FadeOut} mx="$spacing8">
           <Loader.Token />
         </AnimatedFlex>
       </Flex>
diff --git a/apps/mobile/src/components/explore/search/SearchResultsSection.tsx b/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
index 506a85991af..dd8a3eb1aec 100644
--- a/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
+++ b/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
@@ -24,13 +24,12 @@ import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { useExploreSearchQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import i18n from 'uniswap/src/i18n/i18n'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { getValidAddress } from 'uniswap/src/utils/addresses'
 import { logger } from 'utilities/src/logger/logger'
-import { NFTCollectionSearchResult, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { NFTCollectionSearchResult, SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
 
 const ICON_SIZE = '$icon.24'
 const ICON_COLOR = '$neutral2'
diff --git a/apps/mobile/src/components/explore/search/SearchSectionHeader.tsx b/apps/mobile/src/components/explore/search/SearchSectionHeader.tsx
index 6f537ca6e33..1952d47cca1 100644
--- a/apps/mobile/src/components/explore/search/SearchSectionHeader.tsx
+++ b/apps/mobile/src/components/explore/search/SearchSectionHeader.tsx
@@ -8,7 +8,7 @@ interface SectionHeaderTextProps {
 
 export const SectionHeaderText = ({ title, icon, ...rest }: SectionHeaderTextProps & TextProps): JSX.Element => {
   return (
-    <Flex row alignItems="center" gap="$spacing8" mb="$spacing4" mx="$spacing20" {...rest}>
+    <Flex row alignItems="center" gap="$spacing8" mb="$spacing4" mx="$spacing4" {...rest}>
       {icon && icon}
       <Text color="$neutral2" variant="subheading2">
         {title}
diff --git a/apps/mobile/src/components/explore/search/hooks.ts b/apps/mobile/src/components/explore/search/hooks.ts
index 46628095830..e66cad8c955 100644
--- a/apps/mobile/src/components/explore/search/hooks.ts
+++ b/apps/mobile/src/components/explore/search/hooks.ts
@@ -1,10 +1,9 @@
 import { useMemo } from 'react'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { useUnitagByAddress, useUnitagByName } from 'uniswap/src/features/unitags/hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { getValidAddress } from 'uniswap/src/utils/addresses'
 import { useENS } from 'wallet/src/features/ens/useENS'
-import { WalletSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchResultType, WalletSearchResult } from 'wallet/src/features/search/SearchResult'
 import { useIsSmartContractAddress } from 'wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress'
 
 // eslint-disable-next-line complexity
diff --git a/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx b/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx
index b96593250ea..4ebc857a132 100644
--- a/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx
@@ -3,11 +3,11 @@ import { useTranslation } from 'react-i18next'
 import { SearchWalletItemBase } from 'src/components/explore/search/items/SearchWalletItemBase'
 import { Flex, Text } from 'ui/src'
 import { imageSizes } from 'ui/src/theme'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
 import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { useENSAvatar, useENSName } from 'wallet/src/features/ens/api'
 import { getCompletedENSName } from 'wallet/src/features/ens/useENS'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import { ENSAddressSearchResult } from 'wallet/src/features/search/SearchResult'
 
 type SearchENSAddressItemProps = {
@@ -47,7 +47,7 @@ export function SearchENSAddressItem({ searchResult, searchContext }: SearchENSA
 
   return (
     <SearchWalletItemBase searchContext={searchContext} searchResult={searchResult}>
-      <Flex row alignItems="center" gap="$spacing12" px="$spacing24" py="$spacing12">
+      <Flex row alignItems="center" gap="$spacing12" px="$spacing8" py="$spacing12">
         <AccountIcon address={address} avatarUri={avatar} size={imageSizes.image40} />
         <Flex shrink>
           <Text ellipsizeMode="tail" numberOfLines={1} testID={`address-display/name/${ensName}`} variant="body1">
diff --git a/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx b/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
index 28b155634dc..abfe50bed48 100644
--- a/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
@@ -1,16 +1,15 @@
 import { default as React } from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { getBlockExplorerIcon } from 'src/components/icons/BlockExplorerIcon'
 import { Flex, ImpactFeedbackStyle, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { shortenAddress } from 'uniswap/src/utils/addresses'
-import { openUri } from 'uniswap/src/utils/linking'
 import { Arrow } from 'wallet/src/components/icons/Arrow'
 import { EtherscanSearchResult } from 'wallet/src/features/search/SearchResult'
 import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+import { ExplorerDataType, getExplorerLink, openUri } from 'wallet/src/utils/linking'
 
 type SearchEtherscanItemProps = {
   etherscanResult: EtherscanSearchResult
@@ -18,7 +17,7 @@ type SearchEtherscanItemProps = {
 
 export function SearchEtherscanItem({ etherscanResult }: SearchEtherscanItemProps): JSX.Element {
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const { address } = etherscanResult
 
@@ -41,7 +40,7 @@ export function SearchEtherscanItem({ etherscanResult }: SearchEtherscanItemProp
       testID={TestID.SearchEtherscanItem}
       onPress={onPressViewEtherscan}
     >
-      <Flex row alignItems="center" gap="$spacing12" justifyContent="space-between" px="$spacing24" py="$spacing12">
+      <Flex row alignItems="center" gap="$spacing12" justifyContent="space-between" px="$spacing8" py="$spacing12">
         <Flex centered row gap="$spacing12">
           <EtherscanIcon size="$icon.40" />
           <Text variant="body1">{shortenAddress(address)}</Text>
diff --git a/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx b/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
index 8361107aefb..9ed4f71654b 100644
--- a/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
@@ -1,17 +1,16 @@
 import { default as React } from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useAppStackNavigation } from 'src/app/navigation/types'
 import { Flex, ImpactFeedbackStyle, Text, TouchableArea } from 'ui/src'
 import { Verified } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
-import { NFTCollectionSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { NFTCollectionSearchResult, SearchResultType } from 'wallet/src/features/search/SearchResult'
 import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
 
 type NFTCollectionItemProps = {
@@ -21,7 +20,7 @@ type NFTCollectionItemProps = {
 
 export function SearchNFTCollectionItem({ collection, searchContext }: NFTCollectionItemProps): JSX.Element {
   const { name, address, chainId, isVerified, imageUrl } = collection
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const navigation = useAppStackNavigation()
 
   const onPress = (): void => {
@@ -63,7 +62,7 @@ export function SearchNFTCollectionItem({ collection, searchContext }: NFTCollec
       testID={TestID.SearchNFTCollectionItem}
       onPress={onPress}
     >
-      <Flex row alignItems="center" gap="$spacing8" justifyContent="flex-start" px="$spacing24" py="$spacing12">
+      <Flex row alignItems="center" gap="$spacing8" justifyContent="flex-start" px="$spacing8" py="$spacing12">
         <Flex
           centered
           borderRadius="$roundedFull"
diff --git a/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx b/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
index 48147bfd2db..692982dc14d 100644
--- a/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
@@ -1,6 +1,6 @@
 import { default as React } from 'react'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
 import { disableOnPress } from 'src/utils/disableOnPress'
@@ -8,14 +8,13 @@ import { Flex, ImpactFeedbackStyle, Text, TouchableArea, useIsDarkMode } from 'u
 import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
 import WarningIcon from 'uniswap/src/components/icons/WarningIcon'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { MobileEventName, SectionName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { shortenAddress } from 'uniswap/src/utils/addresses'
 import { buildCurrencyId, buildNativeCurrencyId } from 'uniswap/src/utils/currencyId'
-import { TokenSearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
 import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
 
 type SearchTokenItemProps = {
@@ -25,7 +24,7 @@ type SearchTokenItemProps = {
 
 export function SearchTokenItem({ token, searchContext }: SearchTokenItemProps): JSX.Element {
   const isDarkMode = useIsDarkMode()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const tokenDetailsNavigation = useTokenDetailsNavigation()
 
   const { chainId, address, name, symbol, logoUrl, safetyLevel } = token
@@ -76,7 +75,7 @@ export function SearchTokenItem({ token, searchContext }: SearchTokenItemProps):
         onLongPress={disableOnPress}
         onPress={onPress}
       >
-        <Flex row alignItems="center" gap="$spacing12" px="$spacing24" py="$spacing12">
+        <Flex row alignItems="center" gap="$spacing12" px="$spacing8" py="$spacing12">
           <TokenLogo chainId={chainId} name={name} symbol={symbol} url={logoUrl ?? undefined} />
           <Flex shrink alignItems="flex-start">
             <Flex centered row gap="$spacing8">
diff --git a/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx b/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx
index d8331ff4d13..3ec3d1ed0ea 100644
--- a/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx
@@ -2,10 +2,10 @@ import React from 'react'
 import { SearchWalletItemBase } from 'src/components/explore/search/items/SearchWalletItemBase'
 import { Flex, Text } from 'ui/src'
 import { imageSizes } from 'ui/src/theme'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
 import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import { UnitagSearchResult } from 'wallet/src/features/search/SearchResult'
 import { useAvatar } from 'wallet/src/features/wallet/hooks'
 import { DisplayNameType } from 'wallet/src/features/wallet/types'
@@ -23,7 +23,7 @@ export function SearchUnitagItem({ searchResult, searchContext }: SearchUnitagIt
 
   return (
     <SearchWalletItemBase searchContext={searchContext} searchResult={searchResult}>
-      <Flex row alignItems="center" gap="$spacing12" px="$spacing24" py="$spacing12">
+      <Flex row alignItems="center" gap="$spacing12" px="$spacing8" py="$spacing12">
         <AccountIcon address={address} avatarUri={avatar} size={imageSizes.image40} />
         <Flex alignItems="flex-start" justifyContent="center">
           <DisplayNameText includeUnitagSuffix displayName={displayName} textProps={{ variant: 'body1' }} />
diff --git a/apps/mobile/src/components/explore/search/items/SearchWalletByAddressItem.tsx b/apps/mobile/src/components/explore/search/items/SearchWalletByAddressItem.tsx
index dceb54b26c1..ae682cd32f1 100644
--- a/apps/mobile/src/components/explore/search/items/SearchWalletByAddressItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchWalletByAddressItem.tsx
@@ -2,10 +2,10 @@ import React from 'react'
 import { SearchWalletItemBase } from 'src/components/explore/search/items/SearchWalletItemBase'
 import { Flex, Text } from 'ui/src'
 import { imageSizes } from 'ui/src/theme'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
 import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { useENSAvatar, useENSName } from 'wallet/src/features/ens/api'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import { WalletByAddressSearchResult } from 'wallet/src/features/search/SearchResult'
 
 type SearchWalletByAddressItemProps = {
@@ -24,7 +24,7 @@ export function SearchWalletByAddressItem({
 
   return (
     <SearchWalletItemBase searchContext={searchContext} searchResult={searchResult}>
-      <Flex row alignItems="center" gap="$spacing12" px="$spacing24" py="$spacing12">
+      <Flex row alignItems="center" gap="$spacing12" px="$spacing8" py="$spacing12">
         <AccountIcon address={address} avatarUri={avatar} size={imageSizes.image40} />
         <Flex shrink>
           <Text ellipsizeMode="tail" numberOfLines={1} testID={`address-display/name/${ensName}`} variant="body1">
diff --git a/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx b/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx
index ead2cf54655..88c599857c8 100644
--- a/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx
@@ -1,18 +1,16 @@
 import React, { PropsWithChildren, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { useEagerExternalProfileNavigation } from 'src/app/navigation/hooks'
 import { useToggleWatchedWalletCallback } from 'src/features/favorites/hooks'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { ImpactFeedbackStyle, TouchableArea } from 'ui/src'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
-import { WalletSearchResult, extractDomain } from 'wallet/src/features/search/SearchResult'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { SearchResultType, WalletSearchResult, extractDomain } from 'wallet/src/features/search/SearchResult'
 import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
 
 type SearchWalletItemBaseProps = {
@@ -26,7 +24,7 @@ export function SearchWalletItemBase({
   searchContext,
 }: PropsWithChildren<SearchWalletItemBaseProps>): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { preload, navigate } = useEagerExternalProfileNavigation()
   const { address, type } = searchResult
   const isFavorited = useAppSelector(selectWatchedAddressSet).has(address)
diff --git a/apps/mobile/src/components/explore/search/utils.test.ts b/apps/mobile/src/components/explore/search/utils.test.ts
index 675f5456f15..5d5dbaa4937 100644
--- a/apps/mobile/src/components/explore/search/utils.test.ts
+++ b/apps/mobile/src/components/explore/search/utils.test.ts
@@ -4,9 +4,12 @@ import {
   formatTokenSearchResults,
   gqlNFTToNFTCollectionSearchResult,
 } from 'src/components/explore/search/utils'
-import { Chain, ExploreSearchQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
+import {
+  Chain,
+  ExploreSearchQuery,
+} from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
+import { SearchResultType } from 'wallet/src/features/search/SearchResult'
 import {
   amount,
   ethToken,
@@ -96,7 +99,9 @@ describe(formatTokenSearchResults, () => {
 
     it('returns null if required data is missing', () => {
       expect(gqlNFTToNFTCollectionSearchResult({ ...collection, name: undefined })).toEqual(null)
-      expect(gqlNFTToNFTCollectionSearchResult({ ...collection, nftContracts: undefined })).toEqual(null)
+      expect(gqlNFTToNFTCollectionSearchResult({ ...collection, nftContracts: undefined })).toEqual(
+        null
+      )
       expect(gqlNFTToNFTCollectionSearchResult({ ...collection, nftContracts: [] })).toEqual(null)
     })
 
@@ -120,7 +125,10 @@ describe(formatTokenSearchResults, () => {
     it('filters out nfts that cannot be formatted', () => {
       const topNFTCollections = createArray(2, nftCollection)
       const nftSearchResult = {
-        edges: [...topNFTCollections.map((nft) => ({ node: nft })), { node: nftCollection({ name: undefined }) }],
+        edges: [
+          ...topNFTCollections.map((nft) => ({ node: nft })),
+          { node: nftCollection({ name: undefined }) },
+        ],
       }
 
       const result = formatNFTCollectionSearchResults(nftSearchResult)
diff --git a/apps/mobile/src/components/explore/search/utils.ts b/apps/mobile/src/components/explore/search/utils.ts
index eb7760d6a6f..fe79efdfb4d 100644
--- a/apps/mobile/src/components/explore/search/utils.ts
+++ b/apps/mobile/src/components/explore/search/utils.ts
@@ -2,8 +2,7 @@ import { SEARCH_RESULT_HEADER_KEY } from 'src/components/explore/search/constant
 import { SearchResultOrHeader } from 'src/components/explore/search/types'
 import { Chain, ExploreSearchQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
-import { NFTCollectionSearchResult, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
+import { NFTCollectionSearchResult, SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
 import { searchResultId } from 'wallet/src/features/search/searchHistorySlice'
 
 const MAX_TOKEN_RESULTS_COUNT = 4
diff --git a/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx b/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
index 8a1f069873e..8a25880442c 100644
--- a/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
+++ b/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
@@ -6,23 +6,19 @@ import { APP_STORE_LINK } from 'src/constants/urls'
 import { UpgradeStatus } from 'src/features/forceUpgrade/types'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { DynamicConfigs, ForceUpgradeConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { openUri } from 'uniswap/src/utils/linking'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import { SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { openUri } from 'wallet/src/utils/linking'
 
 export function ForceUpgradeModal(): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const forceUpgradeStatusString = useDynamicConfigValue(
-    DynamicConfigs.MobileForceUpgrade,
-    ForceUpgradeConfigKey.Status,
-    '' as string,
-  )
+  const forceUpgradeConfig = useDynamicConfig(DynamicConfigs.MobileForceUpgrade)
 
   const [isVisible, setIsVisible] = useState(false)
   const [upgradeStatus, setUpgradeStatus] = useState(UpgradeStatus.NotRequired)
@@ -34,15 +30,17 @@ export function ForceUpgradeModal(): JSX.Element {
   const [showSeedPhrase, setShowSeedPhrase] = useState(false)
 
   useEffect(() => {
+    const statusString = forceUpgradeConfig.getValue('status')?.toString()
+
     let status = UpgradeStatus.NotRequired
-    if (forceUpgradeStatusString === 'recommended') {
+    if (statusString === 'recommended') {
       status = UpgradeStatus.Recommended
-    } else if (forceUpgradeStatusString === 'required') {
+    } else if (statusString === 'required') {
       status = UpgradeStatus.Required
     }
     setUpgradeStatus(status)
     setIsVisible(status !== UpgradeStatus.NotRequired)
-  }, [forceUpgradeStatusString])
+  }, [forceUpgradeConfig])
 
   const onPressConfirm = async (): Promise<void> => {
     await openUri(APP_STORE_LINK, /*openExternalBrowser=*/ true, /*isSafeUri=*/ true)
diff --git a/apps/mobile/src/components/home/ActivityTab.tsx b/apps/mobile/src/components/home/ActivityTab.tsx
index 937f792a81e..f135a6a5e04 100644
--- a/apps/mobile/src/components/home/ActivityTab.tsx
+++ b/apps/mobile/src/components/home/ActivityTab.tsx
@@ -1,7 +1,7 @@
 import { ForwardedRef, forwardRef, memo, useMemo } from 'react'
 import { FlatList, RefreshControl } from 'react-native'
 import Animated from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
 import { AnimatedBottomSheetFlatList, AnimatedFlatList } from 'src/components/layout/AnimatedFlatList'
 import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
@@ -33,7 +33,7 @@ export const ActivityTab = memo(
     },
     ref,
   ) {
-    const dispatch = useDispatch()
+    const dispatch = useAppDispatch()
     const colors = useSporeColors()
     const insets = useDeviceInsets()
 
diff --git a/apps/mobile/src/components/home/FeedTab.tsx b/apps/mobile/src/components/home/FeedTab.tsx
index a59a7eb67b9..a4084f50641 100644
--- a/apps/mobile/src/components/home/FeedTab.tsx
+++ b/apps/mobile/src/components/home/FeedTab.tsx
@@ -2,8 +2,7 @@ import { ForwardedRef, forwardRef, memo, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList, RefreshControl } from 'react-native'
 import Animated from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
 import { AnimatedFlatList } from 'src/components/layout/AnimatedFlatList'
 import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
@@ -41,7 +40,7 @@ export const FeedTab = memo(
     ref,
   ) {
     const { t } = useTranslation()
-    const dispatch = useDispatch()
+    const dispatch = useAppDispatch()
     const colors = useSporeColors()
     const insets = useDeviceInsets()
 
diff --git a/apps/mobile/src/components/home/NftsTab.tsx b/apps/mobile/src/components/home/NftsTab.tsx
index 7659607a2d2..f4a8e185a31 100644
--- a/apps/mobile/src/components/home/NftsTab.tsx
+++ b/apps/mobile/src/components/home/NftsTab.tsx
@@ -7,7 +7,6 @@ import { useAdaptiveFooter } from 'src/components/home/hooks'
 import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
 import { Flex, useDeviceInsets, useSporeColors } from 'ui/src'
 import { GQLQueries } from 'uniswap/src/data/graphql/uniswap-data-api/queries'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { isAndroid } from 'utilities/src/platform'
 import { NftsList } from 'wallet/src/components/nfts/NftsList'
@@ -38,7 +37,7 @@ export const NftsTab = memo(
     )
 
     const renderNFTItem = useCallback(
-      (item: NFTItem, index: number) => {
+      (item: NFTItem) => {
         const onPressNft = (): void => {
           navigation.navigate(MobileScreens.NFTItem, {
             owner,
@@ -49,7 +48,7 @@ export const NftsTab = memo(
           })
         }
 
-        return <NftView index={index} item={item} owner={owner} onPress={onPressNft} />
+        return <NftView item={item} owner={owner} onPress={onPressNft} />
       },
       [owner, navigation],
     )
@@ -66,7 +65,7 @@ export const NftsTab = memo(
     }, [refreshing, headerHeight, onRefresh, colors.neutral3, insets.top])
 
     return (
-      <Flex grow px="$spacing12" testID={TestID.NFTsTab}>
+      <Flex grow px="$spacing12">
         <NftsList
           ref={ref}
           ListFooterComponent={isExternalProfile ? null : adaptiveFooter}
diff --git a/apps/mobile/src/components/home/TokensTab.tsx b/apps/mobile/src/components/home/TokensTab.tsx
index 16a68981bc4..df935ae53d1 100644
--- a/apps/mobile/src/components/home/TokensTab.tsx
+++ b/apps/mobile/src/components/home/TokensTab.tsx
@@ -2,7 +2,7 @@ import { useStartProfiler } from '@shopify/react-native-performance'
 import React, { forwardRef, memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { TokenBalanceList } from 'src/components/TokenBalanceList/TokenBalanceList'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { TabProps } from 'src/components/layout/TabHelpers'
@@ -11,13 +11,13 @@ import { Flex } from 'ui/src'
 import { NoTokens } from 'ui/src/components/icons'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
 import { GQLQueries } from 'uniswap/src/data/graphql/uniswap-data-api/queries'
-import { useCexTransferProviders } from 'uniswap/src/features/fiatOnRamp/useCexTransferProviders'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
+import { useCexTransferProviders } from 'wallet/src/features/fiatOnRamp/api'
 import { PortfolioEmptyState } from 'wallet/src/features/portfolio/PortfolioEmptyState'
 import { TokenBalanceListRow } from 'wallet/src/features/portfolio/TokenBalanceListContext'
 
@@ -36,14 +36,14 @@ export const TokensTab = memo(
       onRefresh,
       refreshing,
       headerHeight,
-      testID,
     },
     ref,
   ) {
     const { t } = useTranslation()
-    const dispatch = useDispatch()
+    const dispatch = useAppDispatch()
     const tokenDetailsNavigation = useTokenDetailsNavigation()
     const startProfilerTimer = useStartProfiler()
+    const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregator)
     const cexTransferEnabled = useFeatureFlag(FeatureFlags.CexTransfers)
     const cexTransferProviders = useCexTransferProviders(cexTransferEnabled)
 
@@ -60,8 +60,12 @@ export const TokensTab = memo(
     }, [dispatch])
 
     const onPressBuy = useCallback(() => {
-      dispatch(openModal({ name: ModalName.FiatOnRampAggregator }))
-    }, [dispatch])
+      dispatch(
+        openModal({
+          name: forAggregatorEnabled ? ModalName.FiatOnRampAggregator : ModalName.FiatOnRamp,
+        }),
+      )
+    }, [dispatch, forAggregatorEnabled])
 
     const onPressReceive = useCallback(() => {
       dispatch(
@@ -86,26 +90,16 @@ export const TokensTab = memo(
     const renderEmpty = useMemo((): JSX.Element => {
       // Show different empty state on external profile pages
       return isExternalProfile ? (
-        <Flex centered pt="$spacing48" px="$spacing36" style={containerProps?.emptyComponentStyle}>
-          <BaseCard.EmptyState
-            description={t('home.tokens.empty.description')}
-            icon={<NoTokens color="$neutral3" size="$icon.70" />}
-            title={t('home.tokens.empty.title')}
-            onPress={onPressAction}
-          />
-        </Flex>
+        <BaseCard.EmptyState
+          description={t('home.tokens.empty.description')}
+          icon={<NoTokens color="$neutral3" size="$icon.70" />}
+          title={t('home.tokens.empty.title')}
+          onPress={onPressAction}
+        />
       ) : (
         <PortfolioEmptyState onPressBuy={onPressBuy} onPressImport={onPressImport} onPressReceive={onPressReceive} />
       )
-    }, [
-      isExternalProfile,
-      onPressAction,
-      onPressBuy,
-      onPressImport,
-      onPressReceive,
-      containerProps?.emptyComponentStyle,
-      t,
-    ])
+    }, [isExternalProfile, onPressAction, onPressBuy, onPressImport, onPressReceive, t])
 
     return (
       <Flex grow backgroundColor="$surface1">
@@ -119,7 +113,6 @@ export const TokensTab = memo(
           refreshing={refreshing}
           renderedInModal={renderedInModal}
           scrollHandler={scrollHandler}
-          testID={testID}
           onPressToken={onPressToken}
           onRefresh={onRefresh}
         />
diff --git a/apps/mobile/src/components/layout/SafeKeyboardScreen.tsx b/apps/mobile/src/components/layout/SafeKeyboardScreen.tsx
deleted file mode 100644
index ba56667f491..00000000000
--- a/apps/mobile/src/components/layout/SafeKeyboardScreen.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { PropsWithChildren, useState } from 'react'
-import { KeyboardAvoidingView, ScrollView, StyleSheet } from 'react-native'
-import { Screen, ScreenProps } from 'src/components/layout/Screen'
-import { Flex, flexStyles } from 'ui/src'
-import { spacing } from 'ui/src/theme'
-import { useKeyboardLayout } from 'uniswap/src/utils/useKeyboardLayout'
-import { isIOS } from 'utilities/src/platform'
-
-type OnboardingScreenProps = ScreenProps & {
-  header?: JSX.Element
-  footer?: JSX.Element
-  minHeightWhenKeyboardExpanded?: boolean
-}
-
-export function SafeKeyboardScreen({
-  children,
-  header,
-  footer,
-  minHeightWhenKeyboardExpanded = false,
-  ...screenProps
-}: PropsWithChildren<OnboardingScreenProps>): JSX.Element {
-  const [footerHeight, setFooterHeight] = useState(0)
-  const keyboard = useKeyboardLayout()
-
-  const compact = keyboard.isVisible && keyboard.containerHeight !== 0
-  const containerStyle = compact ? styles.compact : styles.expand
-
-  // This makes sure this component behaves just like `behavior="padding"` when
-  // there's enough space on the screen to show all components.
-  const minHeight = minHeightWhenKeyboardExpanded && compact ? keyboard.containerHeight - footerHeight : 0
-
-  return (
-    <Screen {...screenProps}>
-      <KeyboardAvoidingView
-        behavior={isIOS ? 'padding' : 'height'}
-        contentContainerStyle={containerStyle}
-        style={styles.base}
-      >
-        {header}
-        <ScrollView bounces={false} contentContainerStyle={flexStyles.grow} keyboardShouldPersistTaps="handled">
-          <Flex minHeight={minHeight} px="$spacing16" style={[containerStyle, styles.container]}>
-            {children}
-          </Flex>
-        </ScrollView>
-        <Flex
-          onLayout={({
-            nativeEvent: {
-              layout: { height },
-            },
-          }) => {
-            setFooterHeight(height)
-          }}
-        >
-          {footer}
-        </Flex>
-      </KeyboardAvoidingView>
-    </Screen>
-  )
-}
-
-const styles = StyleSheet.create({
-  base: {
-    flex: 1,
-    justifyContent: 'flex-end',
-  },
-  compact: {
-    flexGrow: 0,
-  },
-  container: {
-    paddingBottom: spacing.spacing12,
-  },
-  expand: {
-    flexGrow: 1,
-  },
-})
diff --git a/apps/mobile/src/components/layout/Screen.tsx b/apps/mobile/src/components/layout/Screen.tsx
index 7dd87c1d712..2e88c90432a 100644
--- a/apps/mobile/src/components/layout/Screen.tsx
+++ b/apps/mobile/src/components/layout/Screen.tsx
@@ -5,7 +5,7 @@ import { Flex, FlexProps, useDeviceInsets } from 'ui/src'
 // Used to determine amount of top padding for short screens
 export const SHORT_SCREEN_HEADER_HEIGHT_RATIO = 0.88
 
-export type ScreenProps = FlexProps &
+type ScreenProps = FlexProps &
   // The SafeAreaView from react-native-safe-area-context also supports a `mode` prop which
   //  lets you choose if `edges` are added as margin or padding, but we don’t use that so
   // our Screen component doesn't need to support it
diff --git a/apps/mobile/src/components/layout/TabHelpers.tsx b/apps/mobile/src/components/layout/TabHelpers.tsx
index e441424ffb4..36a0f603484 100644
--- a/apps/mobile/src/components/layout/TabHelpers.tsx
+++ b/apps/mobile/src/components/layout/TabHelpers.tsx
@@ -85,7 +85,6 @@ export type TabProps = {
   refreshing?: boolean
   onRefresh?: () => void
   headerHeight?: number
-  testID?: string
 }
 
 export type TabContentProps = Partial<FlatListProps<unknown>> & {
@@ -107,7 +106,7 @@ export const TabLabel = ({
   isExternalProfile?: boolean
 }): JSX.Element => {
   return (
-    <Flex row alignItems="center" gap="$spacing4" testID={`home-tab-${route.title}`}>
+    <Flex row alignItems="center" gap="$spacing4">
       <Text color={focused ? '$neutral1' : '$neutral2'} variant="body1">
         {route.title}
       </Text>
diff --git a/apps/mobile/src/components/mnemonic/HiddenMnemonicWordView.tsx b/apps/mobile/src/components/mnemonic/HiddenMnemonicWordView.tsx
index 142df3b4087..2f25f72e983 100644
--- a/apps/mobile/src/components/mnemonic/HiddenMnemonicWordView.tsx
+++ b/apps/mobile/src/components/mnemonic/HiddenMnemonicWordView.tsx
@@ -11,22 +11,27 @@ export function HiddenMnemonicWordView(): JSX.Element {
       backgroundColor="$surface2"
       borderRadius="$rounded20"
       gap="$spacing36"
+      height="40%"
       mt="$spacing16"
       px="$spacing32"
       py="$spacing24"
     >
-      <HiddenWordViewColumn />
-      <HiddenWordViewColumn />
+      <Flex grow justifyContent="space-between">
+        <HiddenWordViewColumn />
+      </Flex>
+      <Flex grow justifyContent="space-between">
+        <HiddenWordViewColumn />
+      </Flex>
     </Flex>
   )
 }
 
 function HiddenWordViewColumn(): JSX.Element {
   return (
-    <Flex grow gap="$spacing20">
+    <>
       {new Array(ROW_COUNT).fill(0).map((_, idx) => (
         <Flex key={idx} backgroundColor="$surface3" borderRadius="$rounded20" height={10} />
       ))}
-    </Flex>
+    </>
   )
 }
diff --git a/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx b/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
index 1b30e231b53..5e5c238a400 100644
--- a/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
+++ b/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
@@ -65,9 +65,7 @@ export function SeedPhraseDisplay({ mnemonicId, onDismiss, walletNeedsRestore }:
             <MnemonicDisplay mnemonicId={mnemonicId} />
           </Flex>
         ) : (
-          <Flex grow px="$spacing16">
-            <HiddenMnemonicWordView />
-          </Flex>
+          <HiddenMnemonicWordView />
         )}
       </Flex>
       <Flex borderTopColor="$surface3" borderTopWidth={1} pt="$spacing12" px="$spacing16">
diff --git a/apps/mobile/src/components/text/LongMarkdownText.tsx b/apps/mobile/src/components/text/LongMarkdownText.tsx
index 7905472efd0..e33d6a80755 100644
--- a/apps/mobile/src/components/text/LongMarkdownText.tsx
+++ b/apps/mobile/src/components/text/LongMarkdownText.tsx
@@ -4,7 +4,7 @@ import { LayoutChangeEvent } from 'react-native'
 import Markdown, { MarkdownProps } from 'react-native-markdown-display'
 import { Flex, SpaceTokens, Text, useSporeColors } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import { openUri } from 'uniswap/src/utils/linking'
+import { openUri } from 'wallet/src/utils/linking'
 
 type LongMarkdownTextProps = {
   initialDisplayedLines?: number
diff --git a/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx b/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx
index bacaa3e5156..d58b4b39381 100644
--- a/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx
+++ b/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx
@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, EmitterSubscription, Keyboard } from 'react-native'
 import { getUniqueId } from 'react-native-device-info'
-import { useDispatch } from 'react-redux'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import { AlertTriangle } from 'ui/src/components/icons'
 import { fonts, spacing } from 'ui/src/theme'
@@ -25,6 +24,7 @@ import { useCanAddressClaimUnitag, useCanClaimUnitagName } from 'wallet/src/feat
 import { parseUnitagErrorCode } from 'wallet/src/features/unitags/utils'
 import { useWalletSigners } from 'wallet/src/features/wallet/context'
 import { useAccount } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function ChangeUnitagModal({
   unitag,
@@ -38,7 +38,7 @@ export function ChangeUnitagModal({
   const { t } = useTranslation()
   const colors = useSporeColors()
   const navigation = useNavigation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { data: deviceId } = useAsyncData(getUniqueId)
   const account = useAccount(address)
   const signerManager = useWalletSigners()
diff --git a/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx b/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx
index a9782c14530..e36ee7f4070 100644
--- a/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx
+++ b/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx
@@ -2,7 +2,6 @@ import { useNavigation } from '@react-navigation/native'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActivityIndicator } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import { AlertTriangle } from 'ui/src/components/icons'
 import { fonts } from 'ui/src/theme'
@@ -17,6 +16,7 @@ import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { deleteUnitag } from 'wallet/src/features/unitags/api'
 import { useWalletSigners } from 'wallet/src/features/wallet/context'
 import { useAccount } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function DeleteUnitagModal({
   unitag,
@@ -30,7 +30,7 @@ export function DeleteUnitagModal({
   const { t } = useTranslation()
   const colors = useSporeColors()
   const navigation = useNavigation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { triggerRefetchUnitags } = useUnitagUpdater()
   const account = useAccount(address)
   const signerManager = useWalletSigners()
diff --git a/apps/mobile/src/components/unitags/UnitagBanner.tsx b/apps/mobile/src/components/unitags/UnitagBanner.tsx
index cc5efe4e0bb..8e10a952282 100644
--- a/apps/mobile/src/components/unitags/UnitagBanner.tsx
+++ b/apps/mobile/src/components/unitags/UnitagBanner.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { openModal } from 'src/features/modals/modalSlice'
 import { Flex, Image, Text, TouchableArea, TouchableAreaProps, useIsDarkMode, useIsShortMobileDevice } from 'ui/src'
@@ -30,7 +30,7 @@ export function UnitagBanner({
   compact?: boolean
   entryPoint: MobileScreens.Home | MobileScreens.Settings
 }): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const { fullWidth } = useDeviceDimensions()
   const isDarkMode = useIsDarkMode()
diff --git a/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx b/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
index c3e2def592b..2b2472893a3 100644
--- a/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
+++ b/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
@@ -2,8 +2,7 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
@@ -21,7 +20,7 @@ import { setHasCompletedUnitagsIntroModal } from 'wallet/src/features/behaviorHi
 export function UnitagsIntroModal(): JSX.Element {
   const { t } = useTranslation()
   const isDarkMode = useIsDarkMode()
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   const modalState = useAppSelector(selectModalState(ModalName.UnitagsIntro)).initialState
   const address = modalState?.address
   const entryPoint = modalState?.entryPoint
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext.tsx
deleted file mode 100644
index 6b43b191058..00000000000
--- a/apps/mobile/src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { PropsWithChildren, createContext, useCallback, useContext, useMemo, useState } from 'react'
-import { Keyboard } from 'react-native'
-import {
-  PasswordErrors,
-  PasswordStrength,
-  getPasswordStrength,
-  isPasswordStrongEnough,
-} from 'wallet/src/utils/password'
-
-export type CloudBackupPasswordFormContextType = {
-  password: string
-  passwordStrength: PasswordStrength
-  error: PasswordErrors | undefined
-  isConfirmation: boolean
-  isInputValid: boolean
-  onPressNext: () => void
-  onPasswordSubmitEditing: () => void
-  onPasswordChangeText: (newPassword: string) => void
-}
-
-export const CloudBackupPasswordFormContext = createContext<CloudBackupPasswordFormContextType | null>(null)
-
-export function useCloudBackupPasswordFormContext(): CloudBackupPasswordFormContextType {
-  const context = useContext(CloudBackupPasswordFormContext)
-
-  if (!context) {
-    throw new Error('useCloudBackupPasswordFormContext must be used within a CloudBackupPasswordFormContextProvider')
-  }
-
-  return context
-}
-
-type CloudBackupPasswordFormContextProviderProps = PropsWithChildren<{
-  isConfirmation?: boolean
-  passwordToConfirm?: string
-  navigateToNextScreen: ({ password }: { password: string }) => void
-}>
-
-export function CloudBackupPasswordFormContextProvider({
-  children,
-  isConfirmation = false,
-  passwordToConfirm,
-  navigateToNextScreen,
-}: CloudBackupPasswordFormContextProviderProps): JSX.Element {
-  const [password, setPassword] = useState('')
-  const [error, setError] = useState<PasswordErrors | undefined>(undefined)
-  const [passwordStrength, setPasswordStrength] = useState(PasswordStrength.NONE)
-
-  const isStrongPassword = isPasswordStrongEnough({
-    minStrength: PasswordStrength.MEDIUM,
-    currentStrength: passwordStrength,
-  })
-
-  const isInputValid = !error && password.length > 0 && (isConfirmation || isStrongPassword)
-
-  const onPasswordChangeText = useCallback(
-    (newPassword: string): void => {
-      if (isConfirmation && newPassword === password) {
-        setError(undefined)
-      }
-      // always reset error if not confirmation
-      if (!isConfirmation) {
-        setPasswordStrength(getPasswordStrength(newPassword))
-        setError(undefined)
-      }
-      setPassword(newPassword)
-    },
-    [isConfirmation, password],
-  )
-
-  const onPasswordSubmitEditing = useCallback((): void => {
-    if (!isConfirmation && !isStrongPassword) {
-      return
-    }
-    if (isConfirmation && passwordToConfirm !== password) {
-      setError(PasswordErrors.PasswordsDoNotMatch)
-      return
-    }
-    setError(undefined)
-    Keyboard.dismiss()
-  }, [isConfirmation, isStrongPassword, password, passwordToConfirm])
-
-  const onPressNext = useCallback((): void => {
-    if (isConfirmation && passwordToConfirm !== password) {
-      setError(PasswordErrors.PasswordsDoNotMatch)
-      return
-    }
-
-    if (!error) {
-      navigateToNextScreen({ password })
-    }
-  }, [error, isConfirmation, navigateToNextScreen, password, passwordToConfirm])
-
-  const contextValue = useMemo<CloudBackupPasswordFormContextType>(
-    () => ({
-      password,
-      passwordStrength,
-      error,
-      isConfirmation,
-      isInputValid,
-      onPressNext,
-      onPasswordChangeText,
-      onPasswordSubmitEditing,
-    }),
-    [
-      error,
-      passwordStrength,
-      isConfirmation,
-      isInputValid,
-      onPressNext,
-      onPasswordChangeText,
-      onPasswordSubmitEditing,
-      password,
-    ],
-  )
-
-  return (
-    <CloudBackupPasswordFormContext.Provider value={contextValue}>{children}</CloudBackupPasswordFormContext.Provider>
-  )
-}
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupForm/ContinueButton.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupForm/ContinueButton.tsx
deleted file mode 100644
index 19776aae667..00000000000
--- a/apps/mobile/src/features/CloudBackup/CloudBackupForm/ContinueButton.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { useCloudBackupPasswordFormContext } from 'src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext'
-import { Button } from 'ui/src'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
-
-export function ContinueButton(): JSX.Element {
-  const { isInputValid, onPressNext } = useCloudBackupPasswordFormContext()
-
-  const { t } = useTranslation()
-
-  return (
-    <Button disabled={!isInputValid} testID={TestID.Next} onPress={onPressNext}>
-      {t('common.button.continue')}
-    </Button>
-  )
-}
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupForm/PasswordInput.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupForm/PasswordInput.tsx
deleted file mode 100644
index 1726249dea1..00000000000
--- a/apps/mobile/src/features/CloudBackup/CloudBackupForm/PasswordInput.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-import { TextInput } from 'react-native'
-import { PasswordInput as Input } from 'src/components/input/PasswordInput'
-import { useCloudBackupPasswordFormContext } from 'src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext'
-import { PasswordError } from 'src/features/onboarding/PasswordError'
-import { Flex, Text } from 'ui/src'
-import { DiamondExclamation } from 'ui/src/components/icons'
-import { iconSizes } from 'ui/src/theme'
-import { useDebounce } from 'utilities/src/time/timing'
-import {
-  PASSWORD_VALIDATION_DEBOUNCE_MS,
-  PasswordErrors,
-  PasswordStrength,
-  getPasswordStrengthTextAndColor,
-} from 'wallet/src/utils/password'
-
-export function PasswordInput(): JSX.Element {
-  const { password, error, passwordStrength, isConfirmation, onPasswordChangeText, onPasswordSubmitEditing } =
-    useCloudBackupPasswordFormContext()
-  const debouncedPasswordStrength = useDebounce(passwordStrength, PASSWORD_VALIDATION_DEBOUNCE_MS)
-
-  const { t } = useTranslation()
-  const passwordInputRef = useRef<TextInput>(null)
-
-  let errorText = ''
-  if (error === PasswordErrors.PasswordsDoNotMatch) {
-    errorText = t('settings.setting.backup.password.error.mismatch')
-  } else if (error) {
-    // use the upstream zxcvbn error message
-    errorText = error
-  }
-
-  return (
-    <Flex gap="$spacing24" mb="$spacing24">
-      <Flex gap="$spacing8">
-        <Input
-          ref={passwordInputRef}
-          placeholder={
-            isConfirmation
-              ? t('settings.setting.backup.password.placeholder.confirm')
-              : t('settings.setting.backup.password.placeholder.create')
-          }
-          returnKeyType="next"
-          value={password}
-          onChangeText={(newText: string): void => {
-            onPasswordChangeText(newText)
-          }}
-          onSubmitEditing={onPasswordSubmitEditing}
-        />
-        {!isConfirmation && <PasswordStrengthText strength={debouncedPasswordStrength} />}
-        {error ? <PasswordError errorText={errorText} /> : null}
-      </Flex>
-      {!isConfirmation && (
-        <Flex centered row gap="$spacing12" px="$spacing16">
-          <DiamondExclamation color="$neutral2" size={iconSizes.icon20} />
-          <Text color="$neutral2" variant="body3">
-            {t('settings.setting.backup.password.disclaimer')}
-          </Text>
-        </Flex>
-      )}
-    </Flex>
-  )
-}
-
-function PasswordStrengthText({ strength }: { strength: PasswordStrength }): JSX.Element {
-  const { t } = useTranslation()
-  const { color } = getPasswordStrengthTextAndColor(strength)
-
-  const hasPassword = strength !== PasswordStrength.NONE
-  let strengthText: string = ''
-  switch (strength) {
-    case PasswordStrength.STRONG:
-      strengthText = t('settings.setting.backup.password.strong')
-      break
-    case PasswordStrength.MEDIUM:
-      strengthText = t('settings.setting.backup.password.medium')
-      break
-    case PasswordStrength.WEAK:
-      strengthText = t('settings.setting.backup.password.weak')
-      break
-    default:
-      break
-  }
-
-  return (
-    <Flex centered row opacity={hasPassword ? 1 : 0} pt="$spacing12" px="$spacing8">
-      <Text color={color} variant="body3">
-        {strengthText}
-      </Text>
-    </Flex>
-  )
-}
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupForm/index.ts b/apps/mobile/src/features/CloudBackup/CloudBackupForm/index.ts
deleted file mode 100644
index fa72f4b3769..00000000000
--- a/apps/mobile/src/features/CloudBackup/CloudBackupForm/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { CloudBackupPasswordFormContextProvider } from 'src/features/CloudBackup/CloudBackupForm/CloudBackupPasswordFormContext'
-import { ContinueButton } from 'src/features/CloudBackup/CloudBackupForm/ContinueButton'
-import { PasswordInput } from 'src/features/CloudBackup/CloudBackupForm/PasswordInput'
-
-export const CloudBackupPassword = {
-  PasswordInput,
-  ContinueButton,
-  FormProvider: CloudBackupPasswordFormContextProvider,
-}
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx
new file mode 100644
index 00000000000..6effc6f4d33
--- /dev/null
+++ b/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx
@@ -0,0 +1,155 @@
+import React, { useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Keyboard, TextInput } from 'react-native'
+import { PasswordInput } from 'src/components/input/PasswordInput'
+import { PasswordError } from 'src/features/onboarding/PasswordError'
+import { Button, Flex, Text } from 'ui/src'
+import { DiamondExclamation } from 'ui/src/components/icons'
+import { iconSizes } from 'ui/src/theme'
+import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { useDebounce } from 'utilities/src/time/timing'
+import {
+  PASSWORD_VALIDATION_DEBOUNCE_MS,
+  PasswordErrors,
+  PasswordStrength,
+  getPasswordStrength,
+  getPasswordStrengthTextAndColor,
+  isPasswordStrongEnough,
+} from 'wallet/src/utils/password'
+
+export type CloudBackupPasswordProps = {
+  navigateToNextScreen: ({ password }: { password: string }) => void
+  isConfirmation?: boolean
+  passwordToConfirm?: string
+}
+
+export function CloudBackupPasswordForm({
+  navigateToNextScreen,
+  isConfirmation,
+  passwordToConfirm,
+}: CloudBackupPasswordProps): JSX.Element {
+  const { t } = useTranslation()
+
+  const passwordInputRef = useRef<TextInput>(null)
+  const [password, setPassword] = useState('')
+
+  const [error, setError] = useState<PasswordErrors | undefined>(undefined)
+
+  const [passwordStrength, setPasswordStrength] = useState(PasswordStrength.NONE)
+  const debouncedPasswordStrength = useDebounce(passwordStrength, PASSWORD_VALIDATION_DEBOUNCE_MS)
+  const isStrongPassword = isPasswordStrongEnough({
+    minStrength: PasswordStrength.MEDIUM,
+    currentStrength: passwordStrength,
+  })
+
+  const isButtonDisabled = !!error || password.length === 0 || (!isConfirmation && !isStrongPassword)
+
+  const onPasswordChangeText = (newPassword: string): void => {
+    if (isConfirmation && newPassword === password) {
+      setError(undefined)
+    }
+    // always reset error if not confirmation
+    if (!isConfirmation) {
+      setPasswordStrength(getPasswordStrength(newPassword))
+      setError(undefined)
+    }
+    setPassword(newPassword)
+  }
+
+  const onPasswordSubmitEditing = (): void => {
+    if (!isConfirmation && !isStrongPassword) {
+      return
+    }
+    if (isConfirmation && passwordToConfirm !== password) {
+      setError(PasswordErrors.PasswordsDoNotMatch)
+      return
+    }
+    setError(undefined)
+    Keyboard.dismiss()
+  }
+
+  const onPressNext = (): void => {
+    if (isConfirmation && passwordToConfirm !== password) {
+      setError(PasswordErrors.PasswordsDoNotMatch)
+      return
+    }
+
+    if (!error) {
+      navigateToNextScreen({ password })
+    }
+  }
+
+  let errorText = ''
+  if (error === PasswordErrors.PasswordsDoNotMatch) {
+    errorText = t('settings.setting.backup.password.error.mismatch')
+  } else if (error) {
+    // use the upstream zxcvbn error message
+    errorText = error
+  }
+
+  return (
+    <>
+      <Flex gap="$spacing24" mb="$spacing24" mx="$spacing8">
+        <Flex gap="$spacing8">
+          <PasswordInput
+            ref={passwordInputRef}
+            placeholder={
+              isConfirmation
+                ? t('settings.setting.backup.password.placeholder.confirm')
+                : t('settings.setting.backup.password.placeholder.create')
+            }
+            returnKeyType="next"
+            value={password}
+            onChangeText={(newText: string): void => {
+              setError(undefined)
+              onPasswordChangeText(newText)
+            }}
+            onSubmitEditing={onPasswordSubmitEditing}
+          />
+          {!isConfirmation && <PasswordStrengthText strength={debouncedPasswordStrength} />}
+          {error ? <PasswordError errorText={errorText} /> : null}
+        </Flex>
+        {!isConfirmation && (
+          <Flex centered row gap="$spacing12" px="$spacing16">
+            <DiamondExclamation color="$neutral2" size={iconSizes.icon20} />
+            <Text color="$neutral2" variant="body3">
+              {t('settings.setting.backup.password.disclaimer')}
+            </Text>
+          </Flex>
+        )}
+      </Flex>
+      <Button disabled={isButtonDisabled} testID={TestID.Next} onPress={onPressNext}>
+        {t('common.button.continue')}
+      </Button>
+    </>
+  )
+}
+
+function PasswordStrengthText({ strength }: { strength: PasswordStrength }): JSX.Element {
+  const { t } = useTranslation()
+  const { color } = getPasswordStrengthTextAndColor(strength)
+
+  const hasPassword = strength !== PasswordStrength.NONE
+  let strengthText: string = ''
+  switch (strength) {
+    case PasswordStrength.STRONG:
+      strengthText = t('settings.setting.backup.password.strong')
+      break
+    case PasswordStrength.MEDIUM:
+      strengthText = t('settings.setting.backup.password.medium')
+      break
+    case PasswordStrength.WEAK:
+      strengthText = t('settings.setting.backup.password.weak')
+      break
+    default:
+      break
+  }
+
+  return (
+    <Flex centered row opacity={hasPassword ? 1 : 0} pt="$spacing12" px="$spacing8">
+      <Text color={color} variant="body3">
+        {strengthText}
+      </Text>
+    </Flex>
+  )
+}
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
index efab83194da..3396fbaa1f8 100644
--- a/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
+++ b/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
@@ -3,7 +3,6 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack'
 import React, { useCallback, useEffect, useReducer } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, Alert } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { OnboardingStackParamList, SettingsStackParamList } from 'src/app/navigation/types'
 import { backupMnemonicToCloudStorage } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
 import { Flex, Text } from 'ui/src'
@@ -18,6 +17,7 @@ import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingC
 import { EditAccountAction, editAccountActions } from 'wallet/src/features/wallet/accounts/editAccountSaga'
 import { AccountType, BackupType } from 'wallet/src/features/wallet/accounts/types'
 import { useSignerAccountIfExists } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 type Props = {
   accountAddress: Address
@@ -38,7 +38,7 @@ export function CloudBackupProcessingAnimation({
   navigation,
 }: Props): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { addBackupMethod, getImportedAccounts, getOnboardingAccount } = useOnboardingContext()
   const onboardingAccount = getOnboardingAccount()
   const importedAccounts = getImportedAccounts()
diff --git a/apps/mobile/src/features/appRating/saga.ts b/apps/mobile/src/features/appRating/saga.ts
index 3bd4a1e8de0..55a83635310 100644
--- a/apps/mobile/src/features/appRating/saga.ts
+++ b/apps/mobile/src/features/appRating/saga.ts
@@ -8,7 +8,6 @@ import { Statsig } from 'uniswap/src/features/gating/sdk/statsig'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import i18n from 'uniswap/src/i18n/i18n'
-import { openUri } from 'uniswap/src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { isAndroid } from 'utilities/src/platform'
 import { ONE_DAY_MS, ONE_SECOND_MS } from 'utilities/src/time/time'
@@ -17,6 +16,7 @@ import { TransactionStatus, TransactionType } from 'wallet/src/features/transact
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { setAppRating } from 'wallet/src/features/wallet/slice'
 import { appSelect } from 'wallet/src/state'
+import { openUri } from 'wallet/src/utils/linking'
 
 // at most once per reminder period (120 days)
 const MIN_PROMPT_REMINDER_MS = 120 * ONE_DAY_MS
diff --git a/apps/mobile/src/features/appRating/selectors.test.ts b/apps/mobile/src/features/appRating/selectors.test.ts
index f99afcd35c7..becc2b51cbe 100644
--- a/apps/mobile/src/features/appRating/selectors.test.ts
+++ b/apps/mobile/src/features/appRating/selectors.test.ts
@@ -1,7 +1,11 @@
 import { hasConsecutiveRecentSwapsSelector } from 'src/features/appRating/selectors'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { ONE_HOUR_MS, ONE_MINUTE_MS } from 'utilities/src/time/time'
-import { TransactionDetails, TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
+import {
+  TransactionDetails,
+  TransactionStatus,
+  TransactionType,
+} from 'wallet/src/features/transactions/types'
 import { RootState } from 'wallet/src/state'
 import { signerMnemonicAccount } from 'wallet/src/test/fixtures'
 import { preloadedWalletState } from 'wallet/src/test/fixtures/wallet/redux'
diff --git a/apps/mobile/src/features/dataApi/balances.test.ts b/apps/mobile/src/features/dataApi/balances.test.ts
index 0bb18abd31b..1e9d2ca605c 100644
--- a/apps/mobile/src/features/dataApi/balances.test.ts
+++ b/apps/mobile/src/features/dataApi/balances.test.ts
@@ -35,10 +35,10 @@ describe(useBalances, () => {
     const { resolvers } = queryResolvers({
       portfolios: () => [Portfolio],
     })
-    const { result } = renderHook(() => useBalances(balances.map(({ currencyInfo: { currencyId } }) => currencyId)), {
-      preloadedState,
-      resolvers,
-    })
+    const { result } = renderHook(
+      () => useBalances(balances.map(({ currencyInfo: { currencyId } }) => currencyId)),
+      { preloadedState, resolvers }
+    )
 
     await waitFor(() => {
       // The response contains only the first currency as the second one is not in the portfolio
diff --git a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
index bd95777755b..130001f2993 100644
--- a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
@@ -4,13 +4,13 @@ import { Alert } from 'react-native'
 import { URL } from 'react-native-url-polyfill'
 import { appSelect } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
-import { getScantasticQueryParams, parseScantasticParams } from 'src/components/Requests/ScanSheet/util'
+import { getScantasticQueryParams, parseScantasticParams } from 'src/components/WalletConnect/ScanSheet/util'
 import {
   UNISWAP_URL_SCHEME,
   UNISWAP_URL_SCHEME_WALLETCONNECT_AS_PARAM,
   UNISWAP_WALLETCONNECT_URL,
 } from 'src/features/deepLinking/constants'
-import { handleOnRampReturnLink } from 'src/features/deepLinking/handleOnRampReturnLinkSaga'
+import { handleMoonpayReturnLink } from 'src/features/deepLinking/handleMoonpayReturnLinkSaga'
 import { handleSwapLink } from 'src/features/deepLinking/handleSwapLinkSaga'
 import { handleTransactionLink } from 'src/features/deepLinking/handleTransactionLinkSaga'
 import { closeAllModals, openModal } from 'src/features/modals/modalSlice'
@@ -29,12 +29,11 @@ import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { ShareableEntity } from 'uniswap/src/types/sharing'
 import { WidgetType } from 'uniswap/src/types/widgets'
 import { buildCurrencyId, buildNativeCurrencyId } from 'uniswap/src/utils/currencyId'
-import { openUri } from 'uniswap/src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { ScantasticParams } from 'wallet/src/features/scantastic/types'
 import { selectAccounts, selectActiveAccount, selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
-import { UNISWAP_APP_NATIVE_TOKEN } from 'wallet/src/utils/linking'
+import { UNISWAP_APP_NATIVE_TOKEN, openUri } from 'wallet/src/utils/linking'
 
 export interface DeepLink {
   url: string
@@ -288,7 +287,7 @@ export function* handleDeepLink(action: ReturnType<typeof openDeepLink>) {
       switch (screen) {
         case 'transaction':
           if (fiatOnRamp) {
-            yield* call(handleOnRampReturnLink)
+            yield* call(handleMoonpayReturnLink)
           } else {
             yield* call(handleTransactionLink)
           }
diff --git a/apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.test.ts b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
similarity index 78%
rename from apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.test.ts
rename to apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
index 59d4de9cf4e..0ba9a9bdae3 100644
--- a/apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.test.ts
+++ b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
@@ -1,15 +1,15 @@
 import { call, put } from '@redux-saga/core/effects'
 import { expectSaga } from 'redux-saga-test-plan'
 import { navigate } from 'src/app/navigation/rootNavigation'
-import { handleOnRampReturnLink } from 'src/features/deepLinking/handleOnRampReturnLinkSaga'
+import { handleMoonpayReturnLink } from 'src/features/deepLinking/handleMoonpayReturnLinkSaga'
 import { HomeScreenTabIndex } from 'src/screens/HomeScreenTabIndex'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { forceFetchFiatOnRampTransactions } from 'wallet/src/features/transactions/slice'
 import { dismissInAppBrowser } from 'wallet/src/utils/linking'
 
-describe(handleOnRampReturnLink, () => {
-  it('Navigates to the home screen activity tab when coming back from on-ramp widget', () => {
-    return expectSaga(handleOnRampReturnLink)
+describe(handleMoonpayReturnLink, () => {
+  it('Navigates to the home screen activity tab when coming back from moonpay', () => {
+    return expectSaga(handleMoonpayReturnLink)
       .provide([
         [put(forceFetchFiatOnRampTransactions), undefined],
         [call(navigate, MobileScreens.Home, { tab: HomeScreenTabIndex.Activity }), undefined],
diff --git a/apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
similarity index 92%
rename from apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.ts
rename to apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
index 19c0a67eeb1..adbc437ebc9 100644
--- a/apps/mobile/src/features/deepLinking/handleOnRampReturnLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
@@ -5,7 +5,7 @@ import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { forceFetchFiatOnRampTransactions } from 'wallet/src/features/transactions/slice'
 import { dismissInAppBrowser } from 'wallet/src/utils/linking'
 
-export function* handleOnRampReturnLink() {
+export function* handleMoonpayReturnLink() {
   yield* put(forceFetchFiatOnRampTransactions())
   yield* call(navigate, MobileScreens.Home, { tab: HomeScreenTabIndex.Activity })
   yield* call(dismissInAppBrowser)
diff --git a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
index 47719d2e6e1..7a36fa7cbee 100644
--- a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
+++ b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
@@ -2,11 +2,14 @@ import { URL } from 'react-native-url-polyfill'
 import { expectSaga } from 'redux-saga-test-plan'
 import { handleSwapLink } from 'src/features/deepLinking/handleSwapLinkSaga'
 import { openModal } from 'src/features/modals/modalSlice'
-import { DAI, UNI } from 'uniswap/src/constants/tokens'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { DAI, UNI } from 'wallet/src/constants/tokens'
+import { AssetType } from 'wallet/src/entities/assets'
+import {
+  CurrencyField,
+  TransactionState,
+} from 'wallet/src/features/transactions/transactionState/types'
 import { signerMnemonicAccount } from 'wallet/src/test/fixtures'
 
 const account = signerMnemonicAccount()
@@ -17,7 +20,7 @@ const formSwapUrl = (
   inputAddress?: string,
   outputAddress?: string,
   currencyField?: string,
-  amount?: string,
+  amount?: string
 ): URL =>
   new URL(
     `https://uniswap.org/app?screen=swap
@@ -25,7 +28,7 @@ const formSwapUrl = (
 &inputCurrencyId=${chain}-${inputAddress}
 &outputCurrencyId=${chain}-${outputAddress}
 &currencyField=${currencyField}
-&amount=${amount}`.trim(),
+&amount=${amount}`.trim()
   )
 
 const formTransactionState = (
@@ -33,7 +36,7 @@ const formTransactionState = (
   inputAddress?: string,
   outputAddress?: string,
   currencyField?: string,
-  amount?: string,
+  amount?: string
 ): {
   input: {
     address: string | undefined
@@ -61,8 +64,8 @@ const formTransactionState = (
   exactCurrencyField: !currencyField
     ? currencyField
     : currencyField.toLowerCase() === 'output'
-      ? CurrencyField.OUTPUT
-      : CurrencyField.INPUT,
+    ? CurrencyField.OUTPUT
+    : CurrencyField.INPUT,
   exactAmountToken: amount,
 })
 
@@ -72,7 +75,7 @@ const swapUrl = formSwapUrl(
   DAI.address,
   UNI[UniverseChainId.Mainnet].address,
   'input',
-  '100',
+  '100'
 )
 
 const invalidOutputCurrencySwapUrl = formSwapUrl(
@@ -81,7 +84,7 @@ const invalidOutputCurrencySwapUrl = formSwapUrl(
   DAI.address,
   undefined,
   'input',
-  '100',
+  '100'
 )
 
 const invalidInputTokenSwapURl = formSwapUrl(
@@ -90,7 +93,7 @@ const invalidInputTokenSwapURl = formSwapUrl(
   '0x00',
   UNI[UniverseChainId.Mainnet].address,
   'input',
-  '100',
+  '100'
 )
 
 const invalidChainSwapUrl = formSwapUrl(
@@ -99,7 +102,7 @@ const invalidChainSwapUrl = formSwapUrl(
   DAI.address,
   UNI[UniverseChainId.Mainnet].address,
   'input',
-  '100',
+  '100'
 )
 
 const invalidAmountSwapUrl = formSwapUrl(
@@ -108,7 +111,7 @@ const invalidAmountSwapUrl = formSwapUrl(
   DAI.address,
   UNI[UniverseChainId.Mainnet].address,
   'input',
-  'not a number',
+  'not a number'
 )
 
 const invalidCurrencyFieldSwapUrl = formSwapUrl(
@@ -117,7 +120,7 @@ const invalidCurrencyFieldSwapUrl = formSwapUrl(
   DAI.address,
   UNI[UniverseChainId.Mainnet].address,
   'token1',
-  '100',
+  '100'
 )
 
 const swapFormState = formTransactionState(
@@ -125,7 +128,7 @@ const swapFormState = formTransactionState(
   DAI.address,
   UNI[UniverseChainId.Mainnet].address,
   'input',
-  '100',
+  '100'
 ) as TransactionState
 
 describe(handleSwapLink, () => {
diff --git a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
index 9a0eae1b405..263e70b6285 100644
--- a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
@@ -1,13 +1,13 @@
 import { BigNumber } from 'ethers'
 import { openModal } from 'src/features/modals/modalSlice'
 import { put } from 'typed-redux-saga'
-import { AssetType, CurrencyAsset } from 'uniswap/src/entities/assets'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WALLET_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
 import { getValidAddress } from 'uniswap/src/utils/addresses'
 import { currencyIdToAddress, currencyIdToChain } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
+import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 
 export function* handleSwapLink(url: URL) {
   try {
diff --git a/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx b/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
index 890af5e21bb..454b1fc4e03 100644
--- a/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
+++ b/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
@@ -3,7 +3,7 @@ import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent, Share } from 'react-native'
 import ContextMenu, { ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { TripleDot } from 'src/components/icons/TripleDot'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { Flex, HapticFeedback, TouchableArea } from 'ui/src'
@@ -16,12 +16,11 @@ import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { ShareableEntity } from 'uniswap/src/types/sharing'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
-import { openUri } from 'uniswap/src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
-import { ExplorerDataType, getExplorerLink, getProfileUrl } from 'wallet/src/utils/linking'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+import { ExplorerDataType, getExplorerLink, getProfileUrl, openUri } from 'wallet/src/utils/linking'
 
 type MenuAction = {
   title: string
@@ -31,7 +30,7 @@ type MenuAction = {
 
 export function ProfileContextMenu({ address }: { address: Address }): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { unitag } = useUnitagByAddress(address)
 
   const onPressCopyAddress = useCallback(async () => {
diff --git a/apps/mobile/src/features/externalProfile/ProfileHeader.tsx b/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
index 4aa3e5d963c..cf9c9644fd0 100644
--- a/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
+++ b/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
@@ -3,8 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { StatusBar, StyleSheet } from 'react-native'
 import { FadeIn } from 'react-native-reanimated'
 import Svg, { ClipPath, Defs, RadialGradient, Rect, Stop } from 'react-native-svg'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { BackButton } from 'src/components/buttons/BackButton'
 import { Favorite } from 'src/components/icons/Favorite'
 import { LongText } from 'src/components/text/LongText'
@@ -28,14 +27,14 @@ import { SendAction, XTwitter } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { iconSizes, imageSizes } from 'ui/src/theme'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
-import { openUri } from 'uniswap/src/utils/linking'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { useENSDescription, useENSName, useENSTwitterUsername } from 'wallet/src/features/ens/api'
 import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
 import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { openUri } from 'wallet/src/utils/linking'
 
 const HEADER_GRADIENT_HEIGHT = 144
 const HEADER_ICON_SIZE = 72
@@ -53,7 +52,7 @@ export const solidHeaderProps = {
 
 export const ProfileHeader = memo(function ProfileHeader({ address }: ProfileHeaderProps): JSX.Element {
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isDarkMode = useIsDarkMode()
   const isFavorited = useAppSelector(selectWatchedAddressSet).has(address)
 
diff --git a/apps/mobile/src/features/favorites/hooks.ts b/apps/mobile/src/features/favorites/hooks.ts
index 84135cebcb7..f5adf8d5cff 100644
--- a/apps/mobile/src/features/favorites/hooks.ts
+++ b/apps/mobile/src/features/favorites/hooks.ts
@@ -1,6 +1,5 @@
 import { useCallback, useMemo } from 'react'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { CurrencyId } from 'uniswap/src/types/currency'
@@ -16,7 +15,7 @@ import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { useDisplayName } from 'wallet/src/features/wallet/hooks'
 
 export function useToggleFavoriteCallback(id: CurrencyId, isFavoriteToken: boolean): () => void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const token = useCurrencyInfo(id)
 
   return useCallback(() => {
@@ -35,7 +34,7 @@ export function useToggleFavoriteCallback(id: CurrencyId, isFavoriteToken: boole
 }
 
 export function useToggleWatchedWalletCallback(address: Address): () => void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isFavoriteWallet = useAppSelector(selectWatchedAddressSet).has(address)
   const displayName = useDisplayName(address)
 
diff --git a/apps/mobile/src/features/fiatOnRamp/ExchangeTransferModal.tsx b/apps/mobile/src/features/fiatOnRamp/ExchangeTransferModal.tsx
index 9b6144524ca..fea6a94a538 100644
--- a/apps/mobile/src/features/fiatOnRamp/ExchangeTransferModal.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/ExchangeTransferModal.tsx
@@ -1,5 +1,4 @@
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
 import { ExchangeTransferConnecting } from 'src/screens/ExchangeTransferConnecting'
@@ -7,7 +6,7 @@ import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 
 export function ExchangeTransferModal(): JSX.Element | null {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const onClose = (): void => {
     dispatch(closeModal({ name: ModalName.ExchangeTransferModal }))
   }
diff --git a/apps/mobile/src/features/fiatOnRamp/ExchangeTransferServiceProviderSelector.tsx b/apps/mobile/src/features/fiatOnRamp/ExchangeTransferServiceProviderSelector.tsx
index 28e22caf474..7602f7aa6e0 100644
--- a/apps/mobile/src/features/fiatOnRamp/ExchangeTransferServiceProviderSelector.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/ExchangeTransferServiceProviderSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react'
 import { FlatList, ListRenderItemInfo } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
 import { Flex, ImpactFeedbackStyle, Text, TouchableArea, useIsDarkMode } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
@@ -68,7 +68,7 @@ export function ServiceProviderSelector({
   onClose: () => void
   serviceProviders: FORServiceProvider[]
 }): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const onSelectServiceProvider = useCallback(
     (serviceProvider: FORServiceProvider) => {
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx
index 70e5b50fde5..c2ca3fed935 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { FiatOnRampStackNavigator } from 'src/app/navigation/navigation'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { useSporeColors } from 'ui/src'
@@ -9,7 +9,7 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 export function FiatOnRampAggregatorModal(): JSX.Element {
   const colors = useSporeColors()
 
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const onClose = useCallback((): void => {
     dispatch(closeModal({ name: ModalName.FiatOnRampAggregator }))
   }, [dispatch])
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx
index 1f6ddd701e2..0a61d7d0dd1 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx
@@ -5,7 +5,12 @@ import React, { createContext, useContext, useState } from 'react'
 import { SectionListData } from 'react-native'
 import { getCountry } from 'react-native-localize'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { FORQuote, FiatCurrencyInfo, FiatOnRampCurrency } from 'uniswap/src/features/fiatOnRamp/types'
+import {
+  FORQuote,
+  FORServiceProvider,
+  FiatCurrencyInfo,
+  FiatOnRampCurrency,
+} from 'uniswap/src/features/fiatOnRamp/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
@@ -25,6 +30,8 @@ interface FiatOnRampContextType {
   setQuoteCurrency: (quoteCurrency: FiatOnRampCurrency) => void
   amount?: number
   setAmount: (amount: number | undefined) => void
+  serviceProviders?: FORServiceProvider[]
+  setServiceProviders: (serviceProviders: FORServiceProvider[] | undefined) => void
 }
 
 const initialState: FiatOnRampContextType = {
@@ -35,6 +42,7 @@ const initialState: FiatOnRampContextType = {
   setBaseCurrencyInfo: () => undefined,
   setQuoteCurrency: () => undefined,
   setAmount: () => undefined,
+  setServiceProviders: () => undefined,
   countryCode: '',
   countryState: undefined,
   quoteCurrency: { currencyInfo: undefined },
@@ -53,6 +61,7 @@ export function FiatOnRampProvider({ children }: { children: React.ReactNode }):
   const [countryState, setCountryState] = useState<string | undefined>()
   const [baseCurrencyInfo, setBaseCurrencyInfo] = useState<FiatCurrencyInfo>()
   const [amount, setAmount] = useState<number>()
+  const [serviceProviders, setServiceProviders] = useState<FORServiceProvider[]>()
 
   // We hardcode ETH as the starting currency
   const ethCurrencyInfo = useCurrencyInfo(
@@ -80,6 +89,8 @@ export function FiatOnRampProvider({ children }: { children: React.ReactNode }):
         setQuoteCurrency,
         amount,
         setAmount,
+        serviceProviders,
+        setServiceProviders,
       }}
     >
       {children}
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
index 4e817a492b7..c5aa0109170 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
@@ -1,7 +1,7 @@
 import { BottomSheetFlatList } from '@gorhom/bottom-sheet'
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, ListRenderItemInfo } from 'react-native'
+import { ListRenderItemInfo } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { SvgUri } from 'react-native-svg'
 import { Loader } from 'src/components/loading'
@@ -11,15 +11,15 @@ import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { fonts, iconSizes, spacing } from 'ui/src/theme'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { useBottomSheetFocusHook } from 'uniswap/src/components/modals/hooks'
 import { useFiatOnRampAggregatorCountryListQuery } from 'uniswap/src/features/fiatOnRamp/api'
 import { FOR_MODAL_SNAP_POINTS } from 'uniswap/src/features/fiatOnRamp/constants'
 import { FORCountry } from 'uniswap/src/features/fiatOnRamp/types'
 import { getCountryFlagSvgUrl } from 'uniswap/src/features/fiatOnRamp/utils'
-import { SearchTextInput } from 'uniswap/src/features/search/SearchTextInput'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { bubbleToTop } from 'utilities/src/primitives/array'
 import { useDebounce } from 'utilities/src/time/timing'
+import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
+import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
 
 const ICON_SIZE = 32 // design prefers a custom value here
 
@@ -86,7 +86,6 @@ function CountrySelectorContent({ onSelectCountry, countryCode }: CountrySelecto
         py="$spacing8"
         value={searchText}
         onChangeText={setSearchText}
-        onDismiss={() => Keyboard.dismiss()}
       />
       <Flex grow>
         <AnimatedFlex grow entering={FadeIn} exiting={FadeOut}>
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx
new file mode 100644
index 00000000000..6fa2ffc04ae
--- /dev/null
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx
@@ -0,0 +1,320 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { StyleSheet, TextInput } from 'react-native'
+import { FadeIn, FadeOut, FadeOutDown } from 'react-native-reanimated'
+import { useAppDispatch, useShouldShowNativeKeyboard } from 'src/app/hooks'
+import { FiatOnRampCtaButton } from 'src/components/fiatOnRamp/CtaButton'
+import { FiatOnRampAmountSection } from 'src/features/fiatOnRamp/FiatOnRampAmountSection'
+import { FiatOnRampTokenSelectorModal } from 'src/features/fiatOnRamp/FiatOnRampTokenSelector'
+import { useMoonpayFiatOnRamp, useMoonpaySupportedTokens } from 'src/features/fiatOnRamp/hooks'
+import { closeModal } from 'src/features/modals/modalSlice'
+import { Flex, Text, useDeviceInsets, useSporeColors } from 'ui/src'
+import MoonpayLogo from 'ui/src/assets/logos/svg/moonpay.svg'
+import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
+import { TextInputProps } from 'uniswap/src/components/input/TextInput'
+import { useBottomSheetContext } from 'uniswap/src/components/modals/BottomSheetContext'
+import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
+import { HandleBar } from 'uniswap/src/components/modals/HandleBar'
+import { getNativeAddress } from 'uniswap/src/constants/addresses'
+import { FiatOnRampConnectingView } from 'uniswap/src/features/fiatOnRamp/FiatOnRampConnectingView'
+import { ServiceProviderLogoStyles } from 'uniswap/src/features/fiatOnRamp/constants'
+import { FiatOnRampCurrency } from 'uniswap/src/features/fiatOnRamp/types'
+import { FiatOnRampEventName, ModalName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { UniverseEventProperties } from 'uniswap/src/features/telemetry/types'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
+import { NumberType } from 'utilities/src/format/types'
+import { useTimeout } from 'utilities/src/time/timing'
+import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
+import { useLocalFiatToUSDConverter } from 'wallet/src/features/fiatCurrency/hooks'
+import { useMoonpayFiatCurrencySupportInfo } from 'wallet/src/features/fiatOnRamp/hooks'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
+import { openUri } from 'wallet/src/utils/linking'
+
+const MOONPAY_UNSUPPORTED_REGION_HELP_URL =
+  'https://support.uniswap.org/hc/en-us/articles/11306664890381-Why-isn-t-MoonPay-available-in-my-region-'
+
+const PREDEFINED_AMOUNTS_SUPPORTED_CURRENCIES = ['USD', 'EUR', 'GBP', 'AUD', 'CAD', 'SGD']
+
+const CONNECTING_TIMEOUT = 2000
+
+export function FiatOnRampModal(): JSX.Element {
+  const colors = useSporeColors()
+
+  const dispatch = useAppDispatch()
+  const onClose = useCallback((): void => {
+    dispatch(closeModal({ name: ModalName.FiatOnRamp }))
+  }, [dispatch])
+
+  return (
+    <BottomSheetModal
+      fullScreen
+      hideHandlebar
+      hideKeyboardOnDismiss
+      renderBehindTopInset
+      backgroundColor={colors.surface1.get()}
+      name={ModalName.FiatOnRamp}
+      onClose={onClose}
+    >
+      <FiatOnRampContent onClose={onClose} />
+    </BottomSheetModal>
+  )
+}
+
+function FiatOnRampContent({ onClose }: { onClose: () => void }): JSX.Element {
+  const { t } = useTranslation()
+  const { formatNumberOrString } = useLocalizationContext()
+  const inputRef = useRef<TextInput>(null)
+
+  const { isSheetReady } = useBottomSheetContext()
+
+  const [showConnectingToMoonpayScreen, setShowConnectingToMoonpayScreen] = useState(false)
+
+  const { showNativeKeyboard, onDecimalPadLayout, isLayoutPending, onInputPanelLayout } = useShouldShowNativeKeyboard()
+
+  const [selection, setSelection] = useState<TextInputProps['selection']>()
+
+  const resetSelection = (start: number, end?: number): void => {
+    setSelection({ start, end: end ?? start })
+  }
+
+  const [value, setValue] = useState('')
+
+  // We hardcode ETH as the starting currency
+  const ethCurrencyInfo = useCurrencyInfo(
+    buildCurrencyId(UniverseChainId.Mainnet, getNativeAddress(UniverseChainId.Mainnet)),
+  )
+
+  const [currency, setCurrency] = useState<FiatOnRampCurrency>({
+    currencyInfo: ethCurrencyInfo,
+    moonpayCurrencyCode: 'eth',
+  })
+
+  const { appFiatCurrencySupportedInMoonpay, moonpaySupportedFiatCurrency } = useMoonpayFiatCurrencySupportInfo()
+
+  // We only support predefined amounts for certain currencies.
+  // If the user's app fiat currency is not supported in Moonpay,
+  // we fallback to USD (which does allow for predefined amounts)
+  const predefinedAmountsSupported =
+    PREDEFINED_AMOUNTS_SUPPORTED_CURRENCIES.includes(moonpaySupportedFiatCurrency.code) ||
+    !appFiatCurrencySupportedInMoonpay
+
+  // We might not have ethCurrencyInfo when this component is initially rendered.
+  // If `ethCurrencyInfo` becomes available later while currency.currencyInfo is still unset, we update the currency state accordingly.
+  useEffect(() => {
+    if (ethCurrencyInfo && !currency.currencyInfo) {
+      setCurrency({ ...currency, currencyInfo: ethCurrencyInfo })
+    }
+  }, [currency, currency.currencyInfo, ethCurrencyInfo])
+
+  const {
+    eligible,
+    quoteAmount,
+    isLoading,
+    isError,
+    externalTransactionId,
+    dispatchAddTransaction,
+    fiatOnRampHostUrl,
+    quoteCurrencyAmountReady,
+    quoteCurrencyAmountLoading,
+    errorText,
+    errorColor,
+  } = useMoonpayFiatOnRamp({
+    baseCurrencyAmount: value,
+    quoteCurrencyCode: currency.moonpayCurrencyCode,
+    quoteChainId: currency.currencyInfo?.currency.chainId ?? UniverseChainId.Mainnet,
+  })
+
+  useTimeout(
+    async () => {
+      if (fiatOnRampHostUrl) {
+        if (currency?.moonpayCurrencyCode) {
+          sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampWidgetOpened, {
+            externalTransactionId,
+            serviceProvider: 'MOONPAY',
+            fiatCurrency: moonpaySupportedFiatCurrency.code.toLowerCase(),
+            cryptoCurrency: currency.moonpayCurrencyCode.toLowerCase(),
+          })
+        }
+        await openUri(fiatOnRampHostUrl)
+        dispatchAddTransaction()
+        onClose()
+      }
+    },
+    // setTimeout would be called inside this hook, only when delay >= 0
+    showConnectingToMoonpayScreen ? CONNECTING_TIMEOUT : -1,
+  )
+
+  const buttonEnabled = !isLoading && (!eligible || (!isError && fiatOnRampHostUrl && quoteCurrencyAmountReady))
+
+  const fiatToUSDConverter = useLocalFiatToUSDConverter()
+
+  const onChangeValue =
+    (source: UniverseEventProperties[FiatOnRampEventName.FiatOnRampAmountEntered]['source']) =>
+    (newAmount: string): void => {
+      sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampAmountEntered, {
+        source,
+        amountUSD: fiatToUSDConverter(parseFloat(newAmount)),
+      })
+      setValue(newAmount)
+    }
+
+  const [showTokenSelector, setShowTokenSelector] = useState(false)
+
+  useEffect(() => {
+    if (showTokenSelector) {
+      // hide keyboard when user goes to token selector screen
+      inputRef.current?.blur()
+    } else if (showNativeKeyboard && eligible) {
+      // autofocus
+      inputRef.current?.focus()
+    }
+  }, [showNativeKeyboard, eligible, showTokenSelector])
+
+  const selectTokenLoading = quoteCurrencyAmountLoading && !errorText && !!value
+
+  const {
+    list: supportedTokensList,
+    loading: supportedTokensLoading,
+    error: supportedTokensError,
+    refetch: supportedTokensRefetch,
+  } = useMoonpaySupportedTokens()
+
+  const insets = useDeviceInsets()
+
+  const onSelectCurrency = (newCurrency: FiatOnRampCurrency): void => {
+    setCurrency(newCurrency)
+    setShowTokenSelector(false)
+    if (newCurrency.currencyInfo?.currency.symbol) {
+      sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampTokenSelected, {
+        token: newCurrency.currencyInfo.currency.symbol.toLowerCase(),
+      })
+    }
+  }
+
+  return (
+    <Flex grow pt={showConnectingToMoonpayScreen ? undefined : insets.top}>
+      {!showConnectingToMoonpayScreen && (
+        <AnimatedFlex row height="100%" pb="$spacing12">
+          {isSheetReady && (
+            <AnimatedFlex
+              entering={FadeIn}
+              exiting={FadeOut}
+              gap="$spacing16"
+              pb="$spacing16"
+              px="$spacing24"
+              width="100%"
+            >
+              <HandleBar backgroundColor="none" />
+              <Text variant="subheading1">{t('common.button.buy')}</Text>
+              <FiatOnRampAmountSection
+                appFiatCurrencySupported={appFiatCurrencySupportedInMoonpay}
+                currency={currency}
+                disabled={!eligible}
+                errorColor={errorColor}
+                errorText={errorText}
+                fiatCurrencyInfo={moonpaySupportedFiatCurrency}
+                inputRef={inputRef}
+                predefinedAmountsSupported={predefinedAmountsSupported}
+                quoteAmount={quoteAmount}
+                quoteCurrencyAmountReady={quoteCurrencyAmountReady}
+                selectTokenLoading={selectTokenLoading}
+                setSelection={setSelection}
+                showNativeKeyboard={showNativeKeyboard}
+                showSoftInputOnFocus={showNativeKeyboard}
+                value={value}
+                onChoosePredifendAmount={onChangeValue('chip')}
+                onEnterAmount={onChangeValue('textInput')}
+                onInputPanelLayout={onInputPanelLayout}
+                onTokenSelectorPress={(): void => {
+                  setShowTokenSelector(true)
+                }}
+              />
+              <AnimatedFlex
+                bottom={0}
+                exiting={FadeOutDown}
+                gap="$spacing8"
+                left={0}
+                opacity={isLayoutPending ? 0 : 1}
+                position="absolute"
+                px="$spacing24"
+                right={0}
+                onLayout={onDecimalPadLayout}
+              >
+                {!showNativeKeyboard && (
+                  <DecimalPadLegacy
+                    resetSelection={resetSelection}
+                    selection={selection}
+                    setValue={onChangeValue('textInput')}
+                    value={value}
+                  />
+                )}
+                <FiatOnRampCtaButton
+                  continueButtonText={
+                    appFiatCurrencySupportedInMoonpay
+                      ? t('fiatOnRamp.button.continueCheckout')
+                      : t('fiatOnRamp.checkout.button')
+                  }
+                  disabled={!buttonEnabled}
+                  eligible={eligible}
+                  isLoading={isLoading}
+                  onPress={async (): Promise<void> => {
+                    if (eligible) {
+                      setShowConnectingToMoonpayScreen(true)
+                    } else {
+                      await openUri(MOONPAY_UNSUPPORTED_REGION_HELP_URL)
+                    }
+                  }}
+                />
+              </AnimatedFlex>
+            </AnimatedFlex>
+          )}
+          {showTokenSelector && (
+            <FiatOnRampTokenSelectorModal
+              error={supportedTokensError}
+              list={supportedTokensList}
+              loading={supportedTokensLoading}
+              onClose={(): void => setShowTokenSelector(false)}
+              onRetry={supportedTokensRefetch}
+              onSelectCurrency={onSelectCurrency}
+            />
+          )}
+        </AnimatedFlex>
+      )}
+      {showConnectingToMoonpayScreen && (
+        <FiatOnRampConnectingView
+          amount={formatNumberOrString({
+            value,
+            type: NumberType.FiatTokenPrice,
+            currencyCode: moonpaySupportedFiatCurrency.code,
+          })}
+          quoteCurrencyCode={currency.currencyInfo?.currency.symbol}
+          serviceProviderLogo={
+            <Flex
+              alignItems="center"
+              borderRadius="$rounded20"
+              height={ServiceProviderLogoStyles.icon.height}
+              justifyContent="center"
+              style={styles.moonpayLogoWrapper}
+              width={ServiceProviderLogoStyles.icon.width}
+            >
+              <MoonpayLogo
+                height={ServiceProviderLogoStyles.icon.height}
+                width={ServiceProviderLogoStyles.icon.width}
+              />
+            </Flex>
+          }
+          serviceProviderName="MoonPay"
+        />
+      )}
+    </Flex>
+  )
+}
+
+const styles = StyleSheet.create({
+  moonpayLogoWrapper: {
+    backgroundColor: '#7D00FF',
+  },
+})
diff --git a/apps/mobile/src/features/fiatOnRamp/aggregatorHooks.ts b/apps/mobile/src/features/fiatOnRamp/aggregatorHooks.ts
new file mode 100644
index 00000000000..3f0e5e090f8
--- /dev/null
+++ b/apps/mobile/src/features/fiatOnRamp/aggregatorHooks.ts
@@ -0,0 +1,145 @@
+import { SerializedError } from '@reduxjs/toolkit'
+import { FetchBaseQueryError, skipToken } from '@reduxjs/toolkit/query/react'
+import { useTranslation } from 'react-i18next'
+import { Delay } from 'src/components/layout/Delayed'
+import { ColorTokens } from 'ui/src'
+import {
+  useFiatOnRampAggregatorCryptoQuoteQuery,
+  useFiatOnRampAggregatorSupportedFiatCurrenciesQuery,
+} from 'uniswap/src/features/fiatOnRamp/api'
+import { FORQuote, FORSupportedFiatCurrency, FiatCurrencyInfo } from 'uniswap/src/features/fiatOnRamp/types'
+import {
+  isFiatOnRampApiError,
+  isInvalidRequestAmountTooHigh,
+  isInvalidRequestAmountTooLow,
+} from 'uniswap/src/features/fiatOnRamp/utils'
+import { NumberType } from 'utilities/src/format/types'
+import { useDebounce } from 'utilities/src/time/timing'
+import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
+import { useAppFiatCurrencyInfo, useFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { useActiveAccountAddress } from 'wallet/src/features/wallet/hooks'
+
+export function useMeldFiatCurrencySupportInfo(countryCode: string): {
+  appFiatCurrencySupportedInMeld: boolean
+  meldSupportedFiatCurrency: FiatCurrencyInfo
+  supportedFiatCurrencies: FORSupportedFiatCurrency[] | undefined
+} {
+  // Not all the currencies are supported by Meld, so we need to fallback to USD if the currency is not supported
+  const appFiatCurrencyInfo = useAppFiatCurrencyInfo()
+  const fallbackCurrencyInfo = useFiatCurrencyInfo(FiatCurrency.UnitedStatesDollar)
+  const appFiatCurrencyCode = appFiatCurrencyInfo.code.toLowerCase()
+
+  const { data: supportedFiatCurrencies } = useFiatOnRampAggregatorSupportedFiatCurrenciesQuery({
+    countryCode,
+  })
+
+  const appFiatCurrencySupported =
+    !supportedFiatCurrencies ||
+    supportedFiatCurrencies.fiatCurrencies.some(
+      (currency): boolean => appFiatCurrencyCode === currency.fiatCurrencyCode.toLowerCase(),
+    )
+  const meldSupportedFiatCurrency = appFiatCurrencySupported ? appFiatCurrencyInfo : fallbackCurrencyInfo
+
+  return {
+    appFiatCurrencySupportedInMeld: appFiatCurrencySupported,
+    meldSupportedFiatCurrency,
+    supportedFiatCurrencies: supportedFiatCurrencies?.fiatCurrencies,
+  }
+}
+
+/**
+ * Hook to load quotes
+ */
+export function useFiatOnRampQuotes({
+  baseCurrencyAmount,
+  baseCurrencyCode,
+  quoteCurrencyCode,
+  countryCode,
+  countryState,
+}: {
+  baseCurrencyAmount?: number
+  baseCurrencyCode: string | undefined
+  quoteCurrencyCode: string | undefined
+  countryCode: string | undefined
+  countryState: string | undefined
+}): {
+  loading: boolean
+  error?: FetchBaseQueryError | SerializedError
+  quotes: FORQuote[] | undefined
+} {
+  const debouncedBaseCurrencyAmount = useDebounce(baseCurrencyAmount, Delay.Short)
+  const walletAddress = useActiveAccountAddress()
+
+  const {
+    currentData: quotesResponse,
+    isFetching: quotesFetching,
+    error: quotesError,
+  } = useFiatOnRampAggregatorCryptoQuoteQuery(
+    baseCurrencyAmount && countryCode && quoteCurrencyCode && baseCurrencyCode
+      ? {
+          sourceAmount: baseCurrencyAmount,
+          sourceCurrencyCode: baseCurrencyCode,
+          destinationCurrencyCode: quoteCurrencyCode,
+          countryCode,
+          walletAddress: walletAddress ?? '',
+          state: countryState,
+        }
+      : skipToken,
+    {
+      refetchOnMountOrArgChange: true,
+    },
+  )
+
+  const loading = quotesFetching || debouncedBaseCurrencyAmount !== baseCurrencyAmount
+
+  // if user is entering base amount -> ignore previous errors
+  const error = debouncedBaseCurrencyAmount !== baseCurrencyAmount ? undefined : quotesError
+
+  return {
+    loading,
+    error,
+    quotes: quotesResponse?.quotes ?? undefined,
+  }
+}
+
+export function useParseFiatOnRampError(
+  error: unknown,
+  currencyCode: string,
+): {
+  errorText: string | undefined
+  errorColor: ColorTokens | undefined
+} {
+  const { t } = useTranslation()
+  const { formatNumberOrString } = useLocalizationContext()
+
+  let errorText, errorColor: ColorTokens | undefined
+  if (!error) {
+    return { errorText, errorColor }
+  }
+
+  errorText = t('fiatOnRamp.error.default')
+  errorColor = '$DEP_accentWarning'
+
+  if (isFiatOnRampApiError(error)) {
+    if (isInvalidRequestAmountTooLow(error)) {
+      const formattedAmount = formatNumberOrString({
+        value: error.data.context.minimumAllowed,
+        type: NumberType.FiatStandard,
+        currencyCode,
+      })
+      errorText = t('fiatOnRamp.error.min', { amount: formattedAmount })
+      errorColor = '$statusCritical'
+    } else if (isInvalidRequestAmountTooHigh(error)) {
+      const formattedAmount = formatNumberOrString({
+        value: error.data.context.maximumAllowed,
+        type: NumberType.FiatStandard,
+        currencyCode,
+      })
+      errorText = t('fiatOnRamp.error.max', { amount: formattedAmount })
+      errorColor = '$statusCritical'
+    }
+  }
+
+  return { errorText, errorColor }
+}
diff --git a/apps/mobile/src/features/fiatOnRamp/hooks.ts b/apps/mobile/src/features/fiatOnRamp/hooks.ts
index f57fbf211c8..4e95e7d8a3b 100644
--- a/apps/mobile/src/features/fiatOnRamp/hooks.ts
+++ b/apps/mobile/src/features/fiatOnRamp/hooks.ts
@@ -1,39 +1,32 @@
-import { SerializedError } from '@reduxjs/toolkit'
-import { FetchBaseQueryError, skipToken } from '@reduxjs/toolkit/query/react'
+import { skipToken } from '@reduxjs/toolkit/query/react'
 import { Currency } from '@uniswap/sdk-core'
 import { useCallback, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { Delay } from 'src/components/layout/Delayed'
-import { ColorTokens } from 'ui/src'
-import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { ColorTokens, useSporeColors } from 'ui/src'
+import { BRIDGED_BASE_ADDRESSES } from 'uniswap/src/constants/addresses'
+import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { fromMoonpayNetwork, toSupportedChainId } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import {
-  useFiatOnRampAggregatorCryptoQuoteQuery,
-  useFiatOnRampAggregatorSupportedFiatCurrenciesQuery,
-  useFiatOnRampAggregatorSupportedTokensQuery,
-} from 'uniswap/src/features/fiatOnRamp/api'
-import {
-  FORQuote,
-  FORSupportedFiatCurrency,
-  FORSupportedToken,
-  FiatCurrencyInfo,
-  FiatOnRampCurrency,
-} from 'uniswap/src/features/fiatOnRamp/types'
-import {
-  createOnRampTransactionId,
-  isFiatOnRampApiError,
-  isInvalidRequestAmountTooHigh,
-  isInvalidRequestAmountTooLow,
-} from 'uniswap/src/features/fiatOnRamp/utils'
+import { useFiatOnRampAggregatorSupportedTokensQuery } from 'uniswap/src/features/fiatOnRamp/api'
+import { FORSupportedToken, FiatOnRampCurrency } from 'uniswap/src/features/fiatOnRamp/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
+import { areAddressesEqual } from 'uniswap/src/utils/addresses'
 import { buildCurrencyId, buildNativeCurrencyId } from 'uniswap/src/utils/currencyId'
-import { NumberType } from 'utilities/src/format/types'
+import { logger } from 'utilities/src/logger/logger'
 import { useDebounce } from 'utilities/src/time/timing'
-import { useCurrencies } from 'wallet/src/components/TokenSelector/hooks'
+import { useAllCommonBaseCurrencies, useCurrencies } from 'wallet/src/components/TokenSelector/hooks'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
-import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
-import { useAppFiatCurrencyInfo, useFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import {
+  useFiatOnRampBuyQuoteQuery,
+  useFiatOnRampIpAddressQuery,
+  useFiatOnRampLimitsQuery,
+  useFiatOnRampSupportedTokensQuery,
+  useFiatOnRampWidgetUrlQuery,
+} from 'wallet/src/features/fiatOnRamp/api'
+import { useMoonpayFiatCurrencySupportInfo } from 'wallet/src/features/fiatOnRamp/hooks'
+import { MoonpayCurrency } from 'wallet/src/features/fiatOnRamp/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { addTransaction } from 'wallet/src/features/transactions/slice'
 import {
@@ -42,10 +35,15 @@ import {
   TransactionStatus,
   TransactionType,
 } from 'wallet/src/features/transactions/types'
-import { useActiveAccountAddress } from 'wallet/src/features/wallet/hooks'
+import { createTransactionId } from 'wallet/src/features/transactions/utils'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { getFormattedCurrencyAmount } from 'wallet/src/utils/currency'
 import { ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
+const ETH_POLYGON_MOONPAY_CODE = 'eth_polygon'
+const WETH_POLYGON_MOONPAY_CODE = 'weth_polygon'
+const BNB_MAINNET_MOONPAY_CODE = 'bnb'
+
 export function useFormatExactCurrencyAmount(currencyAmount: string, currency: Maybe<Currency>): string | undefined {
   const formatter = useLocalizationContext()
 
@@ -63,15 +61,14 @@ export function useFormatExactCurrencyAmount(currencyAmount: string, currency: M
 export function useFiatOnRampTransactionCreator(
   ownerAddress: string,
   chainId: WalletChainId,
-  serviceProvider?: string,
   initialTypeInfo?: Partial<FiatPurchaseTransactionInfo>,
 ): {
   externalTransactionId: string
   dispatchAddTransaction: () => void
 } {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
-  const externalTransactionId = useRef(createOnRampTransactionId(serviceProvider))
+  const externalTransactionId = useRef(createTransactionId())
 
   const dispatchAddTransaction = useCallback(() => {
     // adds a dummy transaction detail for now
@@ -98,32 +95,195 @@ export function useFiatOnRampTransactionCreator(
   return { externalTransactionId: externalTransactionId.current, dispatchAddTransaction }
 }
 
-export function useMeldFiatCurrencySupportInfo(countryCode: string): {
-  appFiatCurrencySupportedInMeld: boolean
-  meldSupportedFiatCurrency: FiatCurrencyInfo
-  supportedFiatCurrencies: FORSupportedFiatCurrency[] | undefined
+const MOONPAY_FEES_INCLUDED = true
+
+/**
+ * Hook to provide data from Moonpay for Fiat On Ramp Input Amount screen.
+ */
+export function useMoonpayFiatOnRamp({
+  baseCurrencyAmount,
+  quoteCurrencyCode,
+  quoteChainId,
+}: {
+  baseCurrencyAmount: string
+  quoteCurrencyCode: string | undefined
+  quoteChainId: WalletChainId
+}): {
+  eligible: boolean
+  quoteAmount: number
+  quoteCurrencyAmountReady: boolean
+  quoteCurrencyAmountLoading: boolean
+  isLoading: boolean
+  externalTransactionId: string
+  dispatchAddTransaction: () => void
+  fiatOnRampHostUrl?: string
+  isError: boolean
+  errorText?: string
+  errorColor?: ColorTokens
 } {
-  // Not all the currencies are supported by Meld, so we need to fallback to USD if the currency is not supported
-  const appFiatCurrencyInfo = useAppFiatCurrencyInfo()
-  const fallbackCurrencyInfo = useFiatCurrencyInfo(FiatCurrency.UnitedStatesDollar)
-  const appFiatCurrencyCode = appFiatCurrencyInfo.code.toLowerCase()
+  const colors = useSporeColors()
+
+  const debouncedBaseCurrencyAmount = useDebounce(baseCurrencyAmount, Delay.Short)
+
+  // we can consider adding `ownerAddress` as a prop to this modal in the future
+  // for now, always assume the user wants to fund the current account
+  const activeAccountAddress = useActiveAccountAddressWithThrow()
+
+  const { externalTransactionId, dispatchAddTransaction } = useFiatOnRampTransactionCreator(
+    activeAccountAddress,
+    quoteChainId,
+  )
+
+  const { moonpaySupportedFiatCurrency: baseCurrency } = useMoonpayFiatCurrencySupportInfo()
+  const baseCurrencyCode = baseCurrency.code.toLowerCase()
+  const baseCurrencySymbol = baseCurrency.symbol
+
+  const {
+    data: limitsData,
+    isLoading: limitsLoading,
+    isError: limitsLoadingQueryError,
+  } = useFiatOnRampLimitsQuery(
+    quoteCurrencyCode
+      ? {
+          baseCurrencyCode,
+          quoteCurrencyCode,
+          areFeesIncluded: MOONPAY_FEES_INCLUDED,
+        }
+      : skipToken,
+  )
+
+  const { maxBuyAmount } = limitsData?.baseCurrency ?? {
+    maxBuyAmount: Infinity,
+  }
+
+  // we're adding +1 here because MoonPay API is not precise with limits
+  // and an actual lower limit is a bit above the number, they provide in limits api
+  const minBuyAmount = limitsData?.baseCurrency?.minBuyAmount ? limitsData.baseCurrency.minBuyAmount + 1 : 0
+
+  const parsedBaseCurrencyAmount = parseFloat(baseCurrencyAmount)
+  const amountIsTooSmall = parsedBaseCurrencyAmount < minBuyAmount
+  const amountIsTooLarge = parsedBaseCurrencyAmount > maxBuyAmount
+  const isBaseCurrencyAmountValid = !!parsedBaseCurrencyAmount && !amountIsTooSmall && !amountIsTooLarge
+
+  const {
+    data: fiatOnRampHostUrl,
+    isError: isWidgetUrlQueryError,
+    isLoading: isWidgetUrlLoading,
+  } = useFiatOnRampWidgetUrlQuery(
+    // PERF: could consider skipping this call until eligibility in determined (ux tradeoffs)
+    // as-is, avoids waterfalling requests => better ux
+    quoteCurrencyCode
+      ? {
+          ownerAddress: activeAccountAddress,
+          colorCode: colors.accent1.val,
+          externalTransactionId,
+          amount: baseCurrencyAmount,
+          currencyCode: quoteCurrencyCode,
+          baseCurrencyCode,
+          redirectUrl: `${uniswapUrls.redirectUrlBase}/?screen=transaction&fiatOnRamp=true&userAddress=${activeAccountAddress}`,
+        }
+      : skipToken,
+  )
+  const {
+    data: buyQuote,
+    isFetching: buyQuoteLoading,
+    isError: buyQuoteLoadingQueryError,
+  } = useFiatOnRampBuyQuoteQuery(
+    // When isBaseCurrencyAmountValid is false and the user enters any digit,
+    // isBaseCurrencyAmountValid becomes true. Since there were no prior calls to the API,
+    // it takes the debouncedBaseCurrencyAmount and immediately calls an API.
+    // This only truly matters in the beginning and in cases where the debouncedBaseCurrencyAmount
+    // is changed while isBaseCurrencyAmountValid is false."
+    quoteCurrencyCode && isBaseCurrencyAmountValid && debouncedBaseCurrencyAmount === baseCurrencyAmount
+      ? {
+          baseCurrencyCode,
+          baseCurrencyAmount: debouncedBaseCurrencyAmount,
+          quoteCurrencyCode,
+          areFeesIncluded: MOONPAY_FEES_INCLUDED,
+        }
+      : skipToken,
+  )
 
-  const { data: supportedFiatCurrencies } = useFiatOnRampAggregatorSupportedFiatCurrenciesQuery({
-    countryCode,
+  const quoteAmount = buyQuote?.quoteCurrencyAmount ?? 0
+
+  const {
+    data: ipAddressData,
+    isLoading: isEligibleLoading,
+    isError: isFiatBuyAllowedQueryError,
+  } = useFiatOnRampIpAddressQuery()
+
+  const eligible = Boolean(ipAddressData?.isBuyAllowed)
+
+  const isLoading = isEligibleLoading || isWidgetUrlLoading
+  const isError =
+    isFiatBuyAllowedQueryError || isWidgetUrlQueryError || buyQuoteLoadingQueryError || limitsLoadingQueryError
+
+  const quoteCurrencyAmountLoading =
+    buyQuoteLoading || limitsLoading || debouncedBaseCurrencyAmount !== baseCurrencyAmount
+
+  const quoteCurrencyAmountReady = isBaseCurrencyAmountValid && !quoteCurrencyAmountLoading
+
+  const { addFiatSymbolToNumber } = useLocalizationContext()
+  const minBuyAmountWithFiatSymbol = addFiatSymbolToNumber({
+    value: minBuyAmount,
+    currencyCode: baseCurrencyCode,
+    currencySymbol: baseCurrencySymbol,
+  })
+  const maxBuyAmountWithFiatSymbol = addFiatSymbolToNumber({
+    value: maxBuyAmount,
+    currencyCode: baseCurrencyCode,
+    currencySymbol: baseCurrencySymbol,
   })
 
-  const appFiatCurrencySupported =
-    !supportedFiatCurrencies ||
-    supportedFiatCurrencies.fiatCurrencies.some(
-      (currency): boolean => appFiatCurrencyCode === currency.fiatCurrencyCode.toLowerCase(),
-    )
-  const meldSupportedFiatCurrency = appFiatCurrencySupported ? appFiatCurrencyInfo : fallbackCurrencyInfo
+  const { errorText, errorColor } = useMoonpayError(
+    isError,
+    amountIsTooSmall,
+    amountIsTooLarge,
+    minBuyAmountWithFiatSymbol,
+    maxBuyAmountWithFiatSymbol,
+  )
 
   return {
-    appFiatCurrencySupportedInMeld: appFiatCurrencySupported,
-    meldSupportedFiatCurrency,
-    supportedFiatCurrencies: supportedFiatCurrencies?.fiatCurrencies,
+    eligible,
+    quoteAmount,
+    quoteCurrencyAmountReady,
+    quoteCurrencyAmountLoading,
+    isLoading,
+    externalTransactionId,
+    dispatchAddTransaction,
+    fiatOnRampHostUrl,
+    isError,
+    errorText,
+    errorColor,
+  }
+}
+
+function useMoonpayError(
+  hasError: boolean,
+  amountIsTooSmall: boolean,
+  amountIsTooLarge: boolean,
+  minBuyAmountWithFiatSymbol: string,
+  maxBuyAmountWithFiatSymbol: string,
+): {
+  errorText: string | undefined
+  errorColor: ColorTokens | undefined
+} {
+  const { t } = useTranslation()
+
+  let errorText, errorColor: ColorTokens | undefined
+
+  if (hasError) {
+    errorText = t('fiatOnRamp.error.default')
+    errorColor = '$DEP_accentWarning'
+  } else if (amountIsTooSmall) {
+    errorText = t('fiatOnRamp.error.min', { amount: minBuyAmountWithFiatSymbol })
+    errorColor = '$statusCritical'
+  } else if (amountIsTooLarge) {
+    errorText = t('fiatOnRamp.error.max', { amount: maxBuyAmountWithFiatSymbol })
+    errorColor = '$statusCritical'
   }
+
+  return { errorText, errorColor }
 }
 
 function findTokenOptionForFiatOnRampToken(
@@ -141,6 +301,42 @@ function findTokenOptionForFiatOnRampToken(
   })
 }
 
+function findTokenOptionForMoonpayCurrency(
+  commonBaseCurrencies: CurrencyInfo[] | undefined = [],
+  moonpayCurrency: MoonpayCurrency,
+): Maybe<CurrencyInfo> {
+  const currencyInfo = commonBaseCurrencies.find((item) => {
+    // Moonpay uses WETH on Polygon to represent ETH on Polygon
+    const moonpayCurrencyCode =
+      moonpayCurrency.code === ETH_POLYGON_MOONPAY_CODE ? WETH_POLYGON_MOONPAY_CODE : moonpayCurrency.code
+    const [tokenSymbol, network] = moonpayCurrencyCode.split('_')
+    const chainId = fromMoonpayNetwork(network)
+    return (
+      item &&
+      tokenSymbol &&
+      tokenSymbol.toLowerCase() === item.currency.symbol?.toLowerCase() &&
+      chainId === item.currency.chainId
+    )
+  })
+  if (
+    !currencyInfo &&
+    !BRIDGED_BASE_ADDRESSES.find((bridgedAddress) =>
+      areAddressesEqual(bridgedAddress, moonpayCurrency.metadata?.contractAddress),
+    ) &&
+    // We do not support BNB onboarding and Moonpay does not return an address for it so map it manually
+    moonpayCurrency.code !== BNB_MAINNET_MOONPAY_CODE
+  ) {
+    logger.error(`Moonpay currency ${moonpayCurrency.code} cannot be mapped`, {
+      tags: { file: 'fiatOnRamp/hooks', function: 'useMoonpaySupportedTokens' },
+      extra: {
+        chainId: moonpayCurrency.metadata?.chainId,
+        address: moonpayCurrency.metadata?.contractAddress,
+      },
+    })
+  }
+  return currencyInfo
+}
+
 function buildCurrencyIdForFORSupportedToken(supportedToken: FORSupportedToken): string | undefined {
   const chainId = toSupportedChainId(supportedToken.chainId)
   return chainId
@@ -209,98 +405,66 @@ export function useFiatOnRampSupportedTokens({
   return { list, loading, error, refetch }
 }
 
-/**
- * Hook to load quotes
- */
-export function useFiatOnRampQuotes({
-  baseCurrencyAmount,
-  baseCurrencyCode,
-  quoteCurrencyCode,
-  countryCode,
-  countryState,
-}: {
-  baseCurrencyAmount?: number
-  baseCurrencyCode: string | undefined
-  quoteCurrencyCode: string | undefined
-  countryCode: string | undefined
-  countryState: string | undefined
-}): {
+export function useMoonpaySupportedTokens(): {
+  error: boolean
+  list: FiatOnRampCurrency[] | undefined
   loading: boolean
-  error?: FetchBaseQueryError | SerializedError
-  quotes: FORQuote[] | undefined
+  refetch: () => void
 } {
-  const debouncedBaseCurrencyAmount = useDebounce(baseCurrencyAmount, Delay.Short)
-  const walletAddress = useActiveAccountAddress()
+  // this should be already cached by the time we need it
+  const {
+    data: ipAddressData,
+    isLoading: ipAddressLoading,
+    isError: ipAddressError,
+    refetch: refetchIpAddress,
+  } = useFiatOnRampIpAddressQuery()
 
   const {
-    currentData: quotesResponse,
-    isFetching: quotesFetching,
-    error: quotesError,
-  } = useFiatOnRampAggregatorCryptoQuoteQuery(
-    baseCurrencyAmount && countryCode && quoteCurrencyCode && baseCurrencyCode
-      ? {
-          sourceAmount: baseCurrencyAmount,
-          sourceCurrencyCode: baseCurrencyCode,
-          destinationCurrencyCode: quoteCurrencyCode,
-          countryCode,
-          walletAddress: walletAddress ?? undefined,
-          state: countryState,
-        }
-      : skipToken,
+    data: supportedTokens,
+    isLoading: supportedTokensLoading,
+    isError: supportedTokensError,
+    refetch: refetchSupportedTokens,
+  } = useFiatOnRampSupportedTokensQuery(
     {
-      refetchOnMountOrArgChange: true,
+      isUserInUS: ipAddressData?.alpha3 === 'USA' ?? false,
+      stateInUS: ipAddressData?.state,
     },
+    { skip: !ipAddressData },
   )
 
-  const loading = quotesFetching || debouncedBaseCurrencyAmount !== baseCurrencyAmount
-
-  // if user is entering base amount -> ignore previous errors
-  const error = debouncedBaseCurrencyAmount !== baseCurrencyAmount ? undefined : quotesError
-
-  return {
-    loading,
-    error,
-    quotes: quotesResponse?.quotes ?? undefined,
-  }
-}
+  const {
+    data: commonBaseCurrencies,
+    error: commonBaseCurrenciesError,
+    loading: commonBaseCurrenciesLoading,
+    refetch: refetchCommonBaseCurrencies,
+  } = useAllCommonBaseCurrencies()
 
-export function useParseFiatOnRampError(
-  error: unknown,
-  currencyCode: string,
-): {
-  errorText: string | undefined
-  errorColor: ColorTokens | undefined
-} {
-  const { t } = useTranslation()
-  const { formatNumberOrString } = useLocalizationContext()
+  const list = useMemo(() => {
+    if (!commonBaseCurrencies || !supportedTokens) {
+      return undefined
+    }
 
-  let errorText, errorColor: ColorTokens | undefined
-  if (!error) {
-    return { errorText, errorColor }
-  }
+    return supportedTokens
+      .map((fiatOnRampToken) => ({
+        currencyInfo: findTokenOptionForMoonpayCurrency(commonBaseCurrencies, fiatOnRampToken),
+        moonpayCurrencyCode: fiatOnRampToken.code,
+      }))
+      .filter((item) => !!item.currencyInfo)
+  }, [commonBaseCurrencies, supportedTokens])
 
-  errorText = t('fiatOnRamp.error.default')
-  errorColor = '$DEP_accentWarning'
-
-  if (isFiatOnRampApiError(error)) {
-    if (isInvalidRequestAmountTooLow(error)) {
-      const formattedAmount = formatNumberOrString({
-        value: error.data.context.minimumAllowed,
-        type: NumberType.FiatStandard,
-        currencyCode,
-      })
-      errorText = t('fiatOnRamp.error.min', { amount: formattedAmount })
-      errorColor = '$statusCritical'
-    } else if (isInvalidRequestAmountTooHigh(error)) {
-      const formattedAmount = formatNumberOrString({
-        value: error.data.context.maximumAllowed,
-        type: NumberType.FiatStandard,
-        currencyCode,
-      })
-      errorText = t('fiatOnRamp.error.max', { amount: formattedAmount })
-      errorColor = '$statusCritical'
+  const loading = ipAddressLoading || supportedTokensLoading || commonBaseCurrenciesLoading
+  const error = Boolean(ipAddressError || supportedTokensError || commonBaseCurrenciesError)
+  const refetch = async (): Promise<void> => {
+    if (ipAddressError) {
+      await refetchIpAddress()
+    }
+    if (supportedTokensError) {
+      await refetchSupportedTokens()
+    }
+    if (commonBaseCurrenciesError) {
+      refetchCommonBaseCurrencies?.()
     }
   }
 
-  return { errorText, errorColor }
+  return { list, loading, error, refetch }
 }
diff --git a/apps/mobile/src/features/import/GenericImportForm.tsx b/apps/mobile/src/features/import/GenericImportForm.tsx
index ecad2210b2e..f0bbcac38cf 100644
--- a/apps/mobile/src/features/import/GenericImportForm.tsx
+++ b/apps/mobile/src/features/import/GenericImportForm.tsx
@@ -3,9 +3,9 @@ import { Keyboard, TextInput as NativeTextInput } from 'react-native'
 import InputWithSuffix from 'src/features/import/InputWithSuffix'
 import { Flex, Text, useMedia } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import PasteButton from 'uniswap/src/components/buttons/PasteButton'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { SectionName } from 'uniswap/src/features/telemetry/constants'
+import PasteButton from 'wallet/src/components/buttons/PasteButton'
 
 interface Props {
   value: string | undefined
diff --git a/apps/mobile/src/features/modals/ModalsState.ts b/apps/mobile/src/features/modals/ModalsState.ts
index f058dd00980..631020b404b 100644
--- a/apps/mobile/src/features/modals/ModalsState.ts
+++ b/apps/mobile/src/features/modals/ModalsState.ts
@@ -4,9 +4,9 @@ import { ScantasticModalState } from 'src/features/scantastic/ScantasticModalSta
 import { ReceiveCryptoModalState } from 'src/screens/ReceiveCryptoModalState'
 import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 
 export interface AppModalState<T> {
   isOpen: boolean
@@ -21,6 +21,7 @@ export interface ModalsState {
   [ModalName.Experiments]: AppModalState<undefined>
   [ModalName.Explore]: AppModalState<ExploreModalState>
   [ModalName.FiatCurrencySelector]: AppModalState<undefined>
+  [ModalName.FiatOnRamp]: AppModalState<undefined>
   [ModalName.FiatOnRampAggregator]: AppModalState<undefined>
   [ModalName.ReceiveCryptoModal]: AppModalState<ReceiveCryptoModalState>
   [ModalName.LanguageSelector]: AppModalState<undefined>
diff --git a/apps/mobile/src/features/modals/modalSlice.test.ts b/apps/mobile/src/features/modals/modalSlice.test.ts
index 5bd984a145a..ae3f49dd86c 100644
--- a/apps/mobile/src/features/modals/modalSlice.test.ts
+++ b/apps/mobile/src/features/modals/modalSlice.test.ts
@@ -1,5 +1,10 @@
 import { createStore, Store } from '@reduxjs/toolkit'
-import { closeModal, initialModalsState, modalsReducer, openModal } from 'src/features/modals/modalSlice'
+import {
+  closeModal,
+  initialModalsState,
+  modalsReducer,
+  openModal,
+} from 'src/features/modals/modalSlice'
 import { ModalsState } from 'src/features/modals/ModalsState'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
diff --git a/apps/mobile/src/features/modals/modalSlice.ts b/apps/mobile/src/features/modals/modalSlice.ts
index 239333724e4..a3bd0aeb0bb 100644
--- a/apps/mobile/src/features/modals/modalSlice.ts
+++ b/apps/mobile/src/features/modals/modalSlice.ts
@@ -6,10 +6,10 @@ import { ModalsState } from 'src/features/modals/ModalsState'
 import { ScantasticModalState } from 'src/features/scantastic/ScantasticModalState'
 import { ReceiveCryptoModalState } from 'src/screens/ReceiveCryptoModalState'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { getKeys } from 'utilities/src/primitives/objects'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 
 type AccountSwitcherModalParams = {
   name: typeof ModalName.AccountSwitcher
@@ -33,6 +33,8 @@ type FiatCurrencySelectorParams = {
   initialState?: undefined
 }
 
+type FiatOnRampModalParams = { name: typeof ModalName.FiatOnRamp; initialState?: undefined }
+
 type FiatOnRampAggregatorModalParams = {
   name: typeof ModalName.FiatOnRampAggregator
   initialState?: undefined
@@ -85,6 +87,7 @@ export type OpenModalParams =
   | ExperimentsModalParams
   | ExploreModalParams
   | FiatCurrencySelectorParams
+  | FiatOnRampModalParams
   | FiatOnRampAggregatorModalParams
   | ReceiveCryptoModalParams
   | LanguageSelectorModalParams
@@ -104,6 +107,10 @@ export const initialModalsState: ModalsState = {
     isOpen: false,
     initialState: undefined,
   },
+  [ModalName.FiatOnRamp]: {
+    isOpen: false,
+    initialState: undefined,
+  },
   [ModalName.FiatOnRampAggregator]: {
     isOpen: false,
     initialState: undefined,
diff --git a/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx b/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
index 8a83ff92dae..fac0a475acd 100644
--- a/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
+++ b/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
@@ -10,9 +10,8 @@ import { iconSizes, spacing } from 'ui/src/theme'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { ShareableEntity } from 'uniswap/src/types/sharing'
-import { openUri } from 'uniswap/src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
-import { getNftCollectionUrl, getTwitterLink } from 'wallet/src/utils/linking'
+import { getNftCollectionUrl, getTwitterLink, openUri } from 'wallet/src/utils/linking'
 
 type MenuOption = {
   title: string
diff --git a/apps/mobile/src/features/notifications/WCNotification.tsx b/apps/mobile/src/features/notifications/WCNotification.tsx
index 47087843a09..08323eb11ce 100644
--- a/apps/mobile/src/features/notifications/WCNotification.tsx
+++ b/apps/mobile/src/features/notifications/WCNotification.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
 import { iconSizes } from 'ui/src/theme'
 import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
@@ -14,7 +14,7 @@ import { formWCNotificationTitle } from 'wallet/src/features/notifications/utils
 
 export function WCNotification({ notification }: { notification: WalletConnectNotification }): JSX.Element {
   const { imageUrl, chainId, address, event, hideDelay, dappName } = notification
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const validChainId = toSupportedChainId(chainId)
   const title = formWCNotificationTitle(notification)
 
diff --git a/apps/mobile/src/features/onboarding/OnboardingScreen.tsx b/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
index 0b9b8714bf2..21851e05e12 100644
--- a/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
+++ b/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
@@ -1,10 +1,7 @@
-import { useFocusEffect } from '@react-navigation/core'
 import { useHeaderHeight } from '@react-navigation/elements'
-import React, { PropsWithChildren, useCallback } from 'react'
-import { BackHandler, KeyboardAvoidingView, StyleSheet } from 'react-native'
+import React, { PropsWithChildren } from 'react'
+import { KeyboardAvoidingView, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { renderHeaderBackButton } from 'src/app/navigation/components'
-import { useOnboardingStackNavigation } from 'src/app/navigation/types'
 import { SHORT_SCREEN_HEADER_HEIGHT_RATIO, Screen } from 'src/components/layout/Screen'
 import { Flex, SpaceTokens, Text, useDeviceInsets, useMedia } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
@@ -17,7 +14,6 @@ type OnboardingScreenProps = {
   paddingTop?: SpaceTokens
   childrenGap?: SpaceTokens
   keyboardAvoidingViewEnabled?: boolean
-  disableGoBack?: boolean
 }
 
 export function OnboardingScreen({
@@ -26,29 +22,13 @@ export function OnboardingScreen({
   children,
   paddingTop = '$none',
   keyboardAvoidingViewEnabled = true,
-  disableGoBack = false,
 }: PropsWithChildren<OnboardingScreenProps>): JSX.Element {
-  const navigation = useOnboardingStackNavigation()
   const headerHeight = useHeaderHeight()
   const insets = useDeviceInsets()
   const media = useMedia()
 
   const gapSize = media.short ? '$none' : '$spacing16'
 
-  useFocusEffect(
-    useCallback(() => {
-      navigation.setOptions({
-        headerLeft: disableGoBack ? (): null => null : renderHeaderBackButton,
-        gestureEnabled: !disableGoBack,
-      })
-      const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
-        return disableGoBack
-      })
-
-      return subscription.remove
-    }, [navigation, disableGoBack]),
-  )
-
   return (
     <Screen
       $short={{ pt: headerHeight * SHORT_SCREEN_HEADER_HEIGHT_RATIO }}
diff --git a/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx b/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
index f2103b1c23d..a72a74bf2f7 100644
--- a/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
+++ b/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
@@ -1,18 +1,20 @@
 import { useHeaderHeight } from '@react-navigation/elements'
 import { LinearGradient } from 'expo-linear-gradient'
-import React, { PropsWithChildren } from 'react'
-import { StyleSheet } from 'react-native'
+import React, { PropsWithChildren, useState } from 'react'
+import { KeyboardAvoidingView, ScrollView, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { SafeKeyboardScreen } from 'src/components/layout/SafeKeyboardScreen'
-import { Flex, SpaceTokens, Text, useMedia, useSporeColors } from 'ui/src'
+import { Screen } from 'src/components/layout/Screen'
+import { Flex, SpaceTokens, Text, flexStyles, useMedia, useSporeColors } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
-import { opacify } from 'ui/src/theme'
+import { opacify, spacing } from 'ui/src/theme'
+import { useKeyboardLayout } from 'uniswap/src/utils/useKeyboardLayout'
+import { isIOS } from 'utilities/src/platform'
 
 type OnboardingScreenProps = {
   subtitle?: string
-  title?: string
+  title: string
   paddingTop?: SpaceTokens
-  footer?: JSX.Element
+  screenFooter?: JSX.Element
   minHeightWhenKeyboardExpanded?: boolean
 }
 
@@ -20,13 +22,34 @@ export function SafeKeyboardOnboardingScreen({
   title,
   subtitle,
   children,
-  footer,
+  screenFooter,
   paddingTop = '$none',
   minHeightWhenKeyboardExpanded = true,
 }: PropsWithChildren<OnboardingScreenProps>): JSX.Element {
+  const [footerHeight, setFooterHeight] = useState(0)
   const headerHeight = useHeaderHeight()
   const colors = useSporeColors()
   const media = useMedia()
+  const keyboard = useKeyboardLayout()
+
+  const header = (
+    <Flex gap="$spacing12" m="$spacing12">
+      <Text $short={{ variant: 'body1' }} pt={paddingTop} textAlign="center" variant="heading3">
+        {title}
+      </Text>
+      {subtitle ? (
+        <Text $short={{ variant: 'body3' }} color="$neutral2" textAlign="center" variant="body2">
+          {subtitle}
+        </Text>
+      ) : null}
+    </Flex>
+  )
+
+  const page = (
+    <Flex grow justifyContent="space-between">
+      {children}
+    </Flex>
+  )
 
   const normalGradientPadding = 1.5
   const responsiveGradientPadding = media.short ? 1.25 : normalGradientPadding
@@ -39,54 +62,69 @@ export function SafeKeyboardOnboardingScreen({
     />
   )
 
-  const page = (
-    <>
-      {title || subtitle ? (
-        <Flex gap="$spacing12" m="$spacing12">
-          {title && (
-            <Text $short={{ variant: 'body1' }} pt={paddingTop} textAlign="center" variant="heading3">
-              {title}
-            </Text>
-          )}
-          {subtitle && (
-            <Text $short={{ variant: 'body3' }} color="$neutral2" textAlign="center" variant="body2">
-              {subtitle}
-            </Text>
-          )}
-        </Flex>
-      ) : null}
-      <Flex grow justifyContent="space-between">
-        {children}
-      </Flex>
-    </>
-  )
+  const compact = keyboard.isVisible && keyboard.containerHeight !== 0
+  const containerStyle = compact ? styles.compact : styles.expand
+
+  // This makes sure this component behaves just like `behavior="padding"` when
+  // there's enough space on the screen to show all components.
+  const minHeight = minHeightWhenKeyboardExpanded && compact ? keyboard.containerHeight - footerHeight : 0
 
   return (
-    <SafeKeyboardScreen
-      edges={['right', 'left', 'bottom']}
-      footer={footer}
-      header={topGradient}
-      minHeightWhenKeyboardExpanded={minHeightWhenKeyboardExpanded}
-    >
-      <AnimatedFlex
-        $short={{ gap: '$none' }}
-        entering={FadeIn}
-        exiting={FadeOut}
-        gap="$spacing16"
-        style={{ paddingTop: headerHeight }}
+    <Screen edges={['right', 'left', 'bottom']}>
+      <KeyboardAvoidingView
+        behavior={isIOS ? 'padding' : 'height'}
+        contentContainerStyle={containerStyle}
+        style={styles.base}
       >
-        {page}
-      </AnimatedFlex>
-    </SafeKeyboardScreen>
+        <ScrollView bounces={false} contentContainerStyle={flexStyles.grow} keyboardShouldPersistTaps="handled">
+          <AnimatedFlex
+            $short={{ gap: '$none' }}
+            entering={FadeIn}
+            exiting={FadeOut}
+            gap="$spacing16"
+            minHeight={minHeight}
+            px="$spacing16"
+            style={[containerStyle, styles.container, { paddingTop: headerHeight }]}
+          >
+            {header}
+            {page}
+          </AnimatedFlex>
+        </ScrollView>
+        <Flex
+          onLayout={({
+            nativeEvent: {
+              layout: { height },
+            },
+          }) => {
+            setFooterHeight(height)
+          }}
+        >
+          {screenFooter}
+        </Flex>
+      </KeyboardAvoidingView>
+      {topGradient}
+    </Screen>
   )
 }
 
 const styles = StyleSheet.create({
+  base: {
+    flex: 1,
+    justifyContent: 'flex-end',
+  },
+  compact: {
+    flexGrow: 0,
+  },
+  container: {
+    paddingBottom: spacing.spacing12,
+  },
+  expand: {
+    flexGrow: 1,
+  },
   gradient: {
     left: 0,
     position: 'absolute',
     right: 0,
     top: 0,
-    zIndex: 1,
   },
 })
diff --git a/apps/mobile/src/features/onboarding/hooks.ts b/apps/mobile/src/features/onboarding/hooks.ts
index 40debb481b5..55199d2e06f 100644
--- a/apps/mobile/src/features/onboarding/hooks.ts
+++ b/apps/mobile/src/features/onboarding/hooks.ts
@@ -1,5 +1,5 @@
 import { SharedEventName } from '@uniswap/analytics-events'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackBaseParams, useOnboardingStackNavigation } from 'src/app/navigation/types'
 import { MobileAppsFlyerEvents } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent, sendAppsFlyerEvent } from 'uniswap/src/features/telemetry/send'
@@ -20,7 +20,7 @@ export function useCompleteOnboardingCallback({
   entryPoint,
   importType,
 }: OnboardingStackBaseParams): () => Promise<void> {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { getAllOnboardingAccounts, finishOnboarding } = useOnboardingContext()
   const navigation = useOnboardingStackNavigation()
 
diff --git a/apps/mobile/src/features/scantastic/ScantasticModal.tsx b/apps/mobile/src/features/scantastic/ScantasticModal.tsx
index 3d4d4a4d1d2..7d802444423 100644
--- a/apps/mobile/src/features/scantastic/ScantasticModal.tsx
+++ b/apps/mobile/src/features/scantastic/ScantasticModal.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
 import { closeAllModals } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
@@ -36,7 +35,7 @@ interface OtpStateApiResponse {
 export function ScantasticModal(): JSX.Element | null {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   // Use the first mnemonic account because zero-balance mnemonic accounts will fail to retrieve the mnemonic from rnEthers
   const account = useSignerAccounts().sort(
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx
index c7ea41de3fa..b452b27097f 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx
@@ -1,9 +1,9 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
 import { TokenDocument } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { AssetType } from 'wallet/src/entities/assets'
 import { ReceiveSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem'
 import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx
index e459764c256..c7986bc1bbd 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
 import { TokenDocument } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType } from 'wallet/src/entities/assets'
 import { SendSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem'
 import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
diff --git a/apps/mobile/src/features/transactions/swap/hooks/useOnCloseSendModal.tsx b/apps/mobile/src/features/transactions/swap/hooks/useOnCloseSendModal.tsx
index 26792643e47..c1d1cf036d4 100644
--- a/apps/mobile/src/features/transactions/swap/hooks/useOnCloseSendModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/hooks/useOnCloseSendModal.tsx
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 
 export function useOnCloseSendModal(): () => void {
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
 
   const onClose = useCallback((): void => {
     appDispatch(closeModal({ name: ModalName.Send }))
diff --git a/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx b/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
index c957d8c40bd..6f215340815 100644
--- a/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
@@ -1,7 +1,7 @@
 import { providers } from 'ethers'
 import { default as React, useCallback, useEffect, useMemo, useReducer, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, LayoutAnimation, StyleSheet, TouchableWithoutFeedback } from 'react-native'
+import { StyleSheet, TouchableWithoutFeedback } from 'react-native'
 import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'
 import { useShouldShowNativeKeyboard } from 'src/app/hooks'
 import { RecipientSelect } from 'src/components/RecipientSelect/RecipientSelect'
@@ -14,30 +14,15 @@ import { Flex, useDeviceInsets, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { iconSizes } from 'ui/src/theme'
-import { TokenSelectorModal, TokenSelectorVariation } from 'uniswap/src/components/TokenSelector/TokenSelector'
 import { useBottomSheetContext } from 'uniswap/src/components/modals/BottomSheetContext'
 import { HandleBar } from 'uniswap/src/components/modals/HandleBar'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ModalName, SectionName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { currencyAddress } from 'uniswap/src/utils/currencyId'
-import {
-  useAddToSearchHistory,
-  useCommonTokensOptions,
-  useFavoriteTokensOptions,
-  useFilterCallbacks,
-  usePopularTokensOptions,
-  usePortfolioTokenOptions,
-  useTokenSectionsForEmptySearch,
-  useTokenSectionsForSearchResults,
-} from 'wallet/src/components/TokenSelector/hooks'
+import { TokenSelectorModal, TokenSelectorVariation } from 'wallet/src/components/TokenSelector/TokenSelector'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
 import { GasFeeResult, GasSpeed } from 'wallet/src/features/gas/types'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
 import { WarningAction, WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import { useParsedSendWarnings } from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
 import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
@@ -46,6 +31,7 @@ import {
   INITIAL_TRANSACTION_STATE,
   transactionStateReducer,
 } from 'wallet/src/features/transactions/transactionState/transactionState'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { TransferReview } from 'wallet/src/features/transactions/transfer/TransferReview'
 import { TransferTokenForm } from 'wallet/src/features/transactions/transfer/TransferTokenForm'
 import { useDerivedTransferInfo } from 'wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo'
@@ -57,9 +43,8 @@ import {
 } from 'wallet/src/features/transactions/transfer/hooks/useTransferCallback'
 import { useTransferTransactionRequest } from 'wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest'
 import { useTransferWarnings } from 'wallet/src/features/transactions/transfer/hooks/useTransferWarnings'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
+import { DerivedTransferInfo, TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 import { TransactionStep, TransferFlowProps } from 'wallet/src/features/transactions/types'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
 interface TransferFormProps {
   prefilledState?: TransactionState
@@ -72,9 +57,6 @@ export function TransferFlow({ prefilledState, onClose }: TransferFormProps): JS
   const { t } = useTranslation()
   const { fullWidth } = useDeviceDimensions()
   const { isSheetReady } = useBottomSheetContext()
-  const { formatNumberOrString, convertFiatAmountFormatted } = useLocalizationContext()
-  const { navigateToBuyOrReceiveWithEmptyWallet } = useWalletNavigation()
-  const { registerSearch } = useAddToSearchHistory()
 
   const [state, dispatch] = useReducer(transactionStateReducer, prefilledState || INITIAL_TRANSACTION_STATE)
   const derivedTransferInfo = useDerivedTransferInfo(state)
@@ -84,8 +66,6 @@ export function TransferFlow({ prefilledState, onClose }: TransferFormProps): JS
   const { isFiatInput, exactAmountToken, exactAmountFiat } = derivedTransferInfo
   const { showRecipientSelector } = state
 
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
-
   const onSelectRecipient = useOnSelectRecipient(dispatch)
   const onSetShowRecipientSelector = useSetShowRecipientSelector(dispatch)
 
@@ -231,25 +211,10 @@ export function TransferFlow({ prefilledState, onClose }: TransferFormProps): JS
       </TouchableWithoutFeedback>
       {!!state.selectingCurrencyField && (
         <TokenSelectorModal
-          activeAccountAddress={activeAccountAddress}
-          addToSearchHistoryCallback={registerSearch}
-          convertFiatAmountFormattedCallback={convertFiatAmountFormatted}
           currencyField={CurrencyField.INPUT}
           flow={TokenSelectorFlow.Transfer}
-          formatNumberOrStringCallback={formatNumberOrString}
-          navigateToBuyOrReceiveWithEmptyWalletCallback={navigateToBuyOrReceiveWithEmptyWallet}
-          useCommonTokensOptionsHook={useCommonTokensOptions}
-          useFavoriteTokensOptionsHook={useFavoriteTokensOptions}
-          useFilterCallbacksHook={useFilterCallbacks}
-          usePopularTokensOptionsHook={usePopularTokensOptions}
-          usePortfolioTokenOptionsHook={usePortfolioTokenOptions}
-          useTokenSectionsForEmptySearchHook={useTokenSectionsForEmptySearch}
-          useTokenSectionsForSearchResultsHook={useTokenSectionsForSearchResults}
-          useTokenWarningDismissedHook={useTokenWarningDismissed}
           variation={TokenSelectorVariation.BalancesOnly}
           onClose={onHideTokenSelector}
-          onDismiss={() => Keyboard.dismiss()}
-          onPressAnimation={() => LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)}
           onSelectCurrency={onSelectCurrency}
         />
       )}
diff --git a/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx b/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
index 6264957444b..04d07fd7f7e 100644
--- a/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
@@ -4,11 +4,11 @@ import { goBack } from 'src/app/navigation/rootNavigation'
 import { TransactionPending } from 'src/features/transactions/TransactionPending/TransactionPending'
 import { AppTFunction } from 'ui/src/i18n/types'
 import { FiatCurrencyInfo } from 'uniswap/src/features/fiatOnRamp/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { NumberType } from 'utilities/src/format/types'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { LocalizationContextState, useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useSelectTransaction } from 'wallet/src/features/transactions/hooks'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
 import { TransactionDetails, TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow, useDisplayName } from 'wallet/src/features/wallet/hooks'
diff --git a/apps/mobile/src/features/transactions/transfer/transferRewrite/TransferFlow.tsx b/apps/mobile/src/features/transactions/transfer/transferRewrite/TransferFlow.tsx
index 2aeff67f62a..9610643d296 100644
--- a/apps/mobile/src/features/transactions/transfer/transferRewrite/TransferFlow.tsx
+++ b/apps/mobile/src/features/transactions/transfer/transferRewrite/TransferFlow.tsx
@@ -11,10 +11,10 @@ import {
 import { useWalletRestore } from 'src/features/wallet/hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ModalName, SectionName } from 'uniswap/src/features/telemetry/constants'
-import { TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { SwapFormContextProvider, SwapFormState } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import { TransactionModal } from 'wallet/src/features/transactions/swap/TransactionModal'
 import { getFocusOnCurrencyFieldFromInitialState } from 'wallet/src/features/transactions/swap/hooks/useSwapPrefilledState'
+import { TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 
 /**
  * @todo: The screens within this flow are not implemented.
diff --git a/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx b/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
index c2fbf74b3c2..6ddd4ca74ca 100644
--- a/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
+++ b/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
@@ -16,7 +16,6 @@ import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { fonts, iconSizes, imageSizes, spacing } from 'ui/src/theme'
 import { TextInput } from 'uniswap/src/components/input/TextInput'
 import { Pill } from 'uniswap/src/components/pill/Pill'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, ModalName, UnitagEventName } from 'uniswap/src/features/telemetry/constants'
@@ -28,6 +27,7 @@ import { shortenAddress } from 'uniswap/src/utils/addresses'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import {
   useCreateOnboardingAccountIfNone,
   useOnboardingContext,
diff --git a/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx b/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx
index 7adbf15502a..a8454abf5e7 100644
--- a/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx
+++ b/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard, KeyboardAvoidingView, StyleSheet } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { UnitagStackScreenProp } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
@@ -39,6 +38,7 @@ import { useAvatarUploadCredsWithRefresh } from 'wallet/src/features/unitags/hoo
 import { useWalletSigners } from 'wallet/src/features/wallet/context'
 import { useAccount } from 'wallet/src/features/wallet/hooks'
 import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useAppDispatch } from 'wallet/src/state'
 
 const BIO_TEXT_INPUT_LINES = 6
 
@@ -71,7 +71,7 @@ export function EditUnitagProfileScreen({ route }: UnitagStackScreenProp<UnitagS
   const { t } = useTranslation()
   const colors = useSporeColors()
   const isDarkMode = useIsDarkMode()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const account = useAccount(address)
   const signerManager = useWalletSigners()
 
diff --git a/apps/mobile/src/features/wallet/hooks.ts b/apps/mobile/src/features/wallet/hooks.ts
index 8758f49d45b..173b2c716ac 100644
--- a/apps/mobile/src/features/wallet/hooks.ts
+++ b/apps/mobile/src/features/wallet/hooks.ts
@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useState } from 'react'
-import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'src/app/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
@@ -9,13 +8,14 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { logger } from 'utilities/src/logger/logger'
 import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function useWalletRestore(params?: { openModalImmediately?: boolean }): {
   walletNeedsRestore: undefined | boolean
   openWalletRestoreModal: () => void
   isModalOpen: boolean
 } {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const openModalImmediately = params?.openModalImmediately
   // Means that no private key found for mnemonic wallets
   const [walletNeedsRestore, setWalletNeedsRestore] = useState<boolean>(false)
diff --git a/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts b/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
index c008cd87b51..89a0fecc631 100644
--- a/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
+++ b/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
@@ -2,10 +2,10 @@ import { providers } from 'ethers'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { TransactionRequest, UwuLinkErc20Request } from 'src/features/walletConnect/walletConnectSlice'
 import { call, put } from 'typed-redux-saga'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { DappInfo, EthMethod, EthSignMethod, UwULinkMethod, WalletConnectEvent } from 'uniswap/src/types/walletConnect'
 import { logger } from 'utilities/src/logger/logger'
+import { AssetType } from 'wallet/src/entities/assets'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { SendTransactionParams, sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
diff --git a/apps/mobile/src/features/walletConnect/utils.test.ts b/apps/mobile/src/features/walletConnect/utils.test.ts
index d3fd396eeaa..6f027b88bae 100644
--- a/apps/mobile/src/features/walletConnect/utils.test.ts
+++ b/apps/mobile/src/features/walletConnect/utils.test.ts
@@ -14,11 +14,15 @@ const TEST_ADDRESS = '0xdFb84E543C39ACa3c6a39ea4e3B6c40eE7d2EBdA'
 
 describe(getAccountAddressFromEIP155String, () => {
   it('handles valid eip155 mainnet address', () => {
-    expect(getAccountAddressFromEIP155String(`${EIP155_MAINNET}:${TEST_ADDRESS}`)).toBe(TEST_ADDRESS)
+    expect(getAccountAddressFromEIP155String(`${EIP155_MAINNET}:${TEST_ADDRESS}`)).toBe(
+      TEST_ADDRESS
+    )
   })
 
   it('handles valid eip155 polygon address', () => {
-    expect(getAccountAddressFromEIP155String(`${EIP155_POLYGON}:${TEST_ADDRESS}`)).toBe(TEST_ADDRESS)
+    expect(getAccountAddressFromEIP155String(`${EIP155_POLYGON}:${TEST_ADDRESS}`)).toBe(
+      TEST_ADDRESS
+    )
   })
 
   it('handles invalid eip155 address', () => {
@@ -28,18 +32,15 @@ describe(getAccountAddressFromEIP155String, () => {
 
 describe(getSupportedWalletConnectChains, () => {
   it('handles list of valid chains', () => {
-    expect(getSupportedWalletConnectChains([EIP155_MAINNET, EIP155_POLYGON, EIP155_OPTIMISM])).toEqual([
-      UniverseChainId.Mainnet,
-      UniverseChainId.Polygon,
-      UniverseChainId.Optimism,
-    ])
+    expect(
+      getSupportedWalletConnectChains([EIP155_MAINNET, EIP155_POLYGON, EIP155_OPTIMISM])
+    ).toEqual([UniverseChainId.Mainnet, UniverseChainId.Polygon, UniverseChainId.Optimism])
   })
 
   it('handles list of valid chains including an invalid chain', () => {
-    expect(getSupportedWalletConnectChains([EIP155_MAINNET, EIP155_POLYGON, EIP155_LINEA_UNSUPPORTED])).toEqual([
-      UniverseChainId.Mainnet,
-      UniverseChainId.Polygon,
-    ])
+    expect(
+      getSupportedWalletConnectChains([EIP155_MAINNET, EIP155_POLYGON, EIP155_LINEA_UNSUPPORTED])
+    ).toEqual([UniverseChainId.Mainnet, UniverseChainId.Polygon])
   })
 })
 
diff --git a/apps/mobile/src/features/widgets/widgets.ts b/apps/mobile/src/features/widgets/widgets.ts
index c1768c855e6..367ee40607e 100644
--- a/apps/mobile/src/features/widgets/widgets.ts
+++ b/apps/mobile/src/features/widgets/widgets.ts
@@ -1,7 +1,6 @@
 import { NativeModules } from 'react-native'
 import { getItem, reloadAllTimelines, setItem } from 'react-native-widgetkit'
 import { getBuildVariant } from 'src/utils/version'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { CurrencyId } from 'uniswap/src/types/currency'
@@ -9,6 +8,7 @@ import { WidgetEvent } from 'uniswap/src/types/widgets'
 import { isAndroid } from 'utilities/src/platform'
 // eslint-disable-next-line no-restricted-imports
 import { analytics } from 'utilities/src/telemetry/analytics/analytics'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 
 const APP_GROUP = 'group.com.uniswap.widgets'
diff --git a/apps/mobile/src/screens/AppLoadingScreen.tsx b/apps/mobile/src/screens/AppLoadingScreen.tsx
index 1be91164dfb..47467f4104e 100644
--- a/apps/mobile/src/screens/AppLoadingScreen.tsx
+++ b/apps/mobile/src/screens/AppLoadingScreen.tsx
@@ -2,8 +2,8 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import dayjs from 'dayjs'
 import { isEnrolledAsync } from 'expo-local-authentication'
 import { t } from 'i18next'
+import { isNumber } from 'lodash'
 import { useCallback, useEffect, useState } from 'react'
-import { useDispatch } from 'react-redux'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { SplashScreen } from 'src/features/appLoading/SplashScreen'
 import { useBiometricContext } from 'src/features/biometrics/context'
@@ -14,8 +14,8 @@ import {
 } from 'src/features/notifications/hooks/useNotificationOSPermissionsEnabled'
 import { RecoveryWalletInfo, useOnDeviceRecoveryData } from 'src/screens/Import/useOnDeviceRecoveryData'
 import { hideSplashScreen } from 'src/utils/splashScreen'
-import { DynamicConfigs, OnDeviceRecoveryConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { ImportType, OnboardingEntryPoint } from 'uniswap/src/types/onboarding'
@@ -26,7 +26,7 @@ import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { AccountType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { selectAnyAddressHasNotificationsEnabled } from 'wallet/src/features/wallet/selectors'
 import { setFinishedOnboarding } from 'wallet/src/features/wallet/slice'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export const SPLASH_SCREEN = { uri: 'SplashScreen' }
 
@@ -35,7 +35,7 @@ type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.
 function useFinishAutomatedRecovery(navigation: Props['navigation']): {
   finishRecovery: (mnemonicId: string, recoveryWalletInfos: RecoveryWalletInfo[]) => void
 } {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { setRecoveredImportedAccounts, finishOnboarding } = useOnboardingContext()
 
   const notificationOSPermission = useNotificationOSPermissionsEnabled()
@@ -120,18 +120,15 @@ function useFinishAutomatedRecovery(navigation: Props['navigation']): {
 const FALLBACK_APP_LOADING_TIMEOUT_MS = 15000
 
 export function AppLoadingScreen({ navigation }: Props): JSX.Element | null {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
-  const appLoadingTimeoutMs = useDynamicConfigValue(
-    DynamicConfigs.OnDeviceRecovery,
-    OnDeviceRecoveryConfigKey.AppLoadingTimeoutMs,
+  const onDeviceRecoveryConfig = useDynamicConfig(DynamicConfigs.OnDeviceRecovery)
+  const appLoadingTimeoutMs = onDeviceRecoveryConfig.get(
+    'appLoadingTimeoutMs',
     FALLBACK_APP_LOADING_TIMEOUT_MS,
+    isNumber,
   )
-  const maxMnemonicsToLoad = useDynamicConfigValue(
-    DynamicConfigs.OnDeviceRecovery,
-    OnDeviceRecoveryConfigKey.MaxMnemonicsToLoad,
-    20,
-  )
+  const maxMnemonicsToLoad = onDeviceRecoveryConfig.getValue('maxMnemonicsToLoad', 20) as number
 
   const [finished, setFinished] = useState(false)
 
diff --git a/apps/mobile/src/screens/DevScreen.tsx b/apps/mobile/src/screens/DevScreen.tsx
index 190e1e8102c..b7260c6dce2 100644
--- a/apps/mobile/src/screens/DevScreen.tsx
+++ b/apps/mobile/src/screens/DevScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { I18nManager, ScrollView } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { BackButton } from 'src/components/buttons/BackButton'
 import { Screen } from 'src/components/layout/Screen'
@@ -22,7 +22,7 @@ import { useAppSelector } from 'wallet/src/state'
 
 export function DevScreen(): JSX.Element {
   const insets = useDeviceInsets()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAccount = useActiveAccount()
   const [rtlEnabled, setRTLEnabled] = useState(I18nManager.isRTL)
   const sortedMnemonicAccounts = useAppSelector(selectSortedSignerMnemonicAccounts)
diff --git a/apps/mobile/src/screens/ExchangeTransferConnecting.tsx b/apps/mobile/src/screens/ExchangeTransferConnecting.tsx
index ab3cb778675..dcb551c5474 100644
--- a/apps/mobile/src/screens/ExchangeTransferConnecting.tsx
+++ b/apps/mobile/src/screens/ExchangeTransferConnecting.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { Screen } from 'src/components/layout/Screen'
 import { useFiatOnRampTransactionCreator } from 'src/features/fiatOnRamp/hooks'
 import { Flex, useIsDarkMode } from 'ui/src'
@@ -13,14 +13,13 @@ import { getServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
 import { InstitutionTransferEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { UniverseChainId } from 'uniswap/src/types/chains'
-import { openUri } from 'uniswap/src/utils/linking'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { useTimeout } from 'utilities/src/time/timing'
 import { ImageUri } from 'wallet/src/features/images/ImageUri'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { FiatPurchaseTransactionInfo } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { openUri } from 'wallet/src/utils/linking'
 
 // Design decision
 const CONNECTING_TIMEOUT = 2 * ONE_SECOND_MS
@@ -33,19 +32,15 @@ export function ExchangeTransferConnecting({
   onClose: () => void
 }): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
   const [timeoutElapsed, setTimeoutElapsed] = useState(false)
 
-  const initialTypeInfo = useMemo<Partial<FiatPurchaseTransactionInfo>>(
-    () => ({ serviceProviderLogo: serviceProvider.logos, serviceProvider: serviceProvider.serviceProvider }),
-    [serviceProvider],
-  )
+  const initialTypeInfo = useMemo(() => ({ serviceProviderLogo: serviceProvider.logos }), [serviceProvider.logos])
 
   const { externalTransactionId, dispatchAddTransaction } = useFiatOnRampTransactionCreator(
     activeAccountAddress,
     UniverseChainId.Mainnet,
-    serviceProvider.serviceProvider,
     initialTypeInfo,
   )
 
diff --git a/apps/mobile/src/screens/ExploreScreen.tsx b/apps/mobile/src/screens/ExploreScreen.tsx
index e1caeb84407..b6b0e91cc05 100644
--- a/apps/mobile/src/screens/ExploreScreen.tsx
+++ b/apps/mobile/src/screens/ExploreScreen.tsx
@@ -2,7 +2,7 @@ import { useScrollToTop } from '@react-navigation/native'
 import { SharedEventName } from '@uniswap/analytics-events'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, KeyboardAvoidingView, TextInput } from 'react-native'
+import { KeyboardAvoidingView, TextInput } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { useAppSelector } from 'src/app/hooks'
 import { useExploreStackNavigation } from 'src/app/navigation/types'
@@ -16,11 +16,11 @@ import { ColorTokens, Flex, flexStyles, useIsDarkMode } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { useBottomSheetContext } from 'uniswap/src/components/modals/BottomSheetContext'
 import { HandleBar } from 'uniswap/src/components/modals/HandleBar'
-import { SearchTextInput } from 'uniswap/src/features/search/SearchTextInput'
 import { ModalName, SectionName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { useDebounce } from 'utilities/src/time/timing'
+import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
 
 export function ExploreScreen(): JSX.Element {
   const modalInitialState = useAppSelector(selectModalState(ModalName.Explore)).initialState
@@ -83,13 +83,12 @@ export function ExploreScreen(): JSX.Element {
           showShadow={!isSearchMode}
           onCancel={onSearchCancel}
           onChangeText={onSearchChangeText}
-          onDismiss={() => Keyboard.dismiss()}
           onFocus={onSearchFocus}
         />
       </Flex>
       {isSearchMode ? (
         <KeyboardAvoidingView behavior="height" style={flexStyles.fill}>
-          <Flex grow>
+          <Flex grow mx="$spacing16">
             <VirtualizedList onScroll={onScroll}>
               <Flex p="$spacing4" />
               {debouncedSearchQuery.length === 0 ? (
diff --git a/apps/mobile/src/screens/FiatOnRampConnecting.tsx b/apps/mobile/src/screens/FiatOnRampConnecting.tsx
index f15f73aed15..03e854dfcd7 100644
--- a/apps/mobile/src/screens/FiatOnRampConnecting.tsx
+++ b/apps/mobile/src/screens/FiatOnRampConnecting.tsx
@@ -2,7 +2,7 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { FiatOnRampStackParamList } from 'src/app/navigation/types'
 import { Screen } from 'src/components/layout/Screen'
 import { useFiatOnRampContext } from 'src/features/fiatOnRamp/FiatOnRampContext'
@@ -14,12 +14,11 @@ import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { FiatOnRampConnectingView } from 'uniswap/src/features/fiatOnRamp/FiatOnRampConnectingView'
 import { useFiatOnRampAggregatorWidgetQuery } from 'uniswap/src/features/fiatOnRamp/api'
 import { ServiceProviderLogoStyles } from 'uniswap/src/features/fiatOnRamp/constants'
-import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
+import { getOptionalServiceProviderLogo, getServiceProviderForQuote } from 'uniswap/src/features/fiatOnRamp/utils'
 import { FiatOnRampEventName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { FiatOnRampScreens } from 'uniswap/src/types/screens/mobile'
-import { openUri } from 'uniswap/src/utils/linking'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { useTimeout } from 'utilities/src/time/timing'
 import { ImageUri } from 'wallet/src/features/images/ImageUri'
@@ -27,8 +26,8 @@ import { useLocalizationContext } from 'wallet/src/features/language/Localizatio
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { forceFetchFiatOnRampTransactions } from 'wallet/src/features/transactions/slice'
-import { FiatPurchaseTransactionInfo } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { openUri } from 'wallet/src/utils/linking'
 
 // Design decision
 const CONNECTING_TIMEOUT = 2 * ONE_SECOND_MS
@@ -37,27 +36,28 @@ type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.
 
 export function FiatOnRampConnectingScreen({ navigation }: Props): JSX.Element | null {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { addFiatSymbolToNumber } = useLocalizationContext()
   const [timeoutElapsed, setTimeoutElapsed] = useState(false)
   const activeAccountAddress = useActiveAccountAddressWithThrow()
 
-  const { selectedQuote, quotesSections, countryCode, countryState, baseCurrencyInfo, quoteCurrency, amount } =
-    useFiatOnRampContext()
-  const serviceProvider = selectedQuote?.serviceProviderDetails
+  const {
+    selectedQuote,
+    quotesSections,
+    serviceProviders,
+    countryCode,
+    countryState,
+    baseCurrencyInfo,
+    quoteCurrency,
+    amount,
+  } = useFiatOnRampContext()
+  const serviceProvider = getServiceProviderForQuote(selectedQuote, serviceProviders)
 
-  const initialTypeInfo = useMemo<Partial<FiatPurchaseTransactionInfo>>(
-    () => ({
-      serviceProviderLogo: serviceProvider?.logos,
-      serviceProvider: serviceProvider?.serviceProvider,
-    }),
-    [serviceProvider],
-  )
+  const initialTypeInfo = useMemo(() => ({ serviceProviderLogo: serviceProvider?.logos }), [serviceProvider?.logos])
 
   const { externalTransactionId, dispatchAddTransaction } = useFiatOnRampTransactionCreator(
     activeAccountAddress,
     quoteCurrency.currencyInfo?.currency.chainId ?? UniverseChainId.Mainnet,
-    serviceProvider?.serviceProvider,
     initialTypeInfo,
   )
 
@@ -105,7 +105,7 @@ export function FiatOnRampConnectingScreen({ navigation }: Props): JSX.Element |
         sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampWidgetOpened, {
           externalTransactionId,
           serviceProvider: serviceProvider.serviceProvider,
-          preselectedServiceProvider: quotesSections?.[0]?.data?.[0]?.serviceProviderDetails.serviceProvider,
+          preselectedServiceProvider: quotesSections?.[0]?.data?.[0]?.serviceProvider,
           countryCode,
           countryState,
           fiatCurrency: baseCurrencyInfo?.code.toLowerCase(),
diff --git a/apps/mobile/src/screens/FiatOnRampScreen.tsx b/apps/mobile/src/screens/FiatOnRampScreen.tsx
index 2b32e658140..e5854f6b8b7 100644
--- a/apps/mobile/src/screens/FiatOnRampScreen.tsx
+++ b/apps/mobile/src/screens/FiatOnRampScreen.tsx
@@ -4,8 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { TextInput, TextInputProps } from 'react-native'
 import FastImage from 'react-native-fast-image'
 import { FadeIn, FadeOut, FadeOutDown } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
-import { useShouldShowNativeKeyboard } from 'src/app/hooks'
+import { useAppDispatch, useShouldShowNativeKeyboard } from 'src/app/hooks'
 import { FiatOnRampStackParamList } from 'src/app/navigation/types'
 import { FiatOnRampCtaButton } from 'src/components/fiatOnRamp/CtaButton'
 import { Screen } from 'src/components/layout/Screen'
@@ -15,19 +14,23 @@ import { FiatOnRampCountryListModal } from 'src/features/fiatOnRamp/FiatOnRampCo
 import { FiatOnRampTokenSelectorModal } from 'src/features/fiatOnRamp/FiatOnRampTokenSelector'
 import {
   useFiatOnRampQuotes,
-  useFiatOnRampSupportedTokens,
   useMeldFiatCurrencySupportInfo,
   useParseFiatOnRampError,
-} from 'src/features/fiatOnRamp/hooks'
+} from 'src/features/fiatOnRamp/aggregatorHooks'
+import { useFiatOnRampSupportedTokens } from 'src/features/fiatOnRamp/hooks'
 import { Flex, Text, useIsDarkMode } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { useBottomSheetContext } from 'uniswap/src/components/modals/BottomSheetContext'
 import { HandleBar } from 'uniswap/src/components/modals/HandleBar'
 import { FiatOnRampCountryPicker } from 'uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker'
-import { useFiatOnRampAggregatorGetCountryQuery } from 'uniswap/src/features/fiatOnRamp/api'
+import {
+  useFiatOnRampAggregatorGetCountryQuery,
+  useFiatOnRampAggregatorServiceProvidersQuery,
+} from 'uniswap/src/features/fiatOnRamp/api'
 import {
   FORQuote,
   FORServiceProvider,
+  FORTransaction,
   FiatOnRampCurrency,
   InitialQuoteSelection,
 } from 'uniswap/src/features/fiatOnRamp/types'
@@ -40,23 +43,26 @@ import { usePrevious } from 'utilities/src/react/hooks'
 import { DEFAULT_DELAY, useDebounce } from 'utilities/src/time/timing'
 import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
 import { useLocalFiatToUSDConverter } from 'wallet/src/features/fiatCurrency/hooks'
+import { useFiatOnRampAggregatorTransactionQuery } from 'wallet/src/features/fiatOnRamp/api'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 
 type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.AmountInput>
 
-function selectInitialQuote(quotes: FORQuote[] | undefined): {
-  quote: FORQuote | undefined
-  type: InitialQuoteSelection | undefined
-} {
-  const quoteFromLastUsedProvider = quotes?.find((q) => q.isMostRecentlyUsedProvider)
-  if (quoteFromLastUsedProvider) {
-    return {
-      quote: quoteFromLastUsedProvider,
-      type: InitialQuoteSelection.MostRecent,
+function selectInitialQuote(
+  quotes: FORQuote[] | undefined,
+  lastTransaction: FORTransaction | undefined,
+): { quote: FORQuote | undefined; type: InitialQuoteSelection | undefined } {
+  const lastUsedServiceProvider = lastTransaction?.serviceProvider
+  if (lastUsedServiceProvider) {
+    const quote = quotes?.filter((q) => q.serviceProvider === lastUsedServiceProvider)[0]
+    if (quote) {
+      return {
+        quote,
+        type: InitialQuoteSelection.MostRecent,
+      }
     }
   }
-
   const bestQuote = quotes && quotes.length && quotes[0]
   if (bestQuote) {
     return {
@@ -79,7 +85,7 @@ const PREDEFINED_AMOUNTS_SUPPORTED_CURRENCIES = ['usd', 'eur', 'gbp', 'aud', 'ca
 
 export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isDarkMode = useIsDarkMode()
   const [selection, setSelection] = useState<TextInputProps['selection']>()
   const [value, setValue] = useState('')
@@ -100,6 +106,7 @@ export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
     amount,
     setAmount,
     setBaseCurrencyInfo,
+    setServiceProviders,
     quoteCurrency,
     setQuoteCurrency,
   } = useFiatOnRampContext()
@@ -137,20 +144,29 @@ export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
     }
   }, [ipCountryData, setCountryCode, setCountryState])
 
+  const {
+    currentData: serviceProvidersResponse,
+    isFetching: serviceProvidersLoading,
+    error: serviceProvidersError,
+  } = useFiatOnRampAggregatorServiceProvidersQuery({ countryCode })
+
   // preload service provider logos for given quotes for the next screen
   useEffect(() => {
-    if (quotes) {
-      preloadServiceProviderLogos(
-        quotes.map((q) => q.serviceProviderDetails),
-        isDarkMode,
+    if (serviceProvidersResponse?.serviceProviders && quotes) {
+      const quotesServiceProviderNames = quotes.map((q) => q.serviceProvider)
+      const serviceProviders = serviceProvidersResponse.serviceProviders.filter(
+        (sp) => quotesServiceProviderNames.indexOf(sp.serviceProvider) !== -1,
       )
+      preloadServiceProviderLogos(serviceProviders, isDarkMode)
     }
-  }, [quotes, isDarkMode])
+  }, [serviceProvidersResponse, quotes, isDarkMode])
+
+  const { currentData: transactionResponse } = useFiatOnRampAggregatorTransactionQuery({})
 
   const prevQuotes = usePrevious(quotes)
   useEffect(() => {
     if (quotes && (!selectedQuote || prevQuotes !== quotes)) {
-      const { quote, type } = selectInitialQuote(quotes)
+      const { quote, type } = selectInitialQuote(quotes, transactionResponse?.transaction)
       if (!quote) {
         return
       }
@@ -162,14 +178,14 @@ export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
       }
       setSelectedQuote(quote)
     }
-  }, [prevQuotes, quotes, selectedQuote, setQuotesSections, setSelectedQuote, t])
+  }, [prevQuotes, quotes, selectedQuote, setQuotesSections, setSelectedQuote, t, transactionResponse])
 
   useEffect(() => {
-    if (!quotes && (quotesError || !amount)) {
+    if (!quotes && (quotesError || serviceProvidersError || !amount)) {
       setQuotesSections(undefined)
       setSelectedQuote(undefined)
     }
-  }, [amount, quotesError, quotes, setQuotesSections, setSelectedQuote])
+  }, [amount, quotesError, serviceProvidersError, quotes, setQuotesSections, setSelectedQuote])
 
   const onSelectCountry: ComponentProps<typeof FiatOnRampCountryListModal>['onSelectCountry'] = (country): void => {
     dispatch(
@@ -208,11 +224,22 @@ export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
   }, [showNativeKeyboard, showTokenSelector])
 
   // we only show loading when there are no errors and quote value is not empty
-  const buttonDisabled = selectTokenLoading || !!quotesError || !selectedQuote?.destinationAmount
+  const buttonDisabled =
+    serviceProvidersLoading ||
+    !!serviceProvidersError ||
+    selectTokenLoading ||
+    !!quotesError ||
+    !selectedQuote?.destinationAmount
 
   const onContinue = (): void => {
-    if (quotes && quoteCurrency?.currencyInfo?.currency) {
+    if (
+      quotes &&
+      serviceProvidersResponse?.serviceProviders &&
+      serviceProvidersResponse?.serviceProviders.length > 0 &&
+      quoteCurrency?.currencyInfo?.currency
+    ) {
       setBaseCurrencyInfo(meldSupportedFiatCurrency)
+      setServiceProviders(serviceProvidersResponse.serviceProviders)
       navigation.navigate(FiatOnRampScreens.ServiceProviders)
     }
   }
@@ -245,7 +272,7 @@ export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
   const notAvailableInThisRegion = supportedFiatCurrencies?.length === 0
 
   const { errorText, errorColor } = useParseFiatOnRampError(
-    !notAvailableInThisRegion && quotesError,
+    !notAvailableInThisRegion && (quotesError || serviceProvidersError),
     meldSupportedFiatCurrency.code,
   )
 
diff --git a/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx b/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx
index 2463528e366..c9cfe944a6c 100644
--- a/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx
+++ b/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx
@@ -12,14 +12,15 @@ import { ColorTokens, Flex, GeneratedIcon, Inset, Separator, Text } from 'ui/src
 import { TimePast } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { HandleBar } from 'uniswap/src/components/modals/HandleBar'
-import { useBottomSheetFocusHook } from 'uniswap/src/components/modals/hooks'
 import { FORQuoteItem } from 'uniswap/src/features/fiatOnRamp/FORQuoteItem'
 import { FORQuote, InitialQuoteSelection } from 'uniswap/src/features/fiatOnRamp/types'
+import { getServiceProviderForQuote } from 'uniswap/src/features/fiatOnRamp/utils'
 import { FiatOnRampScreens } from 'uniswap/src/types/screens/mobile'
+import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
 
 type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.ServiceProviders>
 
-const key = (item: FORQuote): string => item.serviceProviderDetails.serviceProvider
+const key = (item: FORQuote): string => item.serviceProvider
 
 function SectionHeader({
   Icon,
@@ -54,11 +55,11 @@ function Footer(): JSX.Element {
 
 export function FiatOnRampServiceProvidersScreen({ navigation }: Props): JSX.Element {
   const { t } = useTranslation()
-  const { setSelectedQuote, quotesSections, baseCurrencyInfo } = useFiatOnRampContext()
+  const { setSelectedQuote, quotesSections, baseCurrencyInfo, serviceProviders } = useFiatOnRampContext()
 
   const renderItem = ({ item }: ListRenderItemInfo<FORQuote>): JSX.Element => {
     const onPress = (): void => {
-      const serviceProvider = item.serviceProviderDetails
+      const serviceProvider = getServiceProviderForQuote(item, serviceProviders)
       if (serviceProvider) {
         setSelectedQuote(item)
         navigation.navigate(FiatOnRampScreens.Connecting)
@@ -66,7 +67,9 @@ export function FiatOnRampServiceProvidersScreen({ navigation }: Props): JSX.Ele
     }
     return (
       <Flex px="$spacing12" py="$spacing8">
-        {baseCurrencyInfo && <FORQuoteItem serviceProvider={item.serviceProviderDetails} onPress={onPress} />}
+        {baseCurrencyInfo && (
+          <FORQuoteItem serviceProvider={getServiceProviderForQuote(item, serviceProviders)} onPress={onPress} />
+        )}
       </Flex>
     )
   }
diff --git a/apps/mobile/src/screens/HomeScreen.tsx b/apps/mobile/src/screens/HomeScreen.tsx
index bd488d774ad..8e11be9ef02 100644
--- a/apps/mobile/src/screens/HomeScreen.tsx
+++ b/apps/mobile/src/screens/HomeScreen.tsx
@@ -18,8 +18,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import { SvgProps } from 'react-native-svg'
 import { SceneRendererProps, TabBar } from 'react-native-tab-view'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { ExtensionPromoModal } from 'src/app/modals/ExtensionPromoModal'
 import { NavBar, SWAP_BUTTON_HEIGHT } from 'src/app/navigation/NavBar'
 import { AppStackScreenProp } from 'src/app/navigation/types'
@@ -56,7 +55,6 @@ import SendIcon from 'ui/src/assets/icons/send-action.svg'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { iconSizes, spacing } from 'ui/src/theme'
-import { useCexTransferProviders } from 'uniswap/src/features/fiatOnRamp/useCexTransferProviders'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
@@ -68,11 +66,11 @@ import {
   SectionName,
   SectionNameType,
 } from 'uniswap/src/features/telemetry/constants'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { useTimeout } from 'utilities/src/time/timing'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
 import { selectHasSkippedUnitagPrompt } from 'wallet/src/features/behaviorHistory/selectors'
+import { useCexTransferProviders } from 'wallet/src/features/fiatOnRamp/api'
 import { useSelectAddressHasNotifications } from 'wallet/src/features/notifications/hooks'
 import { setNotificationStatus } from 'wallet/src/features/notifications/slice'
 import { PortfolioBalance } from 'wallet/src/features/portfolio/PortfolioBalance'
@@ -96,7 +94,7 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
   const media = useMedia()
   const insets = useDeviceInsets()
   const dimensions = useDeviceDimensions()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isFocused = useIsFocused()
   const isModalOpen = useAppSelector(selectSomeModalOpen)
   const isHomeScreenBlur = !isFocused || isModalOpen
@@ -277,10 +275,19 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
 
   const { sync } = useScrollSync(currentTabIndex, scrollPairs, headerConfig)
 
+  const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregator)
   const cexTransferEnabled = useFeatureFlag(FeatureFlags.CexTransfers)
   const cexTransferProviders = useCexTransferProviders(cexTransferEnabled)
 
-  const onPressBuy = useCallback(() => dispatch(openModal({ name: ModalName.FiatOnRampAggregator })), [dispatch])
+  const onPressBuy = useCallback(
+    () =>
+      dispatch(
+        openModal({
+          name: forAggregatorEnabled ? ModalName.FiatOnRampAggregator : ModalName.FiatOnRamp,
+        }),
+      ),
+    [dispatch, forAggregatorEnabled],
+  )
   const onPressScan = useCallback(() => {
     // in case we received a pending session from a previous scan after closing modal
     dispatch(removePendingSession())
@@ -404,8 +411,7 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
   const emptyComponentStyle = useMemo<StyleProp<ViewStyle>>(
     () => ({
       minHeight: dimensions.fullHeight - (paddingTop + paddingBottom),
-      paddingTop: media.short ? spacing.spacing12 : spacing.spacing32,
-      paddingBottom: media.short ? spacing.spacing12 : spacing.spacing32,
+      paddingTop: spacing.none,
       paddingLeft: media.short ? spacing.none : spacing.spacing12,
       paddingRight: media.short ? spacing.none : spacing.spacing12,
     }),
@@ -532,7 +538,6 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
                     owner={activeAccount?.address}
                     refreshing={refreshing}
                     scrollHandler={tokensTabScrollHandler}
-                    testID={TestID.TokensTab}
                     onRefresh={onRefreshHomeData}
                   />
                 </Animated.View>
@@ -549,7 +554,6 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
                 owner={activeAccount?.address}
                 refreshing={refreshing}
                 scrollHandler={nftsTabScrollHandler}
-                testID={TestID.NFTsTab}
                 onRefresh={onRefreshHomeData}
               />
             </Freeze>
@@ -564,7 +568,6 @@ export function HomeScreen(props?: AppStackScreenProp<MobileScreens.Home>): JSX.
                 owner={activeAccount?.address}
                 refreshing={refreshing}
                 scrollHandler={activityTabScrollHandler}
-                testID={TestID.ActivityTab}
                 onRefresh={onRefreshHomeData}
               />
             </Freeze>
diff --git a/apps/mobile/src/screens/Import/OnDeviceRecoveryScreen.tsx b/apps/mobile/src/screens/Import/OnDeviceRecoveryScreen.tsx
index bb0830413b2..be7897e6cdd 100644
--- a/apps/mobile/src/screens/Import/OnDeviceRecoveryScreen.tsx
+++ b/apps/mobile/src/screens/Import/OnDeviceRecoveryScreen.tsx
@@ -1,5 +1,6 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import dayjs from 'dayjs'
+import { isNumber } from 'lodash'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ScrollView } from 'react-native-gesture-handler'
@@ -15,8 +16,8 @@ import { Flex, Image, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { UNISWAP_LOGO } from 'ui/src/assets'
 import { PapersText } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { DynamicConfigs, OnDeviceRecoveryConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
@@ -44,10 +45,10 @@ export function OnDeviceRecoveryScreen({
   const { t } = useTranslation()
   const colors = useSporeColors()
   const { setRecoveredImportedAccounts } = useOnboardingContext()
-  const recoveryLoadingTimeoutMs = useDynamicConfigValue(
-    DynamicConfigs.OnDeviceRecovery,
-    OnDeviceRecoveryConfigKey.AppLoadingTimeoutMs,
+  const recoveryLoadingTimeoutMs = useDynamicConfig(DynamicConfigs.OnDeviceRecovery).get(
+    'recoveryLoadingTimeoutMs',
     FALLBACK_RECOVERY_LOADING_TIMEOUT_MS,
+    isNumber,
   )
 
   const [selectedMnemonicId, setSelectedMnemonicId] = useState<string>()
diff --git a/apps/mobile/src/screens/Import/RestoreCloudBackupLoadingScreen.tsx b/apps/mobile/src/screens/Import/RestoreCloudBackupLoadingScreen.tsx
index b83b50030e5..5803b6854f7 100644
--- a/apps/mobile/src/screens/Import/RestoreCloudBackupLoadingScreen.tsx
+++ b/apps/mobile/src/screens/Import/RestoreCloudBackupLoadingScreen.tsx
@@ -2,7 +2,7 @@ import { useFocusEffect } from '@react-navigation/core'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import {
   startFetchingCloudStorageBackups,
@@ -31,7 +31,7 @@ const MAX_LOADING_TIMEOUT_MS = ONE_SECOND_MS * 10
 
 export function RestoreCloudBackupLoadingScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const entryPoint = params.entryPoint
   const importType = params.importType
 
diff --git a/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx b/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
index c9bc6e4f421..a139dd01bee 100644
--- a/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
+++ b/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
@@ -3,8 +3,7 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard, TextInput } from 'react-native'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { PasswordInput } from 'src/components/input/PasswordInput'
 import { restoreMnemonicFromCloudStorage } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
@@ -70,7 +69,7 @@ function useLockoutTimeMessage(remainingLockoutTime: number): string {
 export function RestoreCloudBackupPasswordScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
   const inputRef = useRef<TextInput>(null)
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { generateImportedAccounts } = useOnboardingContext()
 
   const passwordAttemptCount = useAppSelector(selectPasswordAttempts)
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInput.tsx b/apps/mobile/src/screens/Import/SeedPhraseInput.tsx
index 7324bf53581..7af3a0bbddb 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInput.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInput.tsx
@@ -26,7 +26,6 @@ export enum StringKey {
 }
 interface NativeSeedPhraseInputProps {
   targetMnemonicId?: string
-  testID?: string
   strings: Record<StringKey, string>
   onInputValidated: (e: NativeSyntheticEvent<InputValidatedEvent>) => void
   onMnemonicStored: (e: NativeSyntheticEvent<MnemonicStoredEvent>) => void
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
index 08860bc6ead..40971533d4b 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
@@ -13,11 +13,11 @@ import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import { ImportType } from 'uniswap/src/types/onboarding'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
-import { openUri } from 'uniswap/src/utils/linking'
 import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
 import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { BackupType } from 'wallet/src/features/wallet/accounts/types'
 import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { openUri } from 'wallet/src/utils/linking'
 import {
   MnemonicValidationError,
   translateMnemonicErrorMessage,
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.android.mock.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.android.mock.tsx
deleted file mode 100644
index 6dea2e459ed..00000000000
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.android.mock.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { OnboardingStackParamList } from 'src/app/navigation/types'
-import { useLockScreenOnBlur } from 'src/features/authentication/lockScreenContext'
-import { GenericImportForm } from 'src/features/import/GenericImportForm'
-import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
-import { useAddBackButton } from 'src/utils/useAddBackButton'
-import { Button, Flex, Text, TouchableArea } from 'ui/src'
-import { QuestionInCircleFilled } from 'ui/src/components/icons'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
-import Trace from 'uniswap/src/features/telemetry/Trace'
-import { ElementName } from 'uniswap/src/features/telemetry/constants'
-import { ImportType } from 'uniswap/src/types/onboarding'
-import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
-import { openUri } from 'uniswap/src/utils/linking'
-import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
-import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
-import { BackupType } from 'wallet/src/features/wallet/accounts/types'
-import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
-import {
-  MnemonicValidationError,
-  translateMnemonicErrorMessage,
-  userFinishedTypingWord,
-  validateMnemonic,
-  validateSetOfWords,
-} from 'wallet/src/utils/mnemonics'
-
-type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.SeedPhraseInput>
-
-// Original SeedPhraseInputScreen component including JS input field. Used as a mock for Android Detox e2e testing.
-export function SeedPhraseInputScreenV2({ navigation, route: { params } }: Props): JSX.Element {
-  const { t } = useTranslation()
-  const { generateImportedAccountsByMnemonic } = useOnboardingContext()
-
-  /**
-   * If paste permission modal is open, we need to manually disable the splash screen that appears on blur,
-   * since the modal triggers the same `inactive` app state as does going to app switcher
-   *
-   * Technically seed phrase will be blocked if user pastes from keyboard,
-   * but that is an extreme edge case.
-   **/
-  const [pastePermissionModalOpen, setPastePermissionModalOpen] = useState(false)
-  useLockScreenOnBlur(pastePermissionModalOpen)
-
-  const [value, setValue] = useState<string | undefined>(undefined)
-  const [errorMessage, setErrorMessage] = useState<string | undefined>(undefined)
-
-  const isRestoringMnemonic = params.importType === ImportType.RestoreMnemonic
-
-  useAddBackButton(navigation)
-
-  const signerAccounts = useSignerAccounts()
-  const mnemonicId = (isRestoringMnemonic && signerAccounts[0]?.mnemonicId) || undefined
-
-  // Add all accounts from mnemonic.
-  const onSubmit = useCallback(async () => {
-    // Check phrase validation
-    const { validMnemonic, error, invalidWord } = validateMnemonic(value)
-
-    if (error) {
-      setErrorMessage(translateMnemonicErrorMessage(error, invalidWord, t))
-      return
-    }
-
-    if (!validMnemonic) {
-      return
-    }
-
-    if (mnemonicId && validMnemonic) {
-      const generatedMnemonicId = await Keyring.generateAddressForMnemonic(validMnemonic, 0)
-      if (generatedMnemonicId !== mnemonicId) {
-        setErrorMessage(t('account.recoveryPhrase.error.wrong'))
-        return
-      }
-    }
-
-    await generateImportedAccountsByMnemonic(validMnemonic, undefined, BackupType.Manual)
-
-    // restore flow is handled in saga after `restoreMnemonicComplete` is dispatched
-    if (!isRestoringMnemonic) {
-      navigation.navigate({ name: OnboardingScreens.SelectWallet, params, merge: true })
-    }
-  }, [value, mnemonicId, generateImportedAccountsByMnemonic, isRestoringMnemonic, t, navigation, params])
-
-  const onBlur = useCallback(() => {
-    const { error, invalidWord } = validateMnemonic(value)
-    if (error) {
-      setErrorMessage(translateMnemonicErrorMessage(error, invalidWord, t))
-    }
-  }, [t, value])
-
-  const onChange = (text: string | undefined): void => {
-    const { error, invalidWord } = validateSetOfWords(text)
-
-    // suppress error messages if the  user is not done typing a word
-    const suppressError =
-      (error === MnemonicValidationError.InvalidWord && !userFinishedTypingWord(text)) ||
-      error === MnemonicValidationError.NotEnoughWords
-
-    if (!error || suppressError) {
-      setErrorMessage(undefined)
-    } else {
-      setErrorMessage(translateMnemonicErrorMessage(error, invalidWord, t))
-    }
-
-    setValue(text)
-  }
-
-  const onPressRecoveryHelpButton = (): Promise<void> => openUri(uniswapUrls.helpArticleUrls.recoveryPhraseHowToImport)
-
-  const onPressTryAgainButton = (): void => {
-    navigation.replace(OnboardingScreens.RestoreCloudBackupLoading, params)
-  }
-
-  return (
-    <SafeKeyboardOnboardingScreen
-      subtitle={
-        isRestoringMnemonic
-          ? t('account.recoveryPhrase.subtitle.restoring')
-          : t('account.recoveryPhrase.subtitle.import')
-      }
-      title={
-        isRestoringMnemonic ? t('account.recoveryPhrase.title.restoring') : t('account.recoveryPhrase.title.import')
-      }
-    >
-      <Flex $short={{ gap: '$spacing12' }} gap="$spacing16">
-        <Flex px="$spacing8">
-          <GenericImportForm
-            blurOnSubmit
-            liveCheck
-            afterPasteButtonPress={(): void => setPastePermissionModalOpen(false)}
-            beforePasteButtonPress={(): void => setPastePermissionModalOpen(true)}
-            errorMessage={errorMessage}
-            inputAlignment="flex-start"
-            placeholderLabel={t('account.recoveryPhrase.input')}
-            textAlign="left"
-            value={value}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-        </Flex>
-        <Flex centered>
-          <Trace logPress element={ElementName.RecoveryHelpButton}>
-            <TouchableArea
-              flexDirection="row"
-              gap="$spacing8"
-              onPress={isRestoringMnemonic ? onPressTryAgainButton : onPressRecoveryHelpButton}
-            >
-              <QuestionInCircleFilled color="$neutral3" size="$icon.20" />
-              <Text $short={{ variant: 'body3' }} color="$neutral3" variant="body2">
-                {isRestoringMnemonic
-                  ? t('account.recoveryPhrase.helpText.restoring')
-                  : t('account.recoveryPhrase.helpText.import')}
-              </Text>
-            </TouchableArea>
-          </Trace>
-        </Flex>
-      </Flex>
-      <Trace logPress element={ElementName.Next}>
-        <Button disabled={!!errorMessage || !value} testID={ElementName.Continue} onPress={onSubmit}>
-          {t('common.button.continue')}
-        </Button>
-      </Trace>
-    </SafeKeyboardOnboardingScreen>
-  )
-}
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
index 65602aeba8b..c06c8eeca58 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
@@ -19,13 +19,12 @@ import { QuestionInCircleFilled } from 'ui/src/components/icons'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { ImportType } from 'uniswap/src/types/onboarding'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
-import { openUri } from 'uniswap/src/utils/linking'
 import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
 import { BackupType } from 'wallet/src/features/wallet/accounts/types'
 import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
+import { openUri } from 'wallet/src/utils/linking'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.SeedPhraseInput>
 
@@ -72,13 +71,14 @@ export function SeedPhraseInputScreenV2({ navigation, route: { params } }: Props
 
   return (
     <SafeKeyboardOnboardingScreen
-      footer={
+      minHeightWhenKeyboardExpanded={false}
+      screenFooter={
         <Trace logPress element={ElementName.Next}>
           <Button
             disabled={!submitEnabled}
             mx="$spacing16"
             my="$spacing12"
-            testID={TestID.Continue}
+            testID="seed-input-submit"
             onPress={(): void => {
               handleSubmit(seedPhraseInputRef)
             }}
@@ -87,7 +87,6 @@ export function SeedPhraseInputScreenV2({ navigation, route: { params } }: Props
           </Button>
         </Trace>
       }
-      minHeightWhenKeyboardExpanded={false}
       subtitle={
         isRestoringMnemonic
           ? t('account.recoveryPhrase.subtitle.restoring')
@@ -110,7 +109,6 @@ export function SeedPhraseInputScreenV2({ navigation, route: { params } }: Props
           [StringKey.ErrorInvalidPhrase]: t('account.recoveryPhrase.error.invalid'),
         }}
         targetMnemonicId={targetMnemonicId}
-        testID={TestID.ImportAccountInput}
         onInputValidated={(e: NativeSyntheticEvent<InputValidatedEvent>): void =>
           setSubmitEnabled(e.nativeEvent.canSubmit)
         }
diff --git a/apps/mobile/src/screens/Import/WatchWalletScreen.tsx b/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
index 8c1ced23c6f..1b82ca22579 100644
--- a/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
+++ b/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
@@ -4,7 +4,7 @@ import { TFunction } from 'i18next'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { GenericImportForm } from 'src/features/import/GenericImportForm'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
@@ -71,7 +71,7 @@ const getErrorText = ({
 
 export function WatchWalletScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const accounts = useAccounts()
   const initialAccounts = useRef(accounts)
 
diff --git a/apps/mobile/src/screens/NFTItemScreen.tsx b/apps/mobile/src/screens/NFTItemScreen.tsx
index f8f94e583f8..ea8aaeaa9c8 100644
--- a/apps/mobile/src/screens/NFTItemScreen.tsx
+++ b/apps/mobile/src/screens/NFTItemScreen.tsx
@@ -5,8 +5,7 @@ import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StatusBar, StyleSheet, TouchableOpacity } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { AppStackScreenProp, useAppStackNavigation } from 'src/app/navigation/types'
 import { HeaderScrollScreen } from 'src/components/layout/screens/HeaderScrollScreen'
 import { Loader } from 'src/components/loading'
@@ -36,8 +35,6 @@ import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { areAddressesEqual } from 'uniswap/src/utils/addresses'
-import { setClipboardImage } from 'uniswap/src/utils/clipboard'
-import { MIN_COLOR_CONTRAST_THRESHOLD, useNearestThemeColorFromImageUri } from 'uniswap/src/utils/colors'
 import { isAndroid, isIOS } from 'utilities/src/platform'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
@@ -46,6 +43,8 @@ import { useNFTContextMenu } from 'wallet/src/features/nfts/useNftContextMenu'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { setClipboardImage } from 'wallet/src/utils/clipboard'
+import { MIN_COLOR_CONTRAST_THRESHOLD, useNearestThemeColorFromImageUri } from 'wallet/src/utils/colors'
 
 const MAX_NFT_IMAGE_HEIGHT = 375
 
@@ -72,7 +71,7 @@ function NFTItemScreenContents({
 }: NFTItemScreenProps): JSX.Element {
   const { t } = useTranslation()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
   const navigation = useAppStackNavigation()
 
diff --git a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordConfirmScreen.tsx b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordConfirmScreen.tsx
index 214a4bddac0..55b0c05cfef 100644
--- a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordConfirmScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordConfirmScreen.tsx
@@ -1,10 +1,9 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
-import { CloudBackupPassword } from 'src/features/CloudBackup/CloudBackupForm'
+import { CloudBackupPasswordForm } from 'src/features/CloudBackup/CloudBackupPasswordForm'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
-import { Flex } from 'ui/src'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
 
 export type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.BackupCloudPasswordConfirm>
@@ -13,31 +12,24 @@ export function CloudBackupPasswordConfirmScreen({ navigation, route: { params }
   const { t } = useTranslation()
   const { password } = params
 
-  const navigateToNextScreen = useCallback((): void => {
+  const navigateToNextScreen = (): void => {
     navigation.navigate({
       name: OnboardingScreens.BackupCloudProcessing,
       params,
       merge: true,
     })
-  }, [navigation, params])
+  }
 
   return (
-    <CloudBackupPassword.FormProvider
-      isConfirmation
-      navigateToNextScreen={navigateToNextScreen}
-      passwordToConfirm={password}
+    <SafeKeyboardOnboardingScreen
+      subtitle={t('onboarding.cloud.confirm.description')}
+      title={t('onboarding.cloud.confirm.title')}
     >
-      <SafeKeyboardOnboardingScreen
-        footer={
-          <Flex mx="$spacing16" my="$spacing12">
-            <CloudBackupPassword.ContinueButton />
-          </Flex>
-        }
-        subtitle={t('onboarding.cloud.confirm.description')}
-        title={t('onboarding.cloud.confirm.title')}
-      >
-        <CloudBackupPassword.PasswordInput />
-      </SafeKeyboardOnboardingScreen>
-    </CloudBackupPassword.FormProvider>
+      <CloudBackupPasswordForm
+        isConfirmation={true}
+        navigateToNextScreen={navigateToNextScreen}
+        passwordToConfirm={password}
+      />
+    </SafeKeyboardOnboardingScreen>
   )
 }
diff --git a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
index e71e8bb1d7f..5a22cf59288 100644
--- a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
@@ -1,10 +1,9 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
-import { CloudBackupPassword } from 'src/features/CloudBackup/CloudBackupForm'
+import { CloudBackupPasswordForm } from 'src/features/CloudBackup/CloudBackupPasswordForm'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
-import { Flex } from 'ui/src'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
 
 export type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.BackupCloudPasswordCreate>
@@ -12,33 +11,23 @@ export type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingS
 export function CloudBackupPasswordCreateScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
 
-  const navigateToNextScreen = useCallback(
-    ({ password }: { password: string }): void => {
-      navigation.navigate({
-        name: OnboardingScreens.BackupCloudPasswordConfirm,
-        params: {
-          ...params,
-          password,
-        },
-        merge: true,
-      })
-    },
-    [navigation, params],
-  )
+  const navigateToNextScreen = ({ password }: { password: string }): void => {
+    navigation.navigate({
+      name: OnboardingScreens.BackupCloudPasswordConfirm,
+      params: {
+        ...params,
+        password,
+      },
+      merge: true,
+    })
+  }
 
   return (
-    <CloudBackupPassword.FormProvider navigateToNextScreen={navigateToNextScreen}>
-      <SafeKeyboardOnboardingScreen
-        footer={
-          <Flex mx="$spacing16" my="$spacing12">
-            <CloudBackupPassword.ContinueButton />
-          </Flex>
-        }
-        subtitle={t('onboarding.cloud.createPassword.description')}
-        title={t('onboarding.cloud.createPassword.title')}
-      >
-        <CloudBackupPassword.PasswordInput />
-      </SafeKeyboardOnboardingScreen>
-    </CloudBackupPassword.FormProvider>
+    <SafeKeyboardOnboardingScreen
+      subtitle={t('onboarding.cloud.createPassword.description')}
+      title={t('onboarding.cloud.createPassword.title')}
+    >
+      <CloudBackupPasswordForm navigateToNextScreen={navigateToNextScreen} />
+    </SafeKeyboardOnboardingScreen>
   )
 }
diff --git a/apps/mobile/src/screens/Onboarding/LandingScreen.tsx b/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
index 1b1536467cf..e615866b3b9 100644
--- a/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
@@ -2,7 +2,7 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAnimatedStyle, useSharedValue, withDelay, withTiming } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { Screen } from 'src/components/layout/Screen'
 import { openModal } from 'src/features/modals/modalSlice'
@@ -16,7 +16,6 @@ import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { ImportType, OnboardingEntryPoint } from 'uniswap/src/types/onboarding'
 import { OnboardingScreens, UnitagScreens } from 'uniswap/src/types/screens/mobile'
 import { isDevEnv } from 'utilities/src/environment'
-import { isDetoxBuild } from 'utilities/src/environment/constants'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { useTimeout } from 'utilities/src/time/timing'
 import { LANDING_ANIMATION_DURATION, LandingBackground } from 'wallet/src/components/landing/LandingBackground'
@@ -25,17 +24,14 @@ import { useCanAddressClaimUnitag } from 'wallet/src/features/unitags/hooks'
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.Landing>
 
 export function LandingScreen({ navigation }: Props): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
 
   const actionButtonsOpacity = useSharedValue(0)
   const actionButtonsStyle = useAnimatedStyle(() => ({ opacity: actionButtonsOpacity.value }), [actionButtonsOpacity])
 
   useEffect(() => {
-    // disables looping animation during detox e2e tests which was preventing js thread from idle
-    if (!isDetoxBuild) {
-      actionButtonsOpacity.value = withDelay(LANDING_ANIMATION_DURATION, withTiming(1, { duration: ONE_SECOND_MS }))
-    }
+    actionButtonsOpacity.value = withDelay(LANDING_ANIMATION_DURATION, withTiming(1, { duration: ONE_SECOND_MS }))
   }, [actionButtonsOpacity])
 
   const { canClaimUnitag } = useCanAddressClaimUnitag()
diff --git a/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx b/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
index 69eafcdb07a..915a8b1edf1 100644
--- a/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
@@ -1,8 +1,9 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert, Image, Platform, StyleSheet } from 'react-native'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
+import { BackButton } from 'src/components/buttons/BackButton'
 import { useBiometricContext } from 'src/features/biometrics/context'
 import { useBiometricAppSettings } from 'src/features/biometrics/hooks'
 import { promptPushPermission } from 'src/features/notifications/Onesignal'
@@ -14,7 +15,7 @@ import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import i18n from 'uniswap/src/i18n/i18n'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
-import { OnboardingEntryPoint } from 'uniswap/src/types/onboarding'
+import { ImportType, OnboardingEntryPoint } from 'uniswap/src/types/onboarding'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
 import { isIOS } from 'utilities/src/platform'
 import { useOnboardingContext } from 'wallet/src/features/onboarding/OnboardingContext'
@@ -45,6 +46,29 @@ export function NotificationsSetupScreen({ navigation, route: { params } }: Prop
 
   const onCompleteOnboarding = useCompleteOnboardingCallback(params)
 
+  const renderBackButton = useCallback(
+    (nav: OnboardingScreens): JSX.Element => (
+      <BackButton onPressBack={(): void => navigation.navigate({ name: nav, params, merge: true })} />
+    ),
+    [navigation, params],
+  )
+
+  /* For some screens, we want to override the back button to go to a different screen.
+   * This helps avoid re-visiting loading states or confirmation views.
+   */
+  useEffect(() => {
+    const shouldOverrideBackButton = [ImportType.SeedPhrase, ImportType.Restore, ImportType.CreateNew].includes(
+      params.importType,
+    )
+    if (shouldOverrideBackButton) {
+      const nextScreen =
+        params.importType === ImportType.Restore ? OnboardingScreens.RestoreCloudBackup : OnboardingScreens.Backup
+      navigation.setOptions({
+        headerLeft: () => renderBackButton(nextScreen),
+      })
+    }
+  }, [navigation, params, renderBackButton])
+
   const navigateToNextScreen = useCallback(async () => {
     // Skip security setup if already enabled or already imported seed phrase
     if (
@@ -67,11 +91,7 @@ export function NotificationsSetupScreen({ navigation, route: { params } }: Prop
   }, [enableNotifications, navigateToNextScreen])
 
   return (
-    <OnboardingScreen
-      disableGoBack
-      subtitle={t('onboarding.notification.subtitle')}
-      title={t('onboarding.notification.title')}
-    >
+    <OnboardingScreen subtitle={t('onboarding.notification.subtitle')} title={t('onboarding.notification.title')}>
       <Flex centered shrink py={isIOS ? '$spacing60' : '$spacing16'}>
         <NotificationsBackgroundImage />
       </Flex>
diff --git a/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx b/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
index 1ce5957e73f..703ded63d20 100644
--- a/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
@@ -3,7 +3,7 @@ import { BlurView } from 'expo-blur'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, Alert, Image, Platform, StyleSheet } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { BiometricAuthWarningModal } from 'src/components/Settings/BiometricAuthWarningModal'
 import { enroll, tryLocalAuthenticate } from 'src/features/biometrics'
@@ -26,8 +26,8 @@ import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { ImportType } from 'uniswap/src/types/onboarding'
 import { OnboardingScreens } from 'uniswap/src/types/screens/mobile'
-import { opacify } from 'uniswap/src/utils/colors'
 import { isIOS } from 'utilities/src/platform'
+import { opacify } from 'wallet/src/utils/colors'
 import { openSettings } from 'wallet/src/utils/linking'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.Security>
@@ -35,7 +35,7 @@ type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.
 export function SecuritySetupScreen({ route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isDarkMode = useIsDarkMode()
 
   const [isLoadingAccount, setIsLoadingAccount] = useState(false)
diff --git a/apps/mobile/src/screens/Onboarding/TermsOfService.tsx b/apps/mobile/src/screens/Onboarding/TermsOfService.tsx
index 447d6f5eaa8..b30de807e53 100644
--- a/apps/mobile/src/screens/Onboarding/TermsOfService.tsx
+++ b/apps/mobile/src/screens/Onboarding/TermsOfService.tsx
@@ -1,7 +1,7 @@
 import { Trans } from 'react-i18next'
 import { Text } from 'ui/src'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
-import { openUri } from 'uniswap/src/utils/linking'
+import { openUri } from 'wallet/src/utils/linking'
 
 export function TermsOfService(): JSX.Element {
   return (
diff --git a/apps/mobile/src/screens/ReceiveCryptoModal.tsx b/apps/mobile/src/screens/ReceiveCryptoModal.tsx
index bb3330df2a2..6e7a267877b 100644
--- a/apps/mobile/src/screens/ReceiveCryptoModal.tsx
+++ b/apps/mobile/src/screens/ReceiveCryptoModal.tsx
@@ -1,6 +1,5 @@
 import { SharedEventName } from '@uniswap/analytics-events'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'src/app/hooks'
 import { ServiceProviderSelector } from 'src/features/fiatOnRamp/ExchangeTransferServiceProviderSelector'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
@@ -11,19 +10,20 @@ import { iconSizes } from 'ui/src/theme'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { ScannerModalState } from 'wallet/src/components/QRCodeScanner/constants'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 const ACCOUNT_IMAGE_SIZE = 52
 const ICON_SIZE = 32
 const ICON_BORDER_RADIUS = 100
 
 function AccountCardItem({ onClose }: { onClose: () => void }): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
 
   const onPressCopyAddress = async (): Promise<void> => {
@@ -98,7 +98,7 @@ function AccountCardItem({ onClose }: { onClose: () => void }): JSX.Element {
 
 export function ReceiveCryptoModal(): JSX.Element {
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const { initialState } = useAppSelector(selectModalState(ModalName.ReceiveCryptoModal))
 
diff --git a/apps/mobile/src/screens/SettingsAppearanceScreen.tsx b/apps/mobile/src/screens/SettingsAppearanceScreen.tsx
index 0d8cfebeb58..bc0f5b4ca55 100644
--- a/apps/mobile/src/screens/SettingsAppearanceScreen.tsx
+++ b/apps/mobile/src/screens/SettingsAppearanceScreen.tsx
@@ -2,7 +2,7 @@ import { Action } from '@reduxjs/toolkit'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SvgProps } from 'react-native-svg'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
@@ -60,7 +60,7 @@ interface AppearanceOptionProps {
 
 function AppearanceOption({ active, title, subtitle, Icon, option }: AppearanceOptionProps): JSX.Element {
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const showCheckMark = active ? 1 : 0
 
diff --git a/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx b/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
index 436e62d703a..0435f5c303d 100644
--- a/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
+++ b/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert, ListRenderItemInfo } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { BiometricAuthWarningModal } from 'src/components/Settings/BiometricAuthWarningModal'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
@@ -38,7 +38,7 @@ type BiometricPromptTriggerArgs = {
 
 export function SettingsBiometricAuthScreen(): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const [showUnsafeWarningModal, setShowUnsafeWarningModal] = useState(false)
   const [unsafeWarningModalType, setUnsafeWarningModalType] = useState<BiometricSettingType | null>(null)
diff --git a/apps/mobile/src/screens/SettingsCloudBackupPasswordConfirmScreen.tsx b/apps/mobile/src/screens/SettingsCloudBackupPasswordConfirmScreen.tsx
index 9a7c3e4a61c..f150e6e04f1 100644
--- a/apps/mobile/src/screens/SettingsCloudBackupPasswordConfirmScreen.tsx
+++ b/apps/mobile/src/screens/SettingsCloudBackupPasswordConfirmScreen.tsx
@@ -1,10 +1,11 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { ScrollView } from 'react-native'
 import { SettingsStackParamList } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
-import { SafeKeyboardScreen } from 'src/components/layout/SafeKeyboardScreen'
-import { CloudBackupPassword } from 'src/features/CloudBackup/CloudBackupForm'
+import { Screen } from 'src/components/layout/Screen'
+import { CloudBackupPasswordForm } from 'src/features/CloudBackup/CloudBackupPasswordForm'
 import { Flex, Text } from 'ui/src'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 
@@ -14,29 +15,19 @@ export function SettingsCloudBackupPasswordConfirmScreen({ navigation, route: {
   const { t } = useTranslation()
   const { password } = params
 
-  const navigateToNextScreen = useCallback((): void => {
+  const navigateToNextScreen = (): void => {
     navigation.navigate({
       name: MobileScreens.SettingsCloudBackupProcessing,
       params,
       merge: true,
     })
-  }, [navigation, params])
+  }
 
   return (
-    <CloudBackupPassword.FormProvider
-      isConfirmation={true}
-      navigateToNextScreen={navigateToNextScreen}
-      passwordToConfirm={password}
-    >
-      <SafeKeyboardScreen
-        footer={
-          <Flex mx="$spacing16" my="$spacing12">
-            <CloudBackupPassword.ContinueButton />
-          </Flex>
-        }
-        header={<BackHeader mx="$spacing16" my="$spacing16" />}
-      >
-        <Flex alignItems="center" gap="$spacing12" justifyContent="space-between" mb="$spacing24" mx="$spacing12">
+    <Screen mx="$spacing16" my="$spacing16">
+      <BackHeader mb="$spacing16" />
+      <ScrollView bounces={false} keyboardShouldPersistTaps="handled">
+        <Flex alignItems="center" justifyContent="space-between" mb="$spacing24" mx="$spacing12">
           <Text textAlign="center" variant="heading3">
             {t('onboarding.cloud.confirm.title')}
           </Text>
@@ -44,8 +35,12 @@ export function SettingsCloudBackupPasswordConfirmScreen({ navigation, route: {
             {t('onboarding.cloud.confirm.description')}
           </Text>
         </Flex>
-        <CloudBackupPassword.PasswordInput />
-      </SafeKeyboardScreen>
-    </CloudBackupPassword.FormProvider>
+        <CloudBackupPasswordForm
+          isConfirmation={true}
+          navigateToNextScreen={navigateToNextScreen}
+          passwordToConfirm={password}
+        />
+      </ScrollView>
+    </Screen>
   )
 }
diff --git a/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx b/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
index 3e98b749fbe..e386b1dfd2e 100644
--- a/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
+++ b/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
@@ -1,10 +1,11 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { ScrollView } from 'react-native'
 import { SettingsStackParamList } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
-import { SafeKeyboardScreen } from 'src/components/layout/SafeKeyboardScreen'
-import { CloudBackupPassword } from 'src/features/CloudBackup/CloudBackupForm'
+import { Screen } from 'src/components/layout/Screen'
+import { CloudBackupPasswordForm } from 'src/features/CloudBackup/CloudBackupPasswordForm'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import { OSDynamicCloudIcon } from 'ui/src/components/icons'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
@@ -27,32 +28,23 @@ export function SettingsCloudBackupPasswordCreateScreen({
 
   const [showCloudBackupInfoModal, setShowCloudBackupInfoModal] = useState(true)
 
-  const navigateToNextScreen = useCallback(
-    ({ password }: { password: string }): void => {
-      navigation.navigate({
-        name: MobileScreens.SettingsCloudBackupPasswordConfirm,
-        params: {
-          password,
-          address,
-        },
-        merge: true,
-      })
-    },
-    [navigation, address],
-  )
+  const navigateToNextScreen = ({ password }: { password: string }): void => {
+    navigation.navigate({
+      name: MobileScreens.SettingsCloudBackupPasswordConfirm,
+      params: {
+        password,
+        address,
+      },
+      merge: true,
+    })
+  }
 
   return (
-    <CloudBackupPassword.FormProvider navigateToNextScreen={navigateToNextScreen}>
-      <SafeKeyboardScreen
-        footer={
-          <Flex mx="$spacing16" my="$spacing12">
-            <CloudBackupPassword.ContinueButton />
-          </Flex>
-        }
-        header={<BackHeader mx="$spacing16" my="$spacing16" />}
-      >
-        <Flex gap="$spacing12" mb="$spacing24" mx="$spacing12">
-          <Text textAlign="center" variant="heading3">
+    <Screen mx="$spacing16" my="$spacing16">
+      <BackHeader mb="$spacing16" />
+      <ScrollView bounces={false} keyboardShouldPersistTaps="handled">
+        <Flex alignItems="center" justifyContent="space-between" mb="$spacing24" mx="$spacing12">
+          <Text variant="heading3">
             {t('settings.setting.backup.create.title', {
               cloudProviderName: getCloudProviderName(),
             })}
@@ -63,7 +55,7 @@ export function SettingsCloudBackupPasswordCreateScreen({
             })}
           </Text>
         </Flex>
-        <CloudBackupPassword.PasswordInput />
+        <CloudBackupPasswordForm navigateToNextScreen={navigateToNextScreen} />
         {showCloudBackupInfoModal && (
           <BottomSheetModal backgroundColor={colors.surface2.get()} name={ModalName.CloudBackupInfo}>
             <Flex px="$spacing16" py="$spacing12">
@@ -93,7 +85,7 @@ export function SettingsCloudBackupPasswordCreateScreen({
             </Flex>
           </BottomSheetModal>
         )}
-      </SafeKeyboardScreen>
-    </CloudBackupPassword.FormProvider>
+      </ScrollView>
+    </Screen>
   )
 }
diff --git a/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx b/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
index b6db1368cfb..7222c295581 100644
--- a/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
+++ b/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
@@ -2,7 +2,7 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { SettingsStackParamList } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
@@ -33,7 +33,7 @@ export function SettingsCloudBackupStatus({
 }: Props): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const accounts = useAccounts()
   const mnemonicId = (accounts[address] as SignerMnemonicAccount)?.mnemonicId
   const backups = useCloudBackups(mnemonicId)
diff --git a/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx b/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
index 8128ff32dad..9ed87f7be38 100644
--- a/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
+++ b/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { Action } from 'redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { VirtualizedList } from 'src/components/layout/VirtualizedList'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
@@ -13,7 +13,7 @@ import { useAppFiatCurrency, useFiatCurrencyInfo } from 'wallet/src/features/fia
 import { setCurrentFiatCurrency } from 'wallet/src/features/fiatCurrency/slice'
 
 export function SettingsFiatCurrencyModal(): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
 
   return (
@@ -55,7 +55,7 @@ interface FiatCurrencyOptionProps {
 }
 
 function FiatCurrencyOption({ active, currency, onPress }: FiatCurrencyOptionProps): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
   const { name, code } = useFiatCurrencyInfo(currency)
 
diff --git a/apps/mobile/src/screens/SettingsScreen.tsx b/apps/mobile/src/screens/SettingsScreen.tsx
index bc256a75f9e..da09e9bff34 100644
--- a/apps/mobile/src/screens/SettingsScreen.tsx
+++ b/apps/mobile/src/screens/SettingsScreen.tsx
@@ -5,6 +5,7 @@ import { Image, ListRenderItemInfo, SectionList, StyleSheet } from 'react-native
 import { FadeInDown, FadeOutUp } from 'react-native-reanimated'
 import { SvgProps } from 'react-native-svg'
 import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import {
   OnboardingStackNavigationProp,
   SettingsStackNavigationProp,
@@ -74,7 +75,7 @@ import {
 
 export function SettingsScreen(): JSX.Element {
   const navigation = useNavigation<SettingsStackNavigationProp & OnboardingStackNavigationProp>()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const colors = useSporeColors()
   const insets = useDeviceInsets()
   const { deviceSupportsBiometrics } = useBiometricContext()
diff --git a/apps/mobile/src/screens/SettingsWallet.tsx b/apps/mobile/src/screens/SettingsWallet.tsx
index 98e3e96bfcc..fcb90da361e 100644
--- a/apps/mobile/src/screens/SettingsWallet.tsx
+++ b/apps/mobile/src/screens/SettingsWallet.tsx
@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ListRenderItemInfo, SectionList } from 'react-native'
 import { SvgProps } from 'react-native-svg'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import {
   OnboardingStackNavigationProp,
@@ -54,7 +54,7 @@ export function SettingsWallet({
     params: { address },
   },
 }: Props): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const colors = useSporeColors()
   const addressToAccount = useAccounts()
diff --git a/apps/mobile/src/screens/SettingsWalletEdit.tsx b/apps/mobile/src/screens/SettingsWalletEdit.tsx
index 1a01d92df45..4050c948f36 100644
--- a/apps/mobile/src/screens/SettingsWalletEdit.tsx
+++ b/apps/mobile/src/screens/SettingsWalletEdit.tsx
@@ -3,7 +3,7 @@ import React, { useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard, KeyboardAvoidingView, TextInput as NativeTextInput, StyleSheet } from 'react-native'
 import { Gesture, GestureDetector } from 'react-native-gesture-handler'
-import { useDispatch } from 'react-redux'
+import { useAppDispatch } from 'src/app/hooks'
 import { SettingsStackParamList } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
@@ -29,7 +29,7 @@ export function SettingsWalletEdit({
   },
 }: Props): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAccount = useAccounts()[address]
   const displayName = useDisplayName(address)
   const [nickname, setNickname] = useState(displayName?.name)
diff --git a/apps/mobile/src/screens/SettingsWalletManageConnection.tsx b/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
index d24aa95ffee..a7e8212e68e 100644
--- a/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
+++ b/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
@@ -1,7 +1,7 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React from 'react'
 import { SettingsStackParamList } from 'src/app/navigation/types'
-import { ConnectedDappsList } from 'src/components/Requests/ConnectedDapps/ConnectedDappsList'
+import { ConnectedDappsList } from 'src/components/WalletConnect/ConnectedDapps/ConnectedDappsList'
 import { Screen } from 'src/components/layout/Screen'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
diff --git a/apps/mobile/src/screens/TokenDetailsScreen.tsx b/apps/mobile/src/screens/TokenDetailsScreen.tsx
index f2518b5e759..9450be0e612 100644
--- a/apps/mobile/src/screens/TokenDetailsScreen.tsx
+++ b/apps/mobile/src/screens/TokenDetailsScreen.tsx
@@ -34,22 +34,22 @@ import {
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import { currencyIdToContractInput } from 'uniswap/src/features/dataApi/utils'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import TokenWarningModal from 'uniswap/src/features/tokens/TokenWarningModal'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { currencyIdToAddress, currencyIdToChain } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { Language } from 'wallet/src/features/language/constants'
 import { useCurrentLanguage } from 'wallet/src/features/language/hooks'
 import { useTokenContextMenu } from 'wallet/src/features/portfolio/useTokenContextMenu'
+import TokenWarningModal from 'wallet/src/features/tokens/TokenWarningModal'
 import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 function HeaderTitleElement({
   data,
@@ -249,7 +249,6 @@ function TokenDetails({
               currencyId={_currencyId}
               currentChainBalance={currentChainBalance}
               data={data}
-              isBlocked={safetyLevel === SafetyLevel.Blocked}
               setEllipsisMenuVisible={setEllipsisMenuVisible}
             />
           )
@@ -344,13 +343,11 @@ function TokenDetailsTextPlaceholders(): JSX.Element {
 function HeaderRightElement({
   currencyId,
   currentChainBalance,
-  isBlocked,
   data,
   setEllipsisMenuVisible,
 }: {
   currencyId: string
   currentChainBalance: PortfolioBalance | null
-  isBlocked: boolean
   data?: TokenDetailsScreenQuery
   setEllipsisMenuVisible: (visible: boolean) => void
 }): JSX.Element {
@@ -359,7 +356,6 @@ function HeaderRightElement({
 
   const { menuActions, onContextMenuPress } = useTokenContextMenu({
     currencyId,
-    isBlocked,
     tokenSymbolForNotification: data?.token?.symbol,
     portfolioBalance: currentChainBalance,
   })
diff --git a/apps/mobile/src/test/fixtures/explore.ts b/apps/mobile/src/test/fixtures/explore.ts
index e07b29ee36e..ab7a4c5f05e 100644
--- a/apps/mobile/src/test/fixtures/explore.ts
+++ b/apps/mobile/src/test/fixtures/explore.ts
@@ -1,9 +1,9 @@
 import { TokenItemData } from 'src/components/explore/TokenItem'
 import { Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { createFixture } from 'uniswap/src/test/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { token } from 'wallet/src/test/fixtures'
+import { createFixture } from 'wallet/src/test/utils'
 
 type TokenItemDataOptions = {
   token: Token | null
diff --git a/apps/mobile/src/test/fixtures/redux.ts b/apps/mobile/src/test/fixtures/redux.ts
index 6490a00aefe..cc92aacb098 100644
--- a/apps/mobile/src/test/fixtures/redux.ts
+++ b/apps/mobile/src/test/fixtures/redux.ts
@@ -2,10 +2,10 @@ import { PreloadedState } from 'redux'
 import { MobileState } from 'src/app/reducer'
 import { ModalsState } from 'src/features/modals/ModalsState'
 import { initialModalsState } from 'src/features/modals/modalSlice'
-import { createFixture } from 'uniswap/src/test/utils'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { SharedState } from 'wallet/src/state/reducer'
 import { preloadedSharedState } from 'wallet/src/test/fixtures'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const preloadedModalsState = createFixture<ModalsState>()(() => ({
   ...initialModalsState,
diff --git a/apps/mobile/src/test/render.tsx b/apps/mobile/src/test/render.tsx
index 2ea941ef4c8..44bc8e3a359 100644
--- a/apps/mobile/src/test/render.tsx
+++ b/apps/mobile/src/test/render.tsx
@@ -13,14 +13,13 @@ import React, { PropsWithChildren } from 'react'
 import { MobileWalletNavigationProvider } from 'src/app/MobileWalletNavigationProvider'
 import { navigationRef } from 'src/app/navigation/NavigationContainer'
 import type { MobileState } from 'src/app/reducer'
-import { store as appStore, persistedReducer } from 'src/app/store'
+import type { AppStore } from 'src/app/store'
+import { persistedReducer } from 'src/app/store'
 import { Resolvers } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
 import { SharedProvider } from 'wallet/src/provider'
 import { AutoMockedApolloProvider } from 'wallet/src/test/mocks/gql/provider'
 
-type AppStore = typeof appStore
-
 // This type extends the default options for render from RTL, as well
 // as allows the user to specify other things such as initialState, store.
 type ExtendedRenderOptions = RenderOptions & {
diff --git a/apps/mobile/src/utils/reanimated.test.ts b/apps/mobile/src/utils/reanimated.test.ts
index ac56b746912..57304b7909d 100644
--- a/apps/mobile/src/utils/reanimated.test.ts
+++ b/apps/mobile/src/utils/reanimated.test.ts
@@ -28,7 +28,7 @@ describe('reanimated numberToLocaleStringWorklet', function () {
       numberToLocaleStringWorklet(num, 'en-US', {
         style: 'currency',
         currency: 'USD',
-      }),
+      })
     ).toBe('<$0.0000000000000001')
   })
 
@@ -39,7 +39,7 @@ describe('reanimated numberToLocaleStringWorklet', function () {
       numberToLocaleStringWorklet(num, 'en-US', {
         style: 'currency',
         currency: 'USD',
-      }),
+      })
     ).toBe('$0.0000000123')
   })
 
@@ -121,49 +121,49 @@ describe('reanimated numberToLocaleStringWorklet', function () {
       numberToLocaleStringWorklet(num, 'en-US', {
         style,
         currency,
-      }),
+      })
     ).toBe('$1,234.56')
 
     expect(
       numberToLocaleStringWorklet(negative_num, 'en-US', {
         style,
         currency,
-      }),
+      })
     ).toBe('-$1,234.56')
 
     expect(
       numberToLocaleStringWorklet(num, 'de-DE', {
         style,
         currency,
-      }),
+      })
     ).toBe('1.234,56 $')
 
     expect(
       numberToLocaleStringWorklet(num, 'hu', {
         style,
         currency: 'huf',
-      }),
+      })
     ).toBe('1\u00A0234,56 Ft')
 
     expect(
       numberToLocaleStringWorklet(num, 'hu-HU', {
         style,
         currency: 'huf',
-      }),
+      })
     ).toBe('1\u00A0234,56 Ft')
 
     expect(
       numberToLocaleStringWorklet(num, 'da-DK', {
         style,
         currency: 'DKK',
-      }),
+      })
     ).toBe('1.234,56 kr')
 
     expect(
       numberToLocaleStringWorklet(num, 'nb-NO', {
         style,
         currency: 'NOK',
-      }),
+      })
     ).toBe('1\u00A0234,56 kr')
   })
 
diff --git a/apps/mobile/src/utils/useAddBackButton.test.ts b/apps/mobile/src/utils/useAddBackButton.test.ts
index 80d505dfb2a..4dbb1b5f514 100644
--- a/apps/mobile/src/utils/useAddBackButton.test.ts
+++ b/apps/mobile/src/utils/useAddBackButton.test.ts
@@ -13,7 +13,7 @@ describe(useAddBackButton, () => {
           index: 0,
         }),
         setOptions: setOptionsSpy,
-      } as unknown as NativeStackNavigationProp<OnboardingStackParamList>),
+      } as unknown as NativeStackNavigationProp<OnboardingStackParamList>)
     )
 
     expect(setOptionsSpy).toHaveBeenCalled()
@@ -26,7 +26,7 @@ describe(useAddBackButton, () => {
           index: 1,
         }),
         setOptions: setOptionsSpy,
-      } as unknown as NativeStackNavigationProp<OnboardingStackParamList>),
+      } as unknown as NativeStackNavigationProp<OnboardingStackParamList>)
     )
 
     expect(setOptionsSpy).not.toHaveBeenCalled()
diff --git a/apps/mobile/src/utils/useSagaStatus.ts b/apps/mobile/src/utils/useSagaStatus.ts
index 2b8e6129ea2..02e6c1df5e6 100644
--- a/apps/mobile/src/utils/useSagaStatus.ts
+++ b/apps/mobile/src/utils/useSagaStatus.ts
@@ -1,12 +1,11 @@
 import { useEffect } from 'react'
-import { useDispatch } from 'react-redux'
-import { useAppSelector } from 'src/app/hooks'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { monitoredSagas } from 'src/app/saga'
 import { SagaState, SagaStatus } from 'wallet/src/utils/saga'
 
 // Convenience hook to get the status + error of an active saga
 export function useSagaStatus(sagaName: string, onSuccess?: () => void, resetSagaOnSuccess = true): SagaState {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const sagaState = useAppSelector((s): SagaState | undefined => s.saga[sagaName])
   if (!sagaState) {
     throw new Error(`No saga state found, is sagaName valid? Name: ${sagaName}`)
diff --git a/apps/web/.eslintrc.js b/apps/web/.eslintrc.js
index 713f9fe66e3..d3201301d82 100644
--- a/apps/web/.eslintrc.js
+++ b/apps/web/.eslintrc.js
@@ -58,10 +58,6 @@ module.exports = {
           'error',
           {
             paths: [
-              {
-                name: 'styled-components',
-                message: 'Styled components is deprecated, please use Flex or styled from "ui/src" instead.'
-              },
               {
                 name: 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks',
                 importNames: ['usePortfolioBalancesQuery', 'usePortfolioBalancesWebLazyQuery'],
diff --git a/apps/web/functions/components/metaTagInjector.test.ts b/apps/web/functions/components/metaTagInjector.test.ts
index 9fd7689e7e0..4a3bf697fef 100644
--- a/apps/web/functions/components/metaTagInjector.test.ts
+++ b/apps/web/functions/components/metaTagInjector.test.ts
@@ -13,7 +13,7 @@ test('should append meta tag to element', () => {
       image: 'testImage',
       description: 'testDescription',
     },
-    new Request('http://localhost'),
+    new Request('http://localhost')
   )
   injector.appendProperty(element, property, content)
   expect(element.append).toHaveBeenCalledWith(`<meta property="${property}" content="${content}" data-rh="true">`, {
@@ -31,7 +31,7 @@ test('should append meta tag to element', () => {
     `<meta property="og:description" content="testDescription" data-rh="true">`,
     {
       html: true,
-    },
+    }
   )
   expect(element.append).toHaveBeenCalledWith(`<meta property="og:image" content="testImage" data-rh="true">`, {
     html: true,
@@ -56,7 +56,7 @@ test('should append meta tag to element', () => {
     `<meta property="twitter:card" content="summary_large_image" data-rh="true">`,
     {
       html: true,
-    },
+    }
   )
   expect(element.append).toHaveBeenCalledWith(`<meta property="twitter:title" content="test" data-rh="true">`, {
     html: true,
@@ -84,7 +84,7 @@ test('should pass through header blocked paths', () => {
       image: 'testImage',
       description: 'testDescription',
     },
-    request,
+    request
   )
   injector.element(element)
   expect(element.append).toHaveBeenCalledWith(`<meta property="x:blocked-paths" content="/" data-rh="true">`, {
diff --git a/apps/web/functions/default.test.ts b/apps/web/functions/default.test.ts
index 386f09113dc..293ccf78d85 100644
--- a/apps/web/functions/default.test.ts
+++ b/apps/web/functions/default.test.ts
@@ -6,7 +6,7 @@ test.each(defaultUrls)('should inject metadata for valid collections', async (de
   expect(body).toContain(`<meta property="og:description" content="Swap or provide liquidity on the Uniswap Protocol"`)
   expect(body).toContain(`<meta name="description" content="Swap or provide liquidity on the Uniswap Protocol"`)
   expect(body).toContain(
-    `<meta property="og:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"`,
+    `<meta property="og:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"`
   )
   expect(body).toContain(`<meta property="og:image:width" content="1200"`)
   expect(body).toContain(`<meta property="og:image:height" content="630"`)
@@ -15,7 +15,7 @@ test.each(defaultUrls)('should inject metadata for valid collections', async (de
   expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"`)
   expect(body).toContain(`<meta property="twitter:title" content="Uniswap Interface"`)
   expect(body).toContain(
-    `<meta property="twitter:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"`,
+    `<meta property="twitter:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"`
   )
   expect(body).toContain(`<meta property="twitter:image:alt" content="Uniswap Interface"`)
 })
diff --git a/apps/web/functions/explore/tokens/token.test.ts b/apps/web/functions/explore/tokens/token.test.ts
index 1e343e8634a..e6e27ca7742 100644
--- a/apps/web/functions/explore/tokens/token.test.ts
+++ b/apps/web/functions/explore/tokens/token.test.ts
@@ -40,15 +40,15 @@ test.each(tokens)('should inject metadata for valid tokens', async (token) => {
   expect(body).toContain(`<meta property="og:type" content="website" data-rh="true">`)
   expect(body).toContain(`<meta property="og:url" content="${url}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="og:image:alt" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`,
+    `<meta property="og:image:alt" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:card" content="summary_large_image" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:title" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`,
+    `<meta property="twitter:title" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:image" content="${token.image}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:image:alt" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`,
+    `<meta property="twitter:image:alt" content="Get ${token.tokenData.symbol} on Uniswap" data-rh="true">`
   )
 })
 
diff --git a/apps/web/functions/nfts/asset/nft.test.ts b/apps/web/functions/nfts/asset/nft.test.ts
index 4c7d659df8f..954c5d7c096 100644
--- a/apps/web/functions/nfts/asset/nft.test.ts
+++ b/apps/web/functions/nfts/asset/nft.test.ts
@@ -32,15 +32,15 @@ test.each(assets)('should inject metadata for valid assets', async (nft) => {
   expect(body).toContain(`<meta property="og:type" content="website" data-rh="true">`)
   expect(body).toContain(`<meta property="og:url" content="${url}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="og:image:alt" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`,
+    `<meta property="og:image:alt" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:card" content="summary_large_image" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:title" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`,
+    `<meta property="twitter:title" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:image" content="${nft.image}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:image:alt" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`,
+    `<meta property="twitter:image:alt" content="${nft.collectionName} #${nft.assetId}" data-rh="true">`
   )
 })
 
diff --git a/apps/web/functions/nfts/collection/collection.test.ts b/apps/web/functions/nfts/collection/collection.test.ts
index d05d2888e97..a5987294a8a 100644
--- a/apps/web/functions/nfts/collection/collection.test.ts
+++ b/apps/web/functions/nfts/collection/collection.test.ts
@@ -29,15 +29,15 @@ test.each([...collections])('should inject metadata for collections', async (col
   expect(body).toContain(`<meta property="og:type" content="website" data-rh="true">`)
   expect(body).toContain(`<meta property="og:url" content="${url}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="og:image:alt" content="${collection.collectionName} on Uniswap" data-rh="true">`,
+    `<meta property="og:image:alt" content="${collection.collectionName} on Uniswap" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:card" content="summary_large_image" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:title" content="${collection.collectionName} on Uniswap" data-rh="true">`,
+    `<meta property="twitter:title" content="${collection.collectionName} on Uniswap" data-rh="true">`
   )
   expect(body).toContain(`<meta property="twitter:image" content="${collection.image}" data-rh="true">`)
   expect(body).toContain(
-    `<meta property="twitter:image:alt" content="${collection.collectionName} on Uniswap" data-rh="true">`,
+    `<meta property="twitter:image:alt" content="${collection.collectionName} on Uniswap" data-rh="true">`
   )
 })
 
@@ -69,5 +69,5 @@ test.each([...invalidCollections, ...nonexistentCollections])(
     expect(body).not.toContain('twitter:title')
     expect(body).not.toContain('twitter:image')
     expect(body).not.toContain('twitter:image:alt')
-  },
+  }
 )
diff --git a/apps/web/package.json b/apps/web/package.json
index 859aa1f5a81..b494ba04d74 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "ajv": "node scripts/compile-ajv-validators.js",
     "check:deps:usage": "depcheck",
-    "check:circular": "concurrently \"../../scripts/check-circular-imports.sh ./src/pages/App.tsx 7\" \"../../scripts/check-circular-imports.sh ./src/setupTests.ts 0\"",
+    "check:circular": "concurrently \"../../scripts/check-circular-imports.sh ./src/pages/App.tsx 6\" \"../../scripts/check-circular-imports.sh ./src/setupTests.ts 0\"",
     "sitemap:generate": "node scripts/generate-sitemap.js",
     "i18n:upload": "./scripts/crowdin.sh upload",
     "i18n:download": "./scripts/crowdin.sh download",
@@ -172,8 +172,8 @@
     "@reach/dialog": "0.10.5",
     "@reach/portal": "0.10.5",
     "@reduxjs/toolkit": "1.9.3",
-    "@rive-app/canvas": "2.19.0",
-    "@rive-app/react-canvas": "4.13.0",
+    "@rive-app/canvas": "2.8.3",
+    "@rive-app/react-canvas": "4.6.2",
     "@sentry/browser": "7.80.0",
     "@sentry/core": "7.80.0",
     "@sentry/react": "7.80.0",
@@ -188,7 +188,7 @@
     "@types/react-scroll-sync": "0.8.7",
     "@types/react-window-infinite-loader": "1.0.6",
     "@uniswap/analytics": "1.7.0",
-    "@uniswap/analytics-events": "2.34.0",
+    "@uniswap/analytics-events": "2.32.0",
     "@uniswap/governance": "1.0.2",
     "@uniswap/liquidity-staker": "1.0.2",
     "@uniswap/merkle-distributor": "1.0.1",
diff --git a/apps/web/public/csp.json b/apps/web/public/csp.json
index a6c42c61cd3..eda10105b3c 100644
--- a/apps/web/public/csp.json
+++ b/apps/web/public/csp.json
@@ -5,7 +5,6 @@
   "scriptSrc": [
     "'self'",
     "data:",
-    "'wasm-unsafe-eval'",
     "https://translate.googleapis.com/",
     "https://www.google-analytics.com",
     "https://www.googletagmanager.com"
@@ -54,6 +53,7 @@
     "https://bsc-dataseed1.bnbchain.org",
     "https://buy.moonpay.com/",
     "https://cdn.center.app/",
+    "https://cdn.jsdelivr.net/npm/@rive-app/canvas@2.8.3/rive.wasm",
     "https://celo-org.github.io",
     "https://cloudflare-eth.com",
     "https://cloudflare-ipfs.com",
diff --git a/apps/web/public/images/extension_promo/announcement_modal_desktop.png b/apps/web/public/images/extension_promo/announcement_modal_desktop.png
deleted file mode 100644
index c1778ee1662..00000000000
Binary files a/apps/web/public/images/extension_promo/announcement_modal_desktop.png and /dev/null differ
diff --git a/apps/web/public/images/extension_promo/announcement_modal_mobile.png b/apps/web/public/images/extension_promo/announcement_modal_mobile.png
deleted file mode 100644
index f0e413edcd3..00000000000
Binary files a/apps/web/public/images/extension_promo/announcement_modal_mobile.png and /dev/null differ
diff --git a/apps/web/public/images/extension_promo/background_connector.png b/apps/web/public/images/extension_promo/background_connector.png
deleted file mode 100644
index dddebd5ff1d..00000000000
Binary files a/apps/web/public/images/extension_promo/background_connector.png and /dev/null differ
diff --git a/apps/web/public/index.html b/apps/web/public/index.html
index 306ebf05863..35eec4bc21f 100644
--- a/apps/web/public/index.html
+++ b/apps/web/public/index.html
@@ -19,8 +19,6 @@
     <!-- Skip the CSP in specified test environments -->
     <% if (!process.env.REACT_APP_SKIP_CSP) { %>
       <% let cspConfig = require('./csp.json'); %>
-      <!-- For removing unsafe inline styles-->
-      <% let cspStyleNonce = require('crypto').randomUUID().replaceAll('-','') %>
       <!-- Allow vercel feedback in preview environments -->
       <% if (process.env.REACT_APP_STAGING) { %>
         <% const cspDevConfig = require('./vercel-csp.json'); %>
@@ -28,7 +26,7 @@
       <% } %>
       <meta
         http-equiv="Content-Security-Policy" 
-        content="default-src <%= cspConfig.defaultSrc.join(' ') %>; script-src <%= cspConfig.scriptSrc.join(' ') %>; style-src <%= cspConfig.styleSrc.concat(['nonce-'+cspStyleNonce]).join(' ') %>; img-src <%= cspConfig.imgSrc.join(' ') %>; frame-src <%= cspConfig.frameSrc.join(' ') %>; connect-src <%= cspConfig.connectSrc.join(' ') %>; worker-src <%= cspConfig.workerSrc.join(' ') %>;"
+        content="default-src <%= cspConfig.defaultSrc.join(' ') %>; script-src <%= cspConfig.scriptSrc.join(' ') %>; style-src <%= cspConfig.styleSrc.join(' ') %>; img-src <%= cspConfig.imgSrc.join(' ') %>; frame-src <%= cspConfig.frameSrc.join(' ') %>; connect-src <%= cspConfig.connectSrc.join(' ') %>; worker-src <%= cspConfig.workerSrc.join(' ') %>;"
       >
     <% } %>
 
diff --git a/apps/web/public/nfts-sitemap.xml b/apps/web/public/nfts-sitemap.xml
index c1c43d73ed0..5d053264215 100644
--- a/apps/web/public/nfts-sitemap.xml
+++ b/apps/web/public/nfts-sitemap.xml
@@ -2,682 +2,647 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x60e4d786628fea6478f785a6d7e704777c86a7c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x34d85c9cdeb23fa97cb08333b511ac86e1c4e258</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x99a9b7c1116f9ceeb1652de04d5969cce509b069</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb7f7f6c52f2e2fdb1963eab30438024864c313f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x23581767a106ae21c074b2276d25e5c3e136a68b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x8a90cab2b38dba80c64b7734e58ee1db38b8992e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xba30e5f9bb24caa003e9f2f0497ad287fdf95623</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xbd3531da5cf5857e7cfaa92426877b022e612cf8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7bd29408f11d2bfc23c34f18275bbf23bb716bc7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x306b1ea3ecdf94ab739f1910bbda052ed4a9f949</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x1a92f7381b9f03921564a437210bb9396471050c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x5cc5b05a8a13e3fbdb0bb9fccd98d38e50f90c38</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x5af0d9827e0c53e4799bb226655a1de152a425a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x3bf2922f4520a8ba0c2efc3d2a1539678dad5e9d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xe785e82358879f061bc3dcac6f0444462d4b5330</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x76be3b62873462d2142405439777e971754e8e77</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xfd43af6d3fe1b916c026f6ac35b3ede068d1ca01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x1cb1a5e65610aeff2551a50f76a87a7d3fb649c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xff9c1b15b16263c61d017ee9f65c50e4ae0113d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x6339e5e072086621540d0362c4e3cea0d643e114</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb932a70a57673d89f4acffbe830e8ed7f75fb9e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x79fcdef22feed20eddacbb2587640e45491b757f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xa3aee8bce55beea1951ef834b99f3ac60d1abeeb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x769272677fab02575e84945f03eca517acc544cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4db1f25d3d98600140dfc18deb7515be5bd293af</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x34eebee6942d8def3c125458d1a86e0a897fd6f9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x59468516a8259058bad1ca5f8f4bff190d30e066</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x394e3d3044fc89fcdd966d3cb35ac0b32b0cda91</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x60bb1e2aa1c9acafb4d34f71585d7e959f387769</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x28472a58a490c5e09a238847f66a68a47cc76f0f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x341a1c534248966c4b6afad165b98daed4b964ef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x82c7a8f707110f5fbb16184a5933e9f78a34c6ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xccc441ac31f02cd96c153db6fd5fe0a2f4e6a68d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x764aeebcf425d56800ef2c84f2578689415a2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x160c404b2b49cbc3240055ceaee026df1e8497a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xd2f668a8461d6761115daf8aeb3cdf5f40c532c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x39ee2c7b3cb80254225884ca001f57118c8f21b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xd774557b647330c91bf44cfeab205095f7e6c367</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x1792a96e5668ad7c167ab804a100ce42395ce54d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xf87e31492faf9a91b02ee0deaad50d51d56d5d4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x04afa589e2b933f9463c5639f412b183ec062505</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xe75512aa3bec8f00434bbd6ad8b0a3fbff100ad6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x348fc118bcc65a92dc033a951af153d14d945312</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x892848074ddea461a15f337250da3ce55580ca85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x5946aeaab44e65eb370ffaa6a7ef2218cff9b47d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x282bdd42f4eb70e7a9d9f40c8fea0825b7f68c5d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4b15a9c28034dc83db40cd810001427d3bd7163d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7ea3cca10668b8346aec0bf1844a49e995527c8b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb852c6b5892256c264cc2c888ea462189154d8d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x9378368ba6b85c1fba5b131b530f5f5bedf21a18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x2acab3dea77832c09420663b0e1cb386031ba17b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x0c2e57efddba8c768147d1fdf9176a0a6ebd5d83</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x08d7c0242953446436f34b4c78fe9da38c73668d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x8943c7bac1914c9a7aba750bf2b6b09fd21037e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x364c828ee171616a39897688a831c2499ad972ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7f36182dee28c45de6072a34d29855bae76dbe2f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xf61f24c2d93bf2de187546b14425bf631f28d6dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x797a48c46be32aafcedcfd3d8992493d8a1f256b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x123b30e25973fecd8354dd5f41cc45a3065ef88c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x6632a9d63e142f17a668064d41a21193b49b41a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xf4ee95274741437636e748ddac70818b4ed7d043</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x57a204aa1042f6e66dd7730813f4024114d74f37</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xd1258db6ac08eb0e625b75b371c023da478e94a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x75e95ba5997eb235f40ecf8347cdb11f18ff640b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xd532b88607b1877fe20c181cba2550e3bbd6b31c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xa1d4657e0e6507d5a94d06da93e94dc7c8c44b51</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xedb61f74b0d09b2558f1eeb79b247c1f363ae452</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7d8820fa92eb1584636f4f5b8515b5476b75171a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x231d3559aa848bf10366fb9868590f01d34bf240</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xad9fd7cb4fc7a0fbce08d64068f60cbde22ed34c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x0e9d6552b85be180d941f1ca73ae3e318d2d4f1f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb716600ed99b4710152582a124c697a7fe78adbf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xaadc2d4261199ce24a4b0a57370c4fcf43bb60aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4e1f41613c9084fdb9e34e11fae9412427480e56</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x79986af15539de2db9a5086382daeda917a9cf0c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc99c679c50033bbc5321eb88752e89a93e9e83c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc36cf0cfcb5d905b8b513860db0cfe63f6cf9f5c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x9c8ff314c9bc7f6e59a9d9225fb22946427edc03</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x3110ef5f612208724ca51f5761a69081809f03b7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x036721e5a769cc48b3189efbb9cce4471e8a48b1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x524cab2ec69124574082676e6f654a18df49a048</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7ab2352b1d2e185560494d5e577f9d3c238b78c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x32973908faee0bf825a343000fe412ebe56f802a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x7daec605e9e2a1717326eedfd660601e2753a057</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc1caf0c19a8ac28c41fe59ba6c754e4b9bd54de9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x33fd426905f149f8376e227d0c9d3340aad17af1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x466cfcd0525189b573e794f554b8a751279213ac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x6be69b2a9b153737887cfcdca7781ed1511c7e36</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x80336ad7a747236ef41f47ed2c7641828a480baa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x9401518f4ebba857baa879d9f76e1cc8b31ed197</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4b61413d4392c806e6d0ff5ee91e6073c21d6430</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc3f733ca98e0dad0386979eb96fb1722a1a05e69</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x09233d553058c2f42ba751c87816a8e9fae7ef10</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x960b7a6bcd451c9968473f7bbfd9be826efd549a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x36d30b3b85255473d27dd0f7fd8f35e36a9d6f06</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x698fbaaca64944376e2cdc4cad86eaa91362cf54</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x497a9a79e82e6fc0ff10a16f6f75e6fcd5ae65a8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x41a322b28d0ff354040e2cbc676f0320d8c8850d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xa9c0a07a7cb84ad1f2ffab06de3e55aab7d523e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x942bc2d3e7a589fe5bd4a5c6ef9727dfd82f5c8a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x8821bee2ba0df28761afff119d66390d594cd280</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x8c6def540b83471664edc6d5cf75883986932674</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x8d9710f0e193d3f95c0723eaaf1a81030dc9116d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x86825dfca7a6224cfbd2da48e85df2fc3aa7c4b1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x629a673a8242c2ac4b7b8c5d8735fbeac21a6205</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x9a534628b4062e123ce7ee2222ec20b86e16ca8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc2c747e0f7004f9e8817db2ca4997657a7746928</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x73da73ef3a6982109c4d5bdb0db9dd3e3783f313</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xc92ceddfb8dd984a89fb494c376f9a48b999aafc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x3248e8ba90facc4fdd3814518c14f8cc4d980e4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x67d9417c9c3c250f61a83c7e8658dac487b56b09</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb6a37b5d14d502c3ab0ae6f3a0e058bc9517786e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x86c10d10eca1fca9daf87a279abccabe0063f247</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4b3406a41399c7fd2ba65cbc93697ad9e7ea61e5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xb0640e8b5f24bedc63c33d371923d68fde020303</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xd3d9ddd0cf0a5f0bfb8f7fceae075df687eaebab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xa5c0bd78d1667c13bfb403e2a3336871396713c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x4d7d2e237d64d1484660b55c0a4cc092fa5e6716</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xfcb1315c4273954f74cb16d5b663dbf479eec62e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x66d1db16101502ed0ca428842c619ca7b62c8fef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x128675d4fddbc4a0d3f8aa777d8ee0fb8b427c2f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x19b86299c21505cdf59ce63740b240a9c822b5e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xacf63e56fd08970b43401492a02f6f38b6635c91</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0x0bebad1ff25c623dff9605dad4a8f782d5da37df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/nfts/collection/0xdceaf1652a131f32a821468dc03a92df0edd86ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x273f7f8e6489682df756151f5525576e322d51a3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x77372a4cc66063575b05b44481f059be356964a4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0xf5b0a3efb8e8e4c201e2a935f110eaaf3ffecb8d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x22c36bfdcef207f9c0cc941936eff94d4246d14a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x59325733eb952a92e069c87f0a6168b29e80627f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x0e3a2a1f2146d86a604adc220b4967a898d7fe07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.7</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/nfts/collection/0x3af2a97414d1101e2107a70e7f33955da1346305</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.7</priority>
   </url>
 </urlset>
\ No newline at end of file
diff --git a/apps/web/public/pools-sitemap.xml b/apps/web/public/pools-sitemap.xml
index a63ab564281..0903b0778ae 100644
--- a/apps/web/public/pools-sitemap.xml
+++ b/apps/web/public/pools-sitemap.xml
@@ -2,5652 +2,4357 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xcbcdf9626bc03e24f779434178a73a0b4bad62ed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x8ad599c3a0ff1de082011efddc58f1908eb6e6d8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4e68ccd3e89f51c3074ca5072bbac773960dfa36</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4585fe77225b41b697c938b018e2ac67ac5a20c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc63b0708e2f7e69cb8a1df0e1389a98c35a76d52</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x99ac8ca7087fa4a2a1fb6357269965a2014abc35</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x11b815efb8f581194ae79006d24e0d814b7697f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa6cc3c2531fdaa6ae1a3ca84c2855806728693e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x5777d92f208679db4b9778590fa3cab3ac9e2168</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x1d42064fc4beb5f8aaf85f4617ae8b3b5b8bd801</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc2e9f25be6257c210d7adf0d4cd6e3e881ba25f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x11950d141ecb863f01007add7d1a342041227b58</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc5c134a1f112efa96003f8559dba6fac0ba77692</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x109830a1aaad605bbf02a9dfa7b0b92ec2fb7daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x1df4c6e36d61416813b42fe32724ef11e363eddc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x12d6867fa648d269835cf69b49f125147754b54d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x3416cf6c708da44db2624d63ea0aaef7113527c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe8c6c9227491c0a8156a0106a0204d881bb7e531</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x04708077eca6bb527a5bbbd6358ffb043a9c1c14</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9db9e0e53058c89e5b94e29621a205198648425b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xf239009a101b6b930a527deaab6961b6e7dec8a6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xfe0df74636bc25c7f2400f22fe7dae32d39443d2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xf4c5e0f4590b6679b3030d29a84857f226087fef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x5764a6f2212d502bc5970f9f129ffcd61e5d7563</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa3f558aebaecaf0e11ca4b2199cc5ed341edfd74</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x99132b53ab44694eeb372e87bced3929e4ab8456</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x6c6bc977e13df9b0de53b251522280bb72383700</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9d96880952b4c80a55099b9c258250f2cc5813ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x3afdc5e6dfc0b0a507a8e023c9dce2cafc310316</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x290a6a7460b308ee3f19023d2d00de604bcf5b42</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xac4b3dacb91461209ae9d41ec517c2b9cb1b7daf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x60594a405d53811d3bc4766596efd80fd545a270</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x331399c614ca67dee86733e5a2fba40dbb16827c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4b5ab61593a2401b1075b90c04cbcdd3f87ce011</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x844eb5c280f38c7462316aad3f338ef9bda62668</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe936f0073549ad8b1fa53583600d629ba9375161</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x2f62f2b4c5fcd7570a709dec05d68ea19c82a9ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x381fe4eb128db1621647ca00965da3f9e09f4fac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x97e7d56a0408570ba1a7852de36350f7713906ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xcd423f3ab39a11ff1d9208b7d37df56e902c932b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe15e6583425700993bd08f51bf6e7b73cd5da91b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x69d91b94f0aaf8e8a2586909fa77a5c2c89818d5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe42318ea3b998e8355a3da364eb9d48ec725eb45</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xad9ef19e289dcbc9ab27b83d2df53cdeff60f02d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x3b685307c8611afb2a9e83ebc8743dc20480716e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x7bea39867e4169dbe237d55c8242a8f2fcdcc387</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x7b1e5d984a43ee732de195628d20d05cfabc3cc7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x7858e59e0c01ea06df3af3d20ac7b0003275d4bf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xae2a25cbdb19d0dc0dddd1d2f6b08a6e48c4a9a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x14af1804dbbf7d621ecc2901eef292a24a0260ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x80a9ae39310abf666a87c743d6ebbd0e8c42158e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc31e54c7a869b9fcbecc14363cf510d1c41fa443</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2f5e87c9312fa29aed5c179e456625d79015299c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc6962004f452be9203591991d15f6b388e09e8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc6f780497a95e246eb9449f5e4770916dcd6396a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x641c00a822e8b671738d32a431a4fb6074e5c79d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x92c63d0e701caae670c9415d91c474f686298f00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x1aeedd3727a6431b8f070c0afaa81cc74f273882</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xcda53b1f66614552f834ceef361a8d12a0b8dad8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x35218a1cbac5bbc3e57fd9bd38219d37571b3537</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x17c14d2c404d167802b16c450d3c99f88f2c4f4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x468b88941e7cc0b88c1869d68ab6b570bcef62ff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xdbaeb7f0dfe3a0aafd798ccecb5b22e708f7852c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x149e36e72726e0bcea5c59d40df2c43f60f5a22d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xbaaf1fc002e31cb12b99e4119e5e350911ec575b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa67f72f21bd9f91db2da2d260590da5e6c437009</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x92fd143a8fa0c84e016c2765648b9733b0aa519e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7cf803e8d82a50504180f417b8bc7a493c0a0503</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x81c48d31365e6b526f6bbadc5c9aafd822134863</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x446bf9748b4ea044dd759d9b9311c70491df8f29</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc82819f72a9e77e2c0c3a69b3196478f44303cf4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x50c7390dfdd3756139e6efb5a461c2eb7331ceb4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x1dfc1054e0e2a10e33c9ca21aad5aa8a1cce91e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc91b7b39bbb2c733f0e7459348fd0c80259c8471</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x59d72ddb29da32847a4665d08ffc8464a7185fae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x09ba302a3f5ad2bf8853266e271b005a5b3716fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa77d77c9773c35e910acc2e30cefe52b54a58414</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8da66e470403b3d3eee66c67e2c61fda6e248ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2f020e708811c054f146eebcc4d5a215fd4eec26</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7e7fb3cceca5f2ac952edf221fd2a9f62e411980</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x68c685fd52a56f04665b491d491355a624540e85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa8328bf492ba1b77ad6381b3f7567d942b000baf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc0cf0f380ddb44dbcaf19a86d094c8bba3efa04a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa169d1ab5c948555954d38700a6cdaa7a4e0c3a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x1862200e8e7ce1c0827b792d0f9546156f44f892</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x05bbaaa020ff6bea107a9a1e06d2feb7bfd79ed2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xd02a4969dc12bb889754361f8bcf3385ac1b2077</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc24f7d8e51a64dc1238880bd00bb961d54cbeb29</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7c06736e41236fecd681dd3353aa77ecd19ea565</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc473e2aee3441bf9240be85eb122abb059a3b57c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x14353445c8329df76e6f15e9ead18fa2d45a8bb6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2039f8c9cd32ba9cd2ea7e575d5b1abea93f7527</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xd3e11119d2680c963f1cdcffece0c4ade823fb58</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8e295789c9465487074a65b1ae9ce0351172393f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x97bca422ec0ee4851f2110ea743c1cd0a14835a1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xbe3ad6a5669dc0b8b12febc03608860c31e2eef6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x56ebd63a756b94d3de9cea194896b4920b64fb01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe2ddd33585b441b9245085588169f35108f85a6e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x84436a2af97f37018db116ae8e1b691666db3d00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x68f5c0a2de713a54991e01858fd27a3832401849</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x4533bad2dc588f0fadf8d2e72386d4cd6a19b519</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x85149247691df622eaf1a8bd0cafd40bc45154a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0392b358ce4547601befa962680bede836606ae2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x1c3140ab59d6caf9fa7459c6f83d4b52ba881d36</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd1f1bad4c9e6c44dec1e9bf3b94902205c5cd6c3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x03af20bdaaffb4cc0a521796a223f7d85e2aac31</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x73b14a78a0d396c521f954532d43fd5ffe385216</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xac85eaf55e9c60ed40a683de7e549d23fdfbeb33</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x04f6c85a1b00f6d9b75f91fd23835974cc07e65c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x730691cdac3cbd4d41fc5eb9d8abbb0cea795b94</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x535541f1aa08416e69dc4d610131099fa2ae7222</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xfc1f3296458f9b2a27a0b91dd7681c4020e09d05</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x85c31ffa3706d1cce9d525a00f1c7d4a2911754c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd52533a3309b393afebe3176620e8ccfb6159f8a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xff7fbdf7832ae524deda39ca402e03d92adff7a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb589969d38ce76d3d7aa319de7133bc9755fd840</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xf334f6104a179207ddacfb41fa3567feea8595c2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x1fb3cf6e48f1e7b10213e7b6d87d4c073c7fdb7b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd4344ea0c5ade7e22b9b275f0bde7a145dec5a23</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x5b42a63d6741416ce9a7b9f4f16d8c9231ccddd4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x252cbdff917169775be2b552ec9f6781af95e7f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2ab22ac86b25bd448a4d9dc041bd2384655299c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xc858a329bf053be78d6239c4a4343b8fbd21472b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa73c628eaf6e283e26a7b1f8001cf186aa4c0e8e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb533c12fb4e7b53b5524eab9b47d93ff6c7a456f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2ae3d6096d8215ac2acddf30c60caa984ea5debe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x19ea026886cbb7a900ecb2458636d72b5cae223b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x6f32061f59a21086c334d0d45f804089ce374aaf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xfaf037caafa9620bfaebc04c298bf4a104963613</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xadb35413ec50e0afe41039eac8b930d313e94fa4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xe9e3893921de87b1194a8108f9d70c24bde71c27</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xf1f199342687a7d78bcc16fce79fa2665ef870e1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xf44acaa38be5e965c5ddf374e7a2ba270e580684</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x36e42931a765022790b797963e42c5522d6b585a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x5adba6c5589c50791dd65131df29677595c7efa7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x3249e3e3e4133ee18e65347daf586610cc265f54</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xca1b837c87c6563910c2befa48834fa2a8c3d72d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x6ef7b14bcd8d989cef8f8ec8ba4bf371b2ac95fd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x37ffd11972128fd624337ebceb167c8c0a5115ff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xe62bd99a9501ca33d98913105fc2bec5bae6e5dd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb2ac2e5a3684411254d58b1c5a542212b782114d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb0efaf46a1de55c54f333f93b1f0641e73bc16d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd0fa3b5264ccde31e8b094b86bca4a1e97d3c603</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xad4c666fc170b468b19988959eb931a3676f0e9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x790fde1fd6d2568050061a88c375d5c2e06b140b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xaefc1edaede6adadcdf3bb344577d45a80b19582</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa8a5356ee5d02fe33d72355e4f698782f8f199e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x55bc964fe3b0c8cc2d4c63d65f1be7aef9bb1a3c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x95d9d28606ee55de7667f0f176ebfc3215cfd9c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x45dda9cb7c25131df268515131f647d726f50608</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x50eaedb835021e4a108b7290636d62e9765cc6d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x167384319b41f7094e62f7506409eb38079abff8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa374094527e1673a86de625aa59517c5de346d32</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x86f1d8390222a3691c28938ec7404a1661e618e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xeda1094f59a4781456734e5d258b95e6be20b983</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x847b64f9d3a95e977d157866447a5c0a5dfa0ee5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x94ab9e4553ffb839431e37cc79ba8905f45bfbea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0e44ceb592acfc5d3f09d996302eb4c499ff8c10</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x1e5bd2ab4c308396c06c182e1b7e7ba8b2935b83</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x9b08288c3be4f62bbf8d1c20ac9c5e6f9467d8b7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xb6e57ed85c4c9dbfef2a68711e9d6f36c56e0fcb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x3e31ab7f37c048fc6574189135d108df80f0ea26</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xd36ec33c8bed5a9f7b6630855f1533455b98a418</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xdac8a8e6dbf8c690ec6815e0ff03491b2770255d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xfe343675878100b344802a6763fd373fdeed07a4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0a28c2f5e0e8463e047c203f00f649812ae67e4f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x88f3c15523544835ff6c738ddb30995339ad57d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x98b9162161164de1ed182a0dfa08f5fbf0f733ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xeef1a9507b3d505f0062f2be9453981255b503c8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc4c06c9a239f94fc0a1d3e04d23c159ebe8316f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x849ec65748107aedc518dbc42961f358ea1361a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2db87c4831b2fec2e35591221455834193b50d1b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa4d8c89f0c20efbe54cba9e7e7a7e509056228d9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x642f28a89fa9d0fa30e664f71804bfdd7341d21f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2aceda63b5e958c45bd27d916ba701bc1dc08f7a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x781067ef296e5c4a4203f81c593274824b7c185d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x4ccd010148379ea531d6c587cfdd60180196f9b1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xd866fac7db79994d08c0ca2221fee08935595b4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x941061770214613ba0ca3db9a700c39587bb89b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa9077cdb3d13f45b8b9d87c43e11bce0e73d8631</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa01f64fa1b923dd9c5c7618b39a6ba8098a88863</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa830ff28bb7a46570a7e43dc24a35a663b9cfc2e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x8837a61644d523cbe5216dde226f8f85e3aa9be3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xca5d44977d6de1846530eb434167b208752fba7d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x4d05f2a005e6f36633778416764e82d1d12e7fbb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x41e64a5bc929fa8e6a9c8d7e3b81a13b21ff3045</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x3ea34cfc9322273311f7843826a2581c4a00fd39</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x785061ed819414dc4269d2a5d5974069c0daea96</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x3f5228d0e7d75467366be7de2c31d0d098ba2c23</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2e3f22e9a1c2470b2e293351f48c99e1fd788f32</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2a08c38c7e1fa969325e2b64047abb085dec3756</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xe6c36eed27c2e8ecb9a233bf12da06c9730b5955</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xefa98fdf168f372e5e9e9b910fcdfd65856f3986</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x76fa081e510f43ac8335efdb4db88c9ff1894413</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc6832ef0af793336aa44a936e54b992bff47e7cd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x865f456479a21e2b3d866561d7171a3d0a7b112d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xbd934a7778771a7e2d9bf80596002a214d8c9304</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x9ab9f658104467604b5afa9a3e1df62f35f7b208</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x6e430d59ba145c59b73a6db674fe3d53c1f31cae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9e37cb775a047ae99fc5a24dded834127c4180cd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x48413707b70355597404018e7c603b261fcadf3f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xade9bcd4b968ee26bed102dd43a55f6a8c2416df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xda679706ff21114ac9fac5198bff24543f357a16</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xba3f945812a83471d709bce9c3ca699a19fb46f7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc9034c3e7f58003e6ae0c8438e7c8f4598d5acaa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x4c36388be6f416a29c8d8eee81c771ce6be14b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa1b2457c0b627f97f6cc892946a382451e979014</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x4b0aaf3ebb163dd45f663b38b6d93f6093ebc2d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xae2ce200bdb67c472030b31f602f0756c9aeb61c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x3bc5180d5439b500f381f9a46f15dd6608101671</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x5122e02898ece3bc62df8c1efdb29a9e914244d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x24e1cbd6fed006ceed9af0dce688acc7951d57a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2556230ac694093d4d3b7b965a2f2d77d4c403a4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xdaca082c2c7d052a96fa83ea9d3a7b6839e39586</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa555149210075702a734968f338d5e1cbd509354</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x10648ba41b8565907cfa1496765fa4d95390aa0d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x00bcec1526dae1e170a53017b8775a93b7810d7c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x20e068d76f9e90b90604500b84c7e19dcb923e7e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x6b93950a9b589bc32b82a5df4e5148f98a7fae27</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd9caa6dbe6791fcb7fc9fb59d1a6b3dd8c1c2339</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x62e81e93136ac42a1ada48d4098f5f9e703e7455</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x84206d33845c9d811438b6fe4e7a0c634748dc50</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd0b53d9277642d899df5c87a3966a349a798f224</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xcfa7c4bb565915f1c4f9475e2a0536d31efad776</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa7de21f28ca460b45373b217cd4eb111c3faeff8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xb64dff20dd5c47e6dbb56ead80d23568006dec1e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xad4e969f4193878e5cc89cefb57faf6c7c0048da</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xdf5eb97e3e23ca7f5a5fd2264680377c211310ba</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xf16baaae8eb7b37f4280e72924479f69e7a61f32</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe745a591970e0fa981204cf525e170a2b9e4fb93</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x64b74c66b9ba60ca668b781289767ae7298f37ae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x17e1ebd791e7253a5e606fd94c5b66c14d873136</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x46715bd57b9ec01deadb35fe096fb44acda79414</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x3447accd4b8e735329d1065244aad2ed630f0122</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2feb7f3ffc243f7de94d5ea5975533d301584e07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0d5959a52e7004b601f0be70618d01ac3cdce976</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2170ca774e48a3f51559917ada6f9d7ae8f7bfea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x62a76dfa8951aefcff787e790782db3633ebf422</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8073679e0b3b2d1d665777cf1b2b5b1c2d3d2d0c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x143f1a6f3fb32e6ab3f22d3cc6b417b5c2197599</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x82ad659c2f152aad59bb37cbc5e7663a2de0c607</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa4efe9e8e2a2d5a2ac46805f233b8e49d0e11955</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xfcc89a1f250d76de198767d33e1ca9138a7fb54b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2faa2b42b782d578a160f61bb7cd763a17476730</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xdd44c0e83c2570062d1e6fdd440b4724862e8f31</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe3930a14641786e123e7bbe842d701fa1cbfe2df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x6d03360ce4764e862ed81660c1f76cc2711b14b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc055f66f228105072315247785c00299d0ce27e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xcae1d141ab11cef0a415cf0440025e1e5e962e06</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0f338ec12d3f7c3d77a4b9fcc1f95f3fb6ad0ea6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4eaa90264d6a3567228dcb5cfc242200da586437</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x6fe9e9de56356f7edbfcbb29fab7cd69471a4869</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xf420603317a0996a3fce1b1a80993eaef6f7ae1a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x47a90a2d92a8367a91efa1906bfc8c1e05bf10c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x41bf5eeae051fbd2e97b76b5f8f0fdcc1a1e526b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x28df0835942396b7a1b7ae1cd068728e6ddbbafd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa3f3664a52f01b42557524bd14556e379daf5669</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x1fd22fa7274bafebdfb1881321709f1219744829</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xe39cfc1a2e51a09ecbd060a24ee4eef5a97697bb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x06396509195eb9e07c38a016694dc9ff535b128a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x5a1c486edefda2f09d3b349fadc38524f1743826</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x5bf1cf153c102a79d9e18b7fb7c79ba57fa70d0c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2c3c320d49019d4f9a92352e947c7e5acfe47d68</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4141325bac36affe9db165e854982230a14e6d48</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x17507bef4c3abc1bc715be723ee1baf571256e05</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x8149b92ea743cc382aada523b68b8834733b9015</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xc98f01bf2141e1140ef8f8cad99d4b021d10718f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x7f9d307973cdabe42769d9712df8ee1cc1a28d10</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x5c87da28a45e5089b762dcbbd86f743d14c54317</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2cd97604ef77bbcb1fa0cff47545dff8ec7def08</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x7862d9b4be2156b15d54f41ee4ede2d5b0b455e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x554548b404213c7efcdbab933f52edfe3c581834</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x63008c5ea4e47f5421e0e1428b1c5043a507d0d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0350ca994791c4b07a5b02b08aaf9d6fc8ab510e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x32776ed4d96ed069a2d812773f0ad8ad9ef83cf8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x84f3ca9b7a1579ff74059bd0e8929424d3fa330e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x5289a8dbf7029ee0b0498a84777ed3941d9acfec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xb2bc284ab4c953b7f7a06d59c0ceb2de26405f22</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x508acf810857fefa86281499068ad5d19ebce325</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xccdfcd1aac447d5b29980f64b831c532a6a33726</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4fb87838a29b37598099ef5aa6b3fbeeef987c50</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x515e94dc736b9d8b7d28ecf1cece0aba3d75da97</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xfd6e5b7c30538dff2752058e425ad01a56b831cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xcb99fe720124129520f7a09ca3cbef78d58ed934</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xd2f21358c1549be193537b2a4c5dc7f0228ae011</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x93094ed1c907e4bca7eb041cb659da94f7e1b58e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xd37e6ecb991d1a0e7610c89666817665713362a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x73234630bd159384c8d43f145407312d64614f43</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xad1ddf00c4ae50573e4dc98e6c5ee93baa04a0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa765593c821f7df9ad81119509a37961e7ffa6c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x9b501a7ad3087d603ceb34424b7b2a6c348ad0b7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xafebb7cfa1a15fcac4121b609b456cbce3137c20</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0adaf134ae0c4583b3a38fc3168a83e33162651e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xf9878a5dd55edc120fde01893ea713a4f032229c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x84e47c7f2fe86f6b5efbe14fee46b8bb871b2e05</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xf3e5bec78654049990965f666b0612e116b94fb2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x33e59edd3214e97cb68450c6d3d6c167de072aba</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2ca76c7e466e560e0cb11a91269bb953e41254bc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xbb124e35ab9e85f8d59ba83500e559dc052b9368</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xd88d5f9e6c10e6febc9296a454f6c2589b1e8fae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb90fe7da36ac89448e6dfd7f2bb1e90a66659977</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xbd6313d0796984c578cae6bc5b5e23b27c5540c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x1f18cd7d1c7ba0dbe3d9abe0d3ec84ce1ad10066</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x7da99753ff017f1b7afb2c8c0542718dc9f15f21</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x079e7a44f42e9cd2442c3b9536244be634e8f888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x1c8dafd358d308b880f71edb5170b010b106ca60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xbd0f6f34baa3c1329448a69bab90111a20756f01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x3420720e561f3082f1e514a4545f0f2e0c955a5d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xea3fb6e3313a2a90757e4ca3d6749efd0107b0b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xf130f72f8190f662522774c3367e6e8814f5e219</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4a46c053bd5c10a959aea258228217b9d3405f3d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb83258bf5940c98abf54f26c5a02710bd6b83b2c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x6a209c5329f0a225fa1890d4177823c096016f34</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xdb24905b1b080f65dedb0ad978aad5c76363d3c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xddff2cdad11898b901a661e32e9fa010780263a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x72dd8fe09b5b493012e5816068dfc6fb26a2a9e6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x54fc722a66abfb6500a36d8b7b2646129d0e836a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x53b612b32233c80ec439a64325a29766ce95be7f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xe5edcbe72d1bc223097a1bed1fe6c0e404b4290c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb928c37b8bd9754d321dc3d3c6ef374d332fe761</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x2d70cbabf4d8e61d5317b62cbe912935fd94e0fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x953e2937f0515c43ca7995e80c84aedcbbb9385e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x84394d80830ae963b599ded7d9149b90059f182f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa1777e082fa1746eb78dd9c1fbb515419cf6e538</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x112466c8b6e5abe42c78c47eb1b9d40baa3f943c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x9491d57c5687ab75726423b55ac2d87d1cda2c3f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x978799f1845c00c9a4d9fd2629b9ce18df66e488</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xdc55d1fd1c04e005051a40bd59c5f95623257bc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x34757893070b0fc5de37aaf2844255ff90f7f1e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x7faf167615419228f3f7d71d52d840dab154913c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa4d7b6a50dd4c55334ca6f175dbc6561f269d264</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0ed413cefde954d8e5c54d981d7d182b587e98e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x524375d0c6a04439128428f400b00eae81a2e9e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4b7a4530d56ff55a4dce089d917ede812e543307</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x84bb5b9bf1b6782c87cfa3e396f2f571c8e49646</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x723292eea7e1576ae482a5c317934054c0199e24</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x9b42940e8184d866aac6595a91f8d8952a59d3b9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x37622453c614f625d288151101ffe48fd222ced1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4a94130b9e8eb0a0959c2c0f1ee9583213773fd9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x51514b3dc24afc1db95586242b99f0063bea17c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xc130254e9196d48bbd9f91240390a6e8203132e9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x60ac25da2ada3be14a2a8c04e45b072bed965966</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4e392a3883a84225260ff857318517eb50e5d128</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xca0aa06385a42242fe9523cd7015f6d01cd8f6b2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x3e448c17043ce1481bbe53c0fd19481bad8b98a6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x81060e6bf2a683f208b8799a33c7c09830cabed1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x463fe9f646b61ccfb43a022bf947075411cd71c7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x21b8065d10f73ee2e260e5b47d3344d3ced7596e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x517f9dd285e75b599234f7221227339478d0fcc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa43fe16908251ee70ef74718545e4fe6c5ccec9f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0af81cd5d9c124b4859d65697a4cd10ee223746a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xca7c2771d248dcbe09eabe0ce57a62e18da178c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x09d1d767edf8fa23a64c51fa559e0688e526812f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x7b73644935b8e68019ac6356c40661e1bc315860</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x180efc1349a69390ade25667487a826164c9c6e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x9c4fe5ffd9a9fc5678cfbd93aa2d4fd684b67c4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa478c2975ab1ea89e8196811f51a7b7ade33eb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xbb2b8038a1640196fbe3e38816f3e67cba72d940</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x9ec9367b8c4dd45ec8e7b800b1f719251053ad60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xc91ef786fbf6d62858262c82c63de45085dea659</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x197d7010147df7b99e9025c724f13723b29313f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x25647e01bd0967c1b9599fa3521939871d1d0888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x2f0b1417aa42ebf0b4ca1154212847f6094d708d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x6ada49aeccf6e556bb7a35ef0119cc8ca795294a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x2a6c340bcbb0a79d3deecd3bc5cbc2605ea9259f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xda2d09fbbf8ee4b5051a0e9b562c5fcb4b393b18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x48d20b3e529fb3dd7d91293f80638df582ab2daa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4028daac072e492d34a3afdbef0ba7e35d8b55c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xc2eab7d33d3cb97692ecb231a5d0e4a649cb539d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xc5be99a02c6857f9eac67bbce58df5572498f40c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xe4b8583ccb95b25737c016ac88e539d0605949e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x8dbee21e8586ee356130074aaa789c33159921ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x43de4318b6eb91a7cf37975dbb574396a7b5b5c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x9ff68f61ca5eb0c6606dc517a9d44001e564bb66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa29fe6ef9592b5d408cca961d0fb9b1faf497d6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x1b1137dd16faa651e38a9dfb5d9ffff7767fdf62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x470e8de2ebaef52014a47cb5e6af86884947f08c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x8fb8e9921922d2ffb529a95d28a0d06d275d7a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xd3d2e2692501a5c9ca623199d38826e513033a17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x97e1fcb93ae7267dbafad23f7b9afaa08264cfd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa5e9c917b4b821e4e0a5bbefce078ab6540d6b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x2cc846fff0b08fb3bffad71f53a60b4b6e6d6482</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x959873fb4fc11825fba83c80c4c632db1e936e15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa7480aafa8ad2af3ce24ac6853f960ae6ac7f0c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xc7e6b676bfc73ae40bcc4577f22aab1682c691c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x570febdf89c07f256c75686caca215289bb11cfc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x343fd171caf4f0287ae6b87d75a8964dc44516ab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xcaa004418eb42cdf00cb057b7c9e28f0ffd840a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xe3d3551bb608e7665472180a20280630d9e938aa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb6b0c651c37ec4ca81c0a128420e02001a57fac2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x4e34da137f0b317c633838458e0c923a5e088752</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xfe9e7931e55c514c33d489c88582fa36e84bd8e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x5281e311734869c64ca60ef047fd87759397efe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x149148acc3b06b8cc73af3a10e84189243a35925</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x8ef79d6c328c25da633559c20c75f638a4863462</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xbf16ef186e715668aa29cef57e2fd7f9d48adfe6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x5645dcb64c059aa11212707fbf4e7f984440a8cf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x3ad4913fa896391c9822a81d8d869cc0d783bdd7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0f23d49bc92ec52ff591d091b3e16c937034496e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x7a415b19932c0105c82fdb6b720bb01b0cc2cae3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x9b3423373e6e786c9ac367120533abe4ee398373</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4a25dbdf9629b1782c3e2c7de3bdce41f1c7f801</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xbe80225f09645f172b079394312220637c440a63</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x059615ebf32c946aaab3d44491f78e4f8e97e1d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x435664008f38b0650fbc1c9fc971d0a3bc2f1e47</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x4b62fa30fea125e43780dc425c2be5acb4ba743b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xc3db44adc1fcdfd5671f555236eae49f4a8eea18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/ethereum/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe5cf22ee4988d54141b77050967e1052bd9c7f7a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7f580f8a02b759c350e6b8340e7c2d4b8162b6a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x48b0ab72c2591849e678e7d6f272b75ef9b863f7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x74d0ae8b8e1fca6039707564704a25ad2ee036b0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x5969efdde3cf5c0d9a88ae51e47d721096a97203</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe32efff8f8b5fdc53803405aa3f623f03f8a8767</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe8629b6a488f366d27dad801d1b5b445199e2ada</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x066b28f0c160935cf285f75ed600967bf8417035</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x146b020399769339509c98b7b353d19130c150ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xd28f71e383e93c570d3edfe82ebbceb35ec6c412</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xadab76dd2dca7ae080a796f0ce86170e482afb4a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0fb07e6d6e1f52c839608e1436d2ea810cf07257</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/optimism/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x95d2483d2a0fff034004f91c53d649623d993896</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x19c5505638383337d2972ce68b493ad78e315147</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc143161ed3ed8049bb63d8da42907c08a10e2269</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xc3286373599dd5af2a17a572ebb7561f05f88bec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xbb98b3d2b18aef63a3178023a920971cf5f29be4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x647fb01a63de9a551b39c7915693b25e6bcec502</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa90c1c009dc8292bd04ced30f9b53a5ff7a806a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/polygon/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xfb765ff72a14735550f1d798a5efd1311f2ddee7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x3537f2a5f99f08f59eb1417073db1fadbebf0c74</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xde8ed0277ee0e84c25756a73ffa7374e4aeadf46</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd8f3a72d2b2220a5067abe8c38aea57dc2d69a5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x7ec18abf80e865c6799069df91073335935c4185</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x14b1911dd6b451c2771661ae8cd70637d726c356</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9ae8084c21752971d867597c07f2673765d949a1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xcfaf75a3d292c3535ea3acdb16ed2ee58c2bb091</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8055e6de251e414e8393b20adab096afb3cf8399</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xffec10fe1355c2d8df4f62affcdeffdb04f06569</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc16454420f100b2e771d8bc4c5b6200068129a34</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x046f405e4ae1d0e786eda4959adadbd417d13ad8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xeccb34691c06c1c9c31ceb2228b22cbd242b5879</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe22a2dfaaaaec8a7b2b7acb4909eaaa5c5bd6e64</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xe2dda0911e227e73d9fd94745b851c8bc6504610</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0f082a7870908f8cebbb2cd27a42a9225c19f898</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x69d667281778db0c3bc8177efea3a91ee95c3068</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x30d61bb28a6789f9f49d8c7fb198d63b6aba4b61</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x090f3fd9110621df127c3f9be5c6f58c02f2d5eb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd56f086e7b796b313d49f2bc926fac4bdd2a2b0b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x7eb847a214192aab8fa1b503f4d4c9ddd2a08db6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x81b3bc0ef974c16d71b8614adb8c22ccc045da01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xc9b44ca4159dbaf5722a3dc8618e9d4b5f39d5b2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xbeef35a63fc62a3334630d9d3b4db27093d95317</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x3d5d143381916280ff91407febeb52f2b60f33cf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x68c9325cc268df8b9ed4a06429587f28471b5f84</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa00cc1fb7ac185222294777c6b23a13c013f07ce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x77021e63bcbd3c5296b0cdd8a3c3770fb0ea8fa2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xcc28456d4ff980cee3457ca809a257e52cd9cdb0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xec0b7e8e44c9d60efd67a89dba1d4a6e02a7a4a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0c8fed5dd65542ca5f0add1acab14c2e470c9110</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd56da2b74ba826f19015e6b7dd9dae1903e85da1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x5482c2b11951bbb92b87858242e17abde802b398</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xd95bae63641d822dc591bd4aca7a64e53eac76f9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x06959273e9a65433de71f5a452d529544e07ddd0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x24bf2ee2e09477082d1ddf2f0603baa460b3f5f3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x56d8f846415e08c5e663d89505e79f522d33f947</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x548e923281f372d28a40287d3a2d30dce482fc66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x9d744d3d905897608d24c1b8c1c7db0d30c36cd4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/base/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xab46d39cb398fb3649ecba781180016fef75f50b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x25048028ad87484b7fce99bc4e22dcb6c3307470</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xdb2177fee5b0ebdc7b8038cb70f3964bb6d14143</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x42d749f736051d8933b118324cded52d1f92bec1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xb1a1b707b143b911c36e1a0f4f901c5017791aca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x3319a81a316abd4c086f7048904e31ff86648b38</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x4a978a2d4fb7393063babfb0cee741b8bcd4dd4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xea403e36fb592fdfdc342c38e94284ddbb0d2105</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xe3fb01794d6912f0773171e32e723471ee8df061</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x916d7f23ccbb1d10118dcfc6ad5a10b6446ff73e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/bnb/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x6cde5f5a192fbf3fd84df983aa6dc30dbd9f8fac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xd80d28850bebe6208433c298334392bc940b4fc7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x7f7c4335ccac291ddedcef4429a626c442b627ed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x628cb3a5a206956423d158009612813b64b19dab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x116361f4f45e310347b43cd098fdfa459760ea7f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x5dc631ad6c26bea1a59fbf2c2680cf3df43d249f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x1a810e0b6c2dd5629afa2f0c898b9512c6f78846</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xac1cb6d3d419da9ead0b53e62d6fb4bb53473523</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0115d04a88990889471a88e85817aac9e961c07b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xd3409b7f3f54bb097433d0f4cd31c48ac33e569b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x493bfc1adb2e60805693197f23132350ffd2a04e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xcf4f103759770c21f945413781ca787620316988</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xb135ebde27d366b0d62e579bae4118cb991b820e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xecbc2f008c20729b9239317408367377c5473812</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x96e0c440d3377c2dfe4f2a82add0b045e46cbe64</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x6f5304c22ac77e228e8af4732ac6677c46e09030</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xcb037f27eb3952222810966e28e0ceb650c65cd9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xddd23787a6b80a794d952f5fb036d0b31a8e6aff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xa86aca6d7c393c06dcdc30473ea3d1b05c358dff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x1ffec7119e315b15852557f654ae0052f76e6ae1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x0f027d40c80d8f70f77d3884776531f80b21d20e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x69c66beafb06674db41b22cfc50c34a93b8d82a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xeedff72a683058f8ff531e8c98575f920430fdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x811cfb75567a252bea23474e2ccd1286927bfe0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x2caccf71bdf8fff97c06a46eca29b611b1a74b5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0xf07a84f0732dfe8eea0d3961bcd8f62c761ff508</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/pools/celo/0x8c1c499b1796d7f3c2521ac37186b52de024e58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x7baece5d47f1bc5e1953fbe0e9931d54dab6d810</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x83abecf7204d5afc1bea5df734f085f2535a9976</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xb2eb5849e2606f99fc492e9add0103c667f806d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x53c6ca2597711ca7a73b6921faf4031eedf71339</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xd35937ecd47b04a1474f8569f457fc5ac395921a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x6b75f2189f0e11c52e814e09e280eb1a9a8a094a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xb372b5abdb7c2ab8ad9e614be9835a42d0009153</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xf369277650ad6654f25412ea8bfbd5942733babc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x4898cf312fbff8814cab80a8d7f6ee5ad0dc73fb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x5e78afc6c804d4382bede3a0712d210e657e9b4f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x86b211ca7915a0c8d4659dd98242d9e801d88ab4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xb637f7c82fd774c280e23cebc725e7cd807c66d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xd249c43faabc58d6dd4b0a4de598b5a956c5d8d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x1fbae785ce68b79f7ed4f7b27c3af3ef0e0bc3d4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x3c1376fb8487da57d4ffb263d9d01b578c7b586b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x7b24bed19856f4bb1d4c0421cfb328026cd936bd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x7cf887a863d81e6a483ee947dee05cb51914923c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x588c8cf031809486f015908864ee8699b44017e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x3987d38a4ff8520a8ef6bcc6f98d6da8bcd69b89</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xde67d05242b18af00b28678db34feec883cc9cd6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x4a5a8b0108f446df7c1c8a459fcfb54e844b7343</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xf6ba006abf768ab2d1b5bba2d22d9f13eb1269d4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x4eefe02fce5b53ca33c7717bbd8ad3c9cb0609f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xaf996125e98b5804c00ffdb4f7ff386307c99a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x7924a818013f39cf800f5589ff1f1f0def54f31f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xc1738d90e2e26c35784a0d3e3d8a9f795074bca4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xda908c0bf14ad0b61ea5ebe671ac59b2ce091cbf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x254aa3a898071d6a2da0db11da73b02b4646078f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x41824081f2e7beb83048bf52465ddd7c8e471da2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xa0c2ce1723b3939f47ad01a293292f2f75dc629d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xc42442f6402b68626e791a447d87b35cb1c6236e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x84537db6f6aaa2afdb71f325d14b9f5f7825bef1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x13933689ed2c6c66e83aed64336df14896efb7e2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x039df62583ddc1c5fda75db152b87113d863b6d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x92c2fc5f306405eab0ff0958f6d85d7f8892cf4d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xcbe856765eeec3fdc505ddebf9dc612da995e593</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xc39e83fe4e412a885c0577c08eb53bdb6548004a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xdbac78be00503d10ae0074e5e5873a61fc56647c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xc1cd3d0913f4633b43fcddbcd7342bc9b71c676f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x6c4c7f46d9d4ef6bc5c9e155f011ad19fc4ef321</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xb2c86ff752f18499b70e8f642b3421405d50d6e9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x16588709ca8f7b84829b43cc1c5cb7e84a321b16</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xd0a4c8a1a14530c7c9efdad0ba37e8cf4204d230</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xf92f2e3fca01491baba0975264362cc38b1cab7b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x3e6e23198679419cd73bb6376518dcc5168c8260</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x531b6a4b3f962208ea8ed5268c642c84bb29be0b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x553e9c493678d8606d6a5ba284643db2110df823</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xe3170d65018882a336743a9c396c52ea4b9c5563</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x1385fc1fe0418ea0b4fcf7adc61fc7535ab7f80d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x5cd0ad98ba6288ed7819246a1ebc0386c32c314b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x0ad1e922e764df5ab6d636f5d21ecc2e41e827f0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x6b3a3d6ed64faf933a7a4b1bd44b2efba47614ac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x4ce4a1a593ea9f2e6b2c05016a00a2d300c9ffd8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x0843e0f56b9e7fdc4fb95fabba22a01ef4088f41</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x8323d063b1d12acce4742f1e3ed9bc46d71f4222</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xe30e4dfdbb10949c27501922f845e20cfa579f09</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x7e02ae3f794ebade542c92973eb1c46d7e2e935d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xfa22d298e3b0bc1752e5ef2849cec1149d596674</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x8066ee17156e4184d69277e26fa8cbca3a845edf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x418de8e0ab58abfe916a47821a055c59b9502deb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xfb9caae5a5c0ab91f68542124c05d1efbb97d151</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xb68606a75b117906e06caa0755896ad2b3dd0272</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x6e33c0f5e16b45114679eac217e0c0138cefcd2e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xd64fb39a5681908ad488b487d65f5d8479cb235c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x0217fc17c642d29b890bcf888e21be2378493e01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x099d23a43da5a8a9282266dbefeaaef958150300</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xd92e0767473d1e3ff11ac036f2b1db90ad0ae55f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x40c547e7fd88f60d94788953b83d9342d8d133c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x397433498c7befde4b4049b98a7ff081a2c17387</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xf9be03505869d719ba194757943575ed2af001f2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x18c40bb9281a07627ff25cea45b7511f68fd0076</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x270d89e983d9821a418bf193684736414fab78c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xb125aa15ad943d96e813e4a06d0c34716f897e26</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x813c0decbb1097fff46d0ed6a39fb5f6a83043f4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x9a7ac628ba9f330341486380af729c8975388959</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xf2c9339945bff71dd0bffd3c142164112cd05dc6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x12a4619c0bd9710732fbc458e9baa73df6c3d35f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x96530dac7817f186390b64ba63d13becd079b28d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x18fc1e95adb68b556212ebbad777f3fbb644db98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xabbeb324b090550ca6d15ec71019915813f54f90</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x86d708404d0db1d97843e66d4ed6b86d11be705b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xbfbba3de6a260c8374f8299c38898312c2d6e9a6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xe945683b3462d2603a18bdfbb19261c6a4f03ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xa1bf0e900fb272089c9fd299ea14bfccb1d1c2c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xe46935ae80e05cdebd4a4008b6ccaa36d2845370</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x3041cbd36888becc7bbcbc0045e3b1f144466f5f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xd31d41dffa3589bb0c0183e46a1eed983a5e5978</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x391e8501b626c623d39474afca6f9e46c2686649</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xd0fc8ba7e267f2bc56044a7715a489d851dc6d78</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x4fd47e5102dfbf95541f64ed6fe13d4ed26d2546</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xe9033c0011f35547fa90d3f8a6ad4b666a590759</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x0c3561d3b72e17378d99684414aa8669daeb8bd0</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x14653ce9f406ba7f35a7ffa43c81fa7ecd99c788</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x3204e9734a56a4d7c6f4f5822e14182d9d1a43c4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x43faefd4c0c25e969ac211cd97a4a51e52c729b7</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xa652ab3be697c7a01fbdce4d73f8e8acd990251c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x29962083891241aad61ad97bae46d032c9c0c55c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x26bf3601b77be9c31b13b22ebca02914db9c7468</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x0d2edd335982f56662d772b93d86901eb9bd2ff9</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xbaed273edd493930711fe88690ebd1f30f7f55ab</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x16033643947bf4d8a1ae37b055edf57cb183106a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xf59abf32c1e8c5d2c6e3faa2131533bbcd466194</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x0312187403bf72b8d2d80729894d6ac3300bd63f</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x416fdbc4fb8d4d1f48d0d3778c59dfa5352e9b15</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x5918aca9ae924e6eaaa3d293bb92bdec9ab79338</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x8270e64d22cf13e92c641c4006408c7d7e3ff341</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x16503510c58da73486950b72a12ead3d1d8355dd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x7505159f644ddc5eae21c119e328d0d5bee574b0</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xe870bfe4aacb6e234b645e535d26c53790d50e78</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x2e2d190ad4e0d7be9569baebd4d33298379b0502</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xb834093d7e46f7644be45e77281394d31003e866</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xb5a1fd804342cfb679bd8ada75718bc3ec43097e</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x9e71e2b14d7e6d30811628ab0965f28e4e2edbce</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xa011da4a0c9261ecf4694bf73a74d113aa261133</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x7ab922c1bfdf7df977c7531c5782074d866f3adc</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xe2d2050430e341a8f3988e2726e44d9370f8cd3a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xed66ba3ea44425805a085b1ca80d00467b055b38</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x40dade19adc198125ec237a2c48b3408568b2f81</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x166bc40da621d3cb978e24334f844b84ddef25f8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x76bf0abd20f1e0155ce40a62615a90a709a6c3d8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x6948d6c8532c6b0006cb67c6fb9c399792c8ac91</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x4e40cf4a7d8724e5adc2b791bbf9451d1e260b93</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x90908e414d3525e33733d320798b5681508255ea</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xd6b4cce96ddf8aab2e5750983af9a901f17fbc36</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x4cef551255ec96d89fec975446301b5c4e164c59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xdd0c6bae8ad5998c358b823df15a2a4181da1b80</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x5e6ff2fa4ca244b6b33c7286d368120822eacc11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x98efd62b4bfbde6393b18b063c506ce5a77f4810</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x3c5096df639262db0a6cd0172f08709d4161094b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xae31f0e673fc5f33cfc0e9abb426d8051404a7c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xd10456ce05b9af05c8eede0f93ea8aa80a0daa2f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x065c22a16f6531706681fabbc8df135fe6eb1c2e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x8ab8d851c6b31d8a4d42fd7d3e47b20861b025f2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xc0067d751fb1172dbab1fa003efe214ee8f419b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xc3d7aa944105d3fafe07fc1822102449c916a8d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x2982d3295a0e1a99e6e88ece0e93ffdfc5c761ae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xc593fe9193b745447e86b45ea0bf62565ee030cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x88051b0eea095007d3bef21ab287be961f3d8598</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xb31273fd2dfc05e6fd91a3b8a2a681aeb0fbcf48</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xaf7b48ae2f4773fd44f9208cca3db5ae7bfa7e37</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xc2125a452115ff5a300cc2a6ffae99637f6e329d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xb08a8794a5d3ccca3725d92964696858d3201909</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xae99efe6b04bbe5b8b4ad567946fb84b35681abb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x6696710b8e3dc0d844c8b9244767962a4a61ad97</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xcde77ef185a8f886d03b109573cc1dcdcf3cf1f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x35f5387decce5a234da1a32ca3c9e338a48bcf37</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x4178dd7eb2eb983ba7f7e41648cf91db6be20190</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xb6c8f9490314394cfc6edacb8717bfdc1eb8dab5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x1625fe58cdb3726e5841fb2bb367dde9aaa009b3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xb1ed164c736909ba7ddbc1feb7ced4eaad854a87</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x95faa9a91cd6c1c018e4b1a6fc4c89d4f1695e5d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xa143ccf73c25eec6f38bd1b741043ebea228b8e9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x2e067e0eab7fd31c01473c0f56f3295afb82e461</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xbc83c60e853398d263c1d88899cf5a8b408f9654</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xaf21b0ec0197e63a5c6cc30c8e947eb8165c6212</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x9c84f58bb51fabd18698efe95f5bab4f33e96e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x202a6012894ae5c288ea824cbc8a9bfb26a49b93</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x744159757cac173a7a3ecf5e97adb10d1a725377</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x127452f3f9cdc0389b0bf59ce6131aa3bd763598</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/ethereum/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/arbitrum/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x2264ba9dc0b257c69eeae7782e8ff608cc65d6a7</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/optimism/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x00a59c2d0f0f4837028d47a391decbffc1e10608</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/polygon/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xad6e8f6a34087bddfb03815e2c10e4f7bfd4395b</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xd5bb156cb73bfca62f68dc3dff7e5ec4e305b861</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0xc0d8f259578c985947a050802fb4857261af0bf3</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/base/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x74f7a360eb36a46b675ea932ea07094a3ace441f</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x626761cc5b9fafe4696bf8def4aa015576bb4bef</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/bnb/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0xc767c0b2e2e56c455fd29f9ee9b6e6f035c71ed4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x625cb959213d18a9853973c2220df7287f1e5b7d</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/pools/celo/0x5ced44f03ff443bbe14d8ea23bc24425fb89e3ed</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
 </urlset>
\ No newline at end of file
diff --git a/apps/web/public/tokens-sitemap.xml b/apps/web/public/tokens-sitemap.xml
index 24e9f6d35e0..e727529afef 100644
--- a/apps/web/public/tokens-sitemap.xml
+++ b/apps/web/public/tokens-sitemap.xml
@@ -2,5187 +2,3182 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xdac17f958d2ee523a2206206994597c13d831ec7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2260fac5e5542a773aa44fbcfedf7c193bc2c599</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6b175474e89094c44da98b954eedeac495271d0f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6123b0049f904d730db3c36a31167d9d4121fa6b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xcf0c122c6b73ff809c693db761e7baebe62b6a2e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x58cb30368ceb2d194740b144eab4c2da8a917dcb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4c9edd5852cd905f086c759e8383e09bff1e68b3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xaaee1a9723aadb7afa2810263653a34ba2c21c7a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x514910771af9ca656af840dff83e8264ecf986ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5b7533812759b45c2b44c19e320ba2cd2681b542</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xae78736cd615f374d3085123a210448e74fc6393</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb9f599ce614feb2e1bbe58f180f370d05b39344e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd5f7838f5c461feff7fe49ea5ebaf7728bb0adfa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd31a59c85ae9d8edefec411d448f90841571b89c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6a7eff1e2c355ad6eb91bebb5ded49257f3fed98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x576e2bed8f7b46d34016198911cdf9886f78bea7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1258d60b224c0c5cd888d37bbf31aa5fcfb7e870</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x62d0a8458ed7719fdaf978fe5929c6d342b0bfce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x77e06c9eccf2e797fd462a92b6d7642ef85b0a44</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x24fcfc492c1393274b6bcd568ac9e225bec93584</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x27702a26126e0b3702af63ee09ac4d1a084ef628</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd46ba6d942050d489dbd938a2c909a5d5039a161</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbe9895146f7af43049ca1c1ae358b0541ea49704</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x72f713d11480dcf08b37e1898670e736688d218d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0001a500a6b18995b03f44bb040a5ffc28e45cb0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9e9fbde7c7a83c43913bddc8779158f1368f0413</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5f98805a4e8be255a32880fdec7f6728c6568ba0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2b591e99afe9f32eaa6214f7b7629768c40eeb39</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1ae7e1d0ce06364ced9ad58225a1705b3e5db92b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x046eee2cc3188071c02bfc1745a6b17c656e3f3d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x84018071282d4b2996272659d9c01cb08dd7327f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x12970e6868f88f6557b76120662c1b3e50a646bf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xaea46a60368a7bd060eec7df8cba43b7ef41ad85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6de037ef9ad2725eb40118bb1702ebb27e4aeb24</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc01154b4ccb518232d6bbfc9b9e6c5068b766f82</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5a98fcbea516cf06857215779fd812ca3bef1b32</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x102c776ddb30c754ded4fdcc77a19230a60d4e4f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x72e4f9f808c49a2a61de9c5896298920dc4eeea9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x467719ad09025fcc6cf6f8311755809d45a5e5f3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf19308f923582a6f7c465e5ce7a9dc1bec6665b1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x710287d1d39dcf62094a83ebb3e736e79400068a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf951e335afb289353dc249e82926178eac7ded78</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf017d3690346eb8234b85f74cee5e15821fee1f4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8c282c35b5e1088bb208991c151182a782637699</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xeaa63125dd63f10874f99cdbbb18410e7fc79dd3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xde342a3e269056fc3305f9e315f4c40d917ba521</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2dff88a56767223a5529ea5960da7a3f5f766406</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x626e8036deb333b408be468f951bdb42433cbf18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xdd66781d0e9a08d4fbb5ec7bac80b691be27f21d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb23d80f5fefcddaa212212f028021b41ded428cf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbaac2b4491727d78d2b78815144570b9f2fe8899</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf8ebf4849f1fa4faf0dff2106a173d3a6cb2eb3a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb90b2a35c65dbc466b04240097ca756ad2005295</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1614f18fc94f47967a3fbe5ffcd46d4e7da3d787</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf1df7305e4bab3885cab5b1e4dfc338452a67891</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x91fbb2503ac69702061f1ac6885759fc853e6eae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa9e8acf069c58aec8825542845fd754e41a9489a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2c95d751da37a5c1d9c5a7fd465c1d50f3d96160</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe453c3409f8ad2b1fe1ed08e189634d359705a5b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x89d584a1edb3a70b3b07963f9a3ea5399e38b136</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4507cef57c46789ef8d1a19ea45f4216bae2b528</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd1d2eb1b1e90b638588728b4130137d262c87cae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe92344b4edf545f3209094b192e46600a19e7c2d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8a0a9b663693a22235b896f70a229c4a22597623</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1bbe973bef3a977fc51cbed703e8ffdefe001fed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa41d2f8ee4f47d3b860a149765a7df8c3287b7f0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x761d38e5ddf6ccf6cf7c55759d5210750b5d60f3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc18360217d8f7ab5e7c516566761ea12ce7f9d72</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe28b3b32b6c345a34ff64674606124dd5aceca30</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x168e209d7b2f58f1f24b8ae7b7d35e662bbf11cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb131f4a55907b10d1f0a50d8ab8fa09ec342cd74</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3472a5a71965499acd81997a54bba8d852c6e53d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7dd9c5cba05e151c895fde1cf355c9a1d5da6429</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x19efa7d0fc88ffe461d1091f8cbe56dc2708a84f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x14fee680690900ba0cccfc76ad70fd1b95d10e16</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3c3a81e81dc49a522a592e7622a7e711c06bf354</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa1290d69c65a6fe4df752f95823fae25cb99e5a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x92f419fb7a750aed295b0ddf536276bf5a40124f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2c06ba9e7f0daccbc1f6a33ea67e85bb68fbee3a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3d658390460295fb963f54dc0899cfb1c30776df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8e870d67f660d95d5be530380d0ec0bd388289e1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x853d955acef822db058eb8505911ed77f175b99e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1294f4183763743c7c9519bec51773fb3acd78fd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4e15361fd6b4bb609fa63c81a2be19d873717870</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x695d38eb4e57e0f137e36df7c1f0f2635981246b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x40a7df3df8b56147b781353d379cb960120211d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xaaef88cea01475125522e117bfe45cf32044e238</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x163f8c2467924be0ae7b5347228cabf260318753</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x30672ae2680c319ec1028b69670a4a786baa0f35</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc944e90c64b2c07662a292be6244bdf05cda44a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x15e6e0d4ebeac120f9a97e71faa6a0235b85ed12</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7d225c4cc612e61d26523b099b0718d03152edef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x82af49447d8a07e3bd95bd0d56f35241523fbab1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xaf88d065e77c8cc2239327c5edb3a432268e5831</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xff970a61a04b1ca14834a43f5de4533ebddb5cc8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x912ce59144191c1204e64559fe8253a0e49e6548</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x5979d7b546e38e414f7e9822514be443a4800529</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x35751007a407ca6feffe80b3cb397736d2cf4dbe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xda10009cbd5d07dd0cecc66161fc93d7c9000da1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xeb466342c4d449bc9f53a865d5cb90586f405215</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x0c880f6761f1af8d9aa9c466984b80dab9a8c9e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf97f4df75117a78c1a5a0dbb814af92458539fb4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9623063377ad1b27544c965ccd7342f7ea7e88c7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x539bde0d7dbd336b79148aa742883198bbf60342</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3082cc23568ea640225c2467653db90e9250aaa0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x18c11fd286c5ec11c3b683caa813b77f5163a122</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x289ba1701c2f088cf0faf8b3705246331cb8a839</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4cb9a7ae498cedcbb5eae9f25736ae7d428c9d66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x00cbcf7b3d37844e44b888bc747bdd75fcf4e555</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xfa7f8980b0f1e64a2062791cc3b0871572f1f7f0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd79bb960dc8a206806c3a428b31bca49934d18d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3096e7bfd0878cc65be71f8899bc4cfb57187ba3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x13ad51ed4f1b7e9dc168d8a00cb3f4ddd85efa60</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4e352cf164e64adcbad318c3a1e222e9eba4ce42</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x11cdb42b0eb46d95f990bedd4695a6e3fa034978</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xba5ddd1f9d7f570dc94a51479a000e3bce967196</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xc8ccbd97b96834b976c995a67bf46e5754e2c48e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd07d35368e04a839dee335e213302b21ef14bb4a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x323665443cef804a3b5206103304bd4872ea4253</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x83d6c8c06ac276465e4c92e7ac8c23740f435140</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x87aaffdf26c6885f6010219208d5b161ec7609c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1b8d516e2146d7a32aca0fcbf9482db85fd42c3a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xafccb724e3aec1657fc9514e3e53a0e71e80622d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4425742f1ec8d98779690b5a3a6276db85ddc01a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xec70dcb4a1efa46b8f2d97c310c9c4790ba5ffa8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3419875b4d3bca7f3fdda2db7a476a79fd31b4fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3b60ff35d3f7f62d636b067dd0dc0dfdad670e4e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x58b9cb810a68a7f3e1e4f8cb45d1b9b3c79705e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xfa5ed56a203466cbbc2430a43c66b9d8723528e7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x95146881b86b3ee99e63705ec87afe29fcc044d9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x088cd8f5ef3652623c22d48b1605dcfe860cd704</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6daf586b7370b14163171544fca24abcc0862ac5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9d2f299715d94d8a7e6f5eaa8e654e8c74a988a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x580e933d90091b9ce380740e3a4a39c67eb85b4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x655a6beebf2361a19549a99486ff65f709bd2646</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9e64d3b9e8ec387a9a58ced80b71ed815f8d82b5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2297aebd383787a160dd0d9f71508148769342e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6694340fc020c5e6b96567843da2df01b2ce1eb6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x772598e9e62155d7fdfe65fdf01eb5a53a8465be</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x431402e8b9de9aa016c743880e04e517074d8cec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd74f5255d557944cf7dd0e45ff521520002d5748</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6fd58f5a2f3468e35feb098b5f59f04157002407</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x561877b6b3dd7651313794e5f2894b2f18be0766</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf9ca0ec182a94f6231df9b14bd147ef7fb9fa17c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd77b108d4f6cefaa0cae9506a934e825becca46e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd56734d7f9979dd94fae3d67c7e928234e71cd4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf1264873436a0771e440e2b28072fafcc5eebd01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x5575552988a3a80504bbaeb1311674fcfd40ad4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x0341c0c0ec423328621788d4854119b97f44e391</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x764bfc309090e7f93edce53e5befa374cdcb7b8e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xaaa6c1e32c55a7bfa8066a6fae9b42650f262418</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9e20461bc2c4c980f62f1b279d71734207a6a356</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x7fb7ede54259cb3d4e1eaf230c7e2b1ffc951e9a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3a18dcc9745edcd1ef33ecb93b0b6eba5671e7ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x000000000026839b3f4181f2cf69336af6153b99</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x8b0e6f19ee57089f7649a455d89d7bc6314d04e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x31c91d8fb96bff40955dd2dbc909b36e8b104dde</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x25d887ce7a35172c62febfd67a1856f20faebb00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd4d42f0b6def4ce0383636770ef773390d85c61a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf8388c2b6edf00e2e27eef5200b1befb24ce141d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x619c82392cb6e41778b7d088860fea8447941f4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x94025780a1ab58868d9b2dbbb775f44b32e8e6e5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xad4b9c1fbf4923061814dd9d5732eb703faa53d4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd7a892f28dedc74e6b7b33f93be08abfc394a360</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3269a3c00ab86c753856fd135d97b87facb0d848</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4568ca00299819998501914690d6010ae48a59ba</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x21e60ee73f17ac0a411ae5d690f908c3ed66fe12</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xd3188e0df68559c0b63361f6160c57ad88b239d8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2b41806cbf1ffb3d9e31a9ece6b738bf9d6f645f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf19547f9ed24aa66b03c3a552d181ae334fbb8db</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x35e6a59f786d9266c7961ea28c7b768b33959cbb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x59a729658e9245b0cf1f8cb9fb37945d2b06ea27</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb56c29413af8778977093b9b4947efeea7136c36</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x43ab8f7d2a8dd4102ccea6b438f6d747b1b9f034</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1d987200df3b744cfa9c14f713f5334cb4bc4d5d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3404149e9ee6f17fb41db1ce593ee48fbdcd9506</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x080f6aed32fc474dd5717105dba5ea57268f46eb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb5a628803ee72d82098d4bcaf29a42e63531b441</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1622bf67e6e5747b81866fe0b85178a93c7f86e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x7dd747d63b094971e6638313a6a2685e80c7fb2e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xa2f9ecf83a48b86265ff5fd36cdbaaa1f349916c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x17a8541b82bf67e10b0874284b4ae66858cb1fd5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xbcd4d5ac29e06e4973a1ddcd782cd035d04bc0b7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x42069d11a2cc72388a2e06210921e839cfbd3280</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xbbea044f9e7c0520195e49ad1e561572e7e1b948</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe85b662fe97e8562f4099d8a1d5a92d4b453bf30</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3d9907f9a368ad0a51be60f7da3b97cf940982d8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4e51ac49bc5e2d87e0ef713e9e5ab2d71ef4f336</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x4200000000000000000000000000000000000006</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x7f5c764cbc14f9669b88837ca1490cca17c31607</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x4200000000000000000000000000000000000042</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x0b2c639c533813f4aa9d7837caf62653d097ff85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x1f32b1c2345538c0c6f582fcb022739c4a194ebb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x68f180fcce6836688e9084f035309e29bf0a2095</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x94b008aa00579c1307b0ef2c499ad98a8ce58e58</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xda10009cbd5d07dd0cecc66161fc93d7c9000da1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xdc6ff44d5d932cbd77b52e5612ba0529dc6226f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x8700daec35af8ff88c16bdf0418774cb3d7599b4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x920cf626a271321c151d027030d5d08af699456b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x6c84a8f1c29108f47a79964b5fe888d4f4d0de40</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9e1028f5f1d5ede59748ffcee5532509976840e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xeb466342c4d449bc9f53a865d5cb90586f405215</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x350a791bfc2c21f9ed5d10980dad2e2638ffa7f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x17aabf6838a6303fc6e9c5a227dc1eb6d95c829a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xf467c7d5a4a9c4687ffc7986ac6ad5a4c81e1404</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x76fb31fb4af56892a25e32cfc43de717950c9278</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xc5b001dc33727f8f26880b184090d3e252470d45</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9560e827af36c94d2ac33a39bce1fe78631088db</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9bcef72be871e61ed4fbbc7630889bee758eb81d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x50c5725949a6f0c72e6c4a641f24049a917db0cb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xf98dcd95217e15e05d8638da4c91125e59590b07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x4b03afc91295ed778320c2824bad5eb5a1d852dd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xc40f949f8a4e094d1b49a23ea9241d289b7b2819</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x323665443cef804a3b5206103304bd4872ea4253</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x50bce64397c75488465253c0a034b8097fea6578</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x296f55f8fb28e498b858d0bcda06d955b2cb3f97</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x2598c30330d5771ae9f983979209486ae26de875</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x0994206dfe8de6ec6920ff4d779b0d950605fb53</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xc3248a1bd9d72fa3da6e6ba701e58cbf818354eb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x6fd9d7ad17242c41f7131d257212c54a0e816691</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x14778860e937f509e651192a90589de711fb88a9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xdfa46478f9e5ea86d57387849598dbfb2e964b02</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9b88d293b7a791e40d36a39765ffd5a1b9b5c349</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x3eb398fec5f7327c6b15099a9681d9568ded2e82</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x217d47011b23bb961eb6d93ca9945b7501a5bb11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x1cef2d62af4cd26673c7416957cc4ec619a696a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9fd22a17b4a96da3f83797d122172c450381fb88</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0xaddb6a0412de1ba0f936dcaeb8aaa24578dcf3b2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x2791bca1f2de4661ed88a30c99a7a9449aa84174</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x7ceb23fd6bc0add59e62ac25578270cff1b9f619</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3c499c542cef5e3811e1192ce70d8cc03d5c3359</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xc2132d05d31c914a87c6611c10748aeb04b58e8f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x53e0bca35ec356bd5dddfebbd1fc0fd03fabad39</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x61299774020da444af134c82fa83e3810b309991</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xd6df932a45c0f255f85145f286ea0b292b21c90b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x2ad2934d5bfb7912304754479dd1f096d5c807da</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xc3c7d422809852031b44ab29eec9f1eff2a58756</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x8f3cf7ad23cd3cadbd9735aff958023239c6a063</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x750e4c4984a9e0f12978ea6742bc1c5d248f40ed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x111111517e4929d3dcbdfa7cce55d30d4b6bc4d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xd0258a3fd00f38aa8090dfee343f10a9d4d30d3f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x430ef9263e76dae63c84292c3409d61c598e9682</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xb33eaad8d922b1083446dc23f610c2567fb5180f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xdc3326e71d45186f113a2f448984ca0e8d201995</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x311434160d7537be358930def317afb606c0d737</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0b3f868e0be5597d5db7feb59e1cadbb0fdda50a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe3f2b1b2229c0333ad17d03f179b87500e7c5e01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xac0f66379a6d7801d7726d5a943356a172549adb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xf88332547c680f755481bf489d890426248bb275</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe5417af564e4bfda1c483642db72007871397896</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe261d618a959afffd53168cd07d12e37b26761db</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe0b52e49357fd4daf2c15e02058dce6bc0057db4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xbbba073c31bf03b8acf7c28ef0738decf3695683</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe238ecb42c424e877652ad82d8a939183a04c35f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3b56a704c01d650147ade2b8cee594066b3f9421</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x5fe2b58c013d7601147dcdd68c143a77499f5531</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x172370d5cd63279efa6d502dab29171933a610af</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x53df32548214f51821cf1fe4368109ac5ddea1ff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xff76c0b48363a7c7307868a81548d340049b0023</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x6f8a06447ff6fcf75d803135a7de15ce88c1d4ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x50b728d8d964fd00c2d0aad81718b71311fef68a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x03b54a6e9a984069379fae1a4fc4dbae93b3bccd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xd93f7e271cb87c23aaa73edc008a79646d1f9912</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x200c234721b5e549c3693ccc93cf191f90dc2af9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x11cd37bb86f65419713f30673a480ea33c826872</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x8a16d4bf8a0a716017e8d2262c4ac32927797a2f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xa1c57f48f0deb89f569dfbe6e2b7f46d33606fd4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x190eb8a183d22a4bdf278c6791b152228857c033</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x2f6f07cdcf3588944bf4c42ac74ff24bf56e7590</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x235737dbb56e8517391473f7c964db31fa6ef280</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0b220b82f3ea3b7f6d9a1d8ab58930c064a2b5bf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x8bff1bd27e2789fe390acabc379c380a83b68e84</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xb58458c52b6511dc723d7d6f3be8c36d7383b4a8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x323665443cef804a3b5206103304bd4872ea4253</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x2760e46d9bb43dafcbecaad1f64b93207f9f0ed7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x18ec0a6e18e5bc3784fdd3a3634b31245ab704f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x431d5dff03120afa4bdf332c61a6e1766ef37bdb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x6f7c932e7684666c9fd1d44527765433e01ff61d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xeee3371b89fc43ea970e908536fcddd975135d8a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe5b49820e5a1063f6f4ddf851327b5e8b2301048</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xaa3717090cddc9b227e49d0d84a28ac0a996e6ff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x62a872d9977db171d9e213a5dc2b782e72ca0033</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x381caf412b45dac0f62fbeec89de306d3eabe384</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe0bceef36f3a6efdd5eebfacd591423f8549b9d5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x23d29d30e35c5e8d321e1dc9a8a61bfd846d4c5c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x282d8efce846a88b159800bd4130ad77443fa1a1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x74dd45dd579cad749f9381d6227e7e02277c944b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x714db550b574b3e927af3d93e26127d15721d4c2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xfa68fb4628dff1028cfec22b4162fccd0d45efb6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe631dabef60c37a37d70d3b4f812871df663226f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xdb725f82818de83e99f1dac22a9b5b51d3d04dd4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3c59798620e5fec0ae6df1a19c6454094572ab92</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0d0b8488222f7f83b23e365320a4021b12ead608</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xa380c0b01ad15c8cf6b46890bddab5f0868e87f3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x8a953cfe442c5e8855cc6c61b1293fa648bae472</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x45c32fa6df82ead1e2ef74d17b76547eddfaff89</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x11cd72f7a4b699c67f225ca8abb20bc9f8db90c7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0c9c7712c83b3c70e7c5e11100d33d9401bdf9dd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x77a6f2e9a9e44fd5d5c3f9be9e52831fc1c3c0a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xbfc70507384047aa74c29cdc8c5cb88d0f7213ac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xfcb54da3f4193435184f3f647467e12b50754575</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x9a6a40cdf21a0af417f1b815223fd92c85636c58</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe111178a87a3bff0c8d18decba5798827539ae99</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x82617aa52dddf5ed9bb7b370ed777b3182a30fd1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x2ab0e9e4ee70fff1fb9d67031e44f6410170d00e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xa486c6bc102f409180ccb8a94ba045d39f8fc7cb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xc4a206a306f0db88f98a3591419bc14832536862</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xf0059cc2b3e980065a906940fbce5f9db7ae40a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x16eccfdbb4ee1a85a33f3a9b21175cd7ae753db4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x553d3d295e0f695b9228246232edf400ed3560b5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x14af1f2f02dccb1e43402339099a05a5e363b83c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x7bdf330f423ea880ff95fc41a280fd5ecfd3d09f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x8505b9d2254a7ae468c0e9dd10ccea3a837aef5c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe2aa7db6da1dae97c5f5c6914d285fbfcc32a128</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xb7b31a6bc18e48888545ce79e83e06003be70930</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x1631244689ec1fecbdd22fb5916e920dfc9b8d30</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xf6372cdb9c1d3674e83842e3800f2a62ac9f3c66</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x692ac1e363ae34b6b489148152b12e2785a3d8d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x0266f4f08d82372cf0fcbccc0ff74309089c74d1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x7fbc10850cae055b27039af31bd258430e714c62</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xa3fa99a148fa48d14ed51d610c367c61876997f1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x9dbfc1cbf7a1e711503a29b4b5f9130ebeccac96</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x236aa50979d5f3de3bd1eeb40e81137f22ab794b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xf86df9b91f002cfeb2aed0e6d05c4c4eaef7cf02</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4200000000000000000000000000000000000006</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x6921b130d297cc43754afba22e5eac0fbf8db75b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x5babfc2f240bc5de90eb7e19d789412db1dec402</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x532f27101965dd16442e59d40670faf5ebb142e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x833589fcd6edb6e08f4c7c32d4f71b54bda02913</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4ed4e862860bed51a9570b96d89af5e1b0efefed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xc1cba3fcea344f92d9239c08c0568f6f2f0ee452</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xac1bd2486aaf3b5c0fc3fd868558b082a531b2b4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x0d97f261b1e88845184f678e2d1e7a98d9fd38de</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8129b94753f22ec4e62e2c4d099ffe6773969ebc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3f14920c99beb920afa163031c4e47a3e03b3e4a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x940181a94a35a4569e4529a3cdfb74e38fd98631</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3419875b4d3bca7f3fdda2db7a476a79fd31b4fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xa067436db77ab18b1a315095e4b816791609897c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xafb89a09d82fbde58f18ac6437b3fc81724e4df6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x489fe42c267fe0366b16b0c39e7aeef977e841ef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xdc46c1e93b71ff9209a0f8076a9951569dc35855</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x91f45aa2bde7393e0af1cc674ffe75d746b93567</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x236aa50979d5f3de3bd1eeb40e81137f22ab794b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xf6e932ca12afa26665dc4dde7e27be02a7c02e50</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x524d524b4c9366be706d3a90dcf70076ca037ae3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x5b5dee44552546ecea05edea01dcd7be7aa6144a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x2598c30330d5771ae9f983979209486ae26de875</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xfa980ced6895ac314e7de34ef1bfae90a5add21b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x469fda1fb46fcb4befc0d8b994b516bd28c87003</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4e496c0256fb9d4cc7ba2fdf931bc9cbb7731660</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x27d2decb4bfc9c76f0309b8e88dec3a601fe25a8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x9e1028f5f1d5ede59748ffcee5532509976840e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3c3aa127e6ee3d2f2e432d0184dd36f2d2076b52</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xba5e6fa2f33f3955f0cef50c63dcc84861eab663</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x97c806e7665d3afd84a8fe1837921403d59f3dcc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8ee73c484a26e0a5df2ee2a4960b789967dd0415</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x00e57ec29ef2ba7df07ad10573011647b2366f6d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8f019931375454fe4ee353427eb94e2e0c9e0a8c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x93e6407554b2f02640ab806cd57bd83e848ec65d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x55d398326f99059ff775485246999027b3197955</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x2170ed0880ac9a755fd29b2688956bd959f933f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xfdc66a08b0d0dc44c17bbd471b88f49f50cdd20f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x7130d2a12b9bcbfae4f2634d864a1ee1ce3ead9c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1d2f0da169ceb9fc7b3144628db156f3f6c60dbe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xe9e7cea3dedca5984780bafc599bd69add087d56</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xfa54ff1a158b5189ebba6ae130ced6bbd3aea76e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x570a5d26f7765ecb712c0924e4de545b89fd43df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x47c454ca6be2f6def6f32b638c80f91c9c3c5949</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xad86d0e9764ba90ddd68747d64bffbd79879a238</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xf8a0bf9cf54bb92f17374d9e9a321e6a111a51bd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xd691d9a68c887bdf34da8c36f63487333acfd103</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1294f4183763743c7c9519bec51773fb3acd78fd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xb04906e95ab5d797ada81508115611fee694c2b3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x111111111117dc0aa78b770fa6a738034120c302</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xcc42724c6683b7e57334c4e856f4c9965ed682bd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x90c97f71e18723b0cf0dfa30ee176ab653e89f40</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x2b72867c32cf673f7b02d208b26889fed353b1f8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x031b41e504677879370e9dbcf937283a8691fa7f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1ce0c2827e2ef14d5c4f29a091d735a204794041</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xcf3bb6ac0f6d987a5727e2d15e39c2d6061d5bec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x8ff795a6f4d97e7887c79bea79aba5cc76444adf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x2dff88a56767223a5529ea5960da7a3f5f766406</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x003d87d02a2a01e9e8a20f507c83e15dd83a33d1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x4b0f1812e5df2a09796481ff14017e6005508003</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xbf5140a22578168fd562dccf235e5d43a02ce9b1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xca1c644704febf4ab81f85daca488d1623c28e63</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x51e72dd1f2628295cc2ef931cb64fdbdc3a0c599</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xbbca42c60b5290f2c48871a596492f93ff0ddc82</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x555296de6a86e72752e5c5dc091fe49713aa145c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0808bf94d57c905f1236212654268ef82e1e594e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x8457ca5040ad67fdebbcc8edce889a335bc0fbfb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xcebef3df1f3c5bfd90fde603e71f31a53b11944d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x90ed8f1dc86388f14b64ba8fb4bbd23099f18240</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x9840652dc04fb9db2c43853633f0f62be6f00f98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xba2ae424d960c26247dd6c32edc70b295c744c43</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0782b6d8c4551b9760e74c0545a9bcd90bdc41e5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xbe2b6c5e31f292009f495ddbda88e28391c9815e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x8f0528ce5ef7b51152a59745befdd91d97091d2f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xffeecbf8d7267757c2dc3d13d730e97e15bfdf7f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0eb3a705fc54725037cc9e008bdede697f62f335</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xf21768ccbc73ea5b6fd3c687208a7c2def2d966e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0000028a2eb8346cd5c0267856ab7594b7a55308</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x76a797a59ba2c17726896976b7b3747bfd1d220f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xc79d1fd14f514cd713b5ca43d288a782ae53eab2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xad29abb318791d579433d831ed122afeaf29dcfe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x3203c9e46ca618c8c1ce5dc67e7e9d75f5da2377</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xdb021b1b247fe2f1fa57e0a87c748cc1e321f07f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x7083609fce4d1d8dc0c979aab8c869ea2c873402</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xc5f0f7b66764f6ec8c8dff7ba683102295e16409</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xe29142e14e52bdfbb8108076f66f49661f10ec10</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xb0d502e938ed5f4df2e681fe6e419ff29631d62b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x6730f7a6bbb7b9c8e60843948f7feb4b6a17b7f7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1613957159e9b0ac6c80e824f7eea748a32a0ae2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x471ece3750da237f93b8e339c536989b8978a438</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x765de816845861e75a25fca122bb6898b8b1282a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x66803fb87abd4aac3cbb3fad7c3aa01f6f3fb207</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x37f750b7cc259a2f741af45294f6a16572cf5cad</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0xd71ffd0940c920786ec4dbb5a12306669b5b81ef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0xe8537a3d056da446677b9e9d6c5db704eaab4787</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x4f604735c1cf31399c6e711d5962b2b3e0225ad3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x02de4766c272abc10bc88c220d214a26960a7e92</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0xceba9300f2b948710d2653dd7b07f33a8b32118c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0xc16b81af351ba9e64c1a069e3ab18c244a1e3049</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x728f30fa2f100742c7949d1961804fa8e0b1387d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x41ea5d41eeacc2d5c4072260945118a13bb7ebce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf21661d0d1d76d3ecb8e1b9f1c923dbfffae4097</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb0ecc6ac0073c063dcfc026ccdc9039cae2998e1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x00f932f0fe257456b32deda4758922e56a4f4b42</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xa4af354d466e8a68090dd9eb2cb7caf162f4c8c2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xba50933c268f567bdc86e1ac131be072c6b0b71a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd29da236dd4aac627346e1bba06a619e8c22d7c5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1bfce574deff725a3f483c334b790e25c8fa9779</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9e18d5bab2fa94a6a95f509ecb38f8f68322abd3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbf5495efe5db9ce00f80364c8b423567e58d2110</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x065b4e5dfd50ac12a81722fd0a0de81d78ddf7fb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x57e114b691db790c35207b2e685d4a43181e6061</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0b7f0e51cd1739d6c96982d55ad8fa634dd43a9c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc56c7a0eaa804f854b536a5f3d5f49d2ec4b12b8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x594daad7d77592a2b97b725a7ad59d7e188b5bfa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8355dbe8b0e275abad27eb843f3eaf3fc855e525</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2a961d752eaa791cbff05991e4613290aec0d9ac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x38e68a37e401f7271568cecaac63c6b1e19130b4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1131d427ecd794714ed00733ac0f851e904c8398</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1495bc9e44af1f8bcb62278d2bec4540cf0c05ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x808507121b80c02388fad14726482e061b8da827</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x44971abf0251958492fee97da3e5c5ada88b9185</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x320623b8e4ff03373931769a31fc52a4e78b5d70</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6e5970dbd6fc7eb1f29c6d2edf2bc4c36124c0c1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd40c688da9df74e03566eaf0a7c754ed98fbb8cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8afe4055ebc86bd2afb3940c0095c9aca511d852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9ce84f6a69986a83d92c324df10bc8e64771030f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbe4d9c8c638b5f0864017d7f6a04b66c42953847</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x68bbed6a47194eff1cf514b50ea91895597fc91e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x69420e3a3aa9e17dea102bb3a9b3b73dcddb9528</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7420b4b9a0110cdc71fb720908340c03f9bc03ec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x03aa6298f1370642642415edc0db8b957783e8d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd533a949740bb3306d119cc777fa900ba034cd52</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf14dd7b286ce197019cba54b189d2b883e70f761</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa35923162c49cf95e6bf26623385eb431ad920d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8cefbeb2172a9382753de431a493e21ba9694004</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x120a3879da835a5af037bb2d1456bebd6b54d4ba</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x69457a1c9ec492419344da01daf0df0e0369d5d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf6ce4be313ead51511215f1874c898239a331e37</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x73d7c860998ca3c01ce8c808f5577d94d545d1b4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xeff49b0f56a97c7fd3b51f0ecd2ce999a7861420</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x236501327e701692a281934230af0b6be8df3353</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5026f006b85729a8b14553fae6af249ad16c9aab</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x66761fa41377003622aee3c7675fc7b5c1c2fac5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9f9c8ec3534c3ce16f928381372bfbfbfb9f4d24</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd8c978de79e12728e38aa952a6cb4166f891790f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7122985656e38bdc0302db86685bb972b145bd3c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x582d872a1b094fc48f5de31d3b73f2d9be47def1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x504624040e0642921c2c266a9ac37cafbd8cda4e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc548e90589b166e1364de744e6d35d8748996fe8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4c11249814f11b9346808179cf06e71ac328c1b5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x423f4e6138e475d85cf7ea071ac92097ed631eea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8390a1da07e376ef7add4be859ba74fb83aa02d5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf94e7d0710709388bce3161c32b4eea56d3f91cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/ethereum/0xaa95f26e30001251fb905d264aa7b00ee9df6c18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2416092f143378750bb29b79ed961ab195cceea5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6c84a8f1c29108f47a79964b5fe888d4f4d0de40</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x71eeba415a523f5c952cc2f06361d5443545ad28</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x88a269df8fe7f53e590c561954c52fccc8ec0cfb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x429fed88f10285e61b12bdf00848315fbdfcc341</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb299751b088336e165da313c33e3195b8c6663a6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf0a479c9c3378638ec603b8b6b0d75903902550b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb59c8912c83157a955f9d715e556257f432c35d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xba0dda8762c24da9487f5fa026a9b64b695a07ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xc24a365a870821eb83fd216c9596edd89479d8d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xa586b3b80d7e3e8d439e25fbc16bc5bcee3e2c85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xef04804e1e474d3f9b73184d7ef5d786f3fce930</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2e9a6df78e42a30712c10a9dc4b1c8656f8f2879</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x13a7dedb7169a17be92b0e3c7c2315b46f4772b3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1dd6b5f9281c6b4f043c02a83a46c2772024636c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xc5102fe9359fd9a28f877a67e36b0f050d81a3cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xf525e73bdeb4ac1b0e741af3ed8a8cbb43ab0756</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe4177c1400a8eee1799835dcde2489c6f0d5d616</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xed5740209fcf6974d6f3a5f11e295b5e468ac27c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe10d4a4255d2d35c9e23e2c4790e073046fbaf5c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x10398abc267496e49106b07dd6be13364d10dc71</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x2218a117083f5b482b0bb821d27056ba9c04b1d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x395ae52bb17aef68c2888d941736a71dc6d4e125</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/optimism/0x9a601c5bb360811d96a23689066af316a30c3027</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xbac3368b5110f3a3dda8b5a0f7b66edb37c47afe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x1d3c629ca5c1d0ab3bdf74600e81b4145615df8e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xe9c21de62c5c5d0ceacce2762bf655afdceb7ab3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x658cda444ac43b0a7da13d638700931319b64014</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3d2bd0e15829aa5c362a4144fdf4a1112fa29b5c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x3fb83a9a2c4408909c058b0bfe5b4823f54fafe2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x00e5646f60ac6fb446f621d146b6e1886f002905</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x12a4cebf81f8671faf1ab0acea4e3429e42869e7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x9ff62d1fc52a907b6dcba8077c2ddca6e6a9d3e1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0xc61f39418cd27820b5d4e9ba4a7197eefaeb8b05</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x15b7c0c907e4c6b9adaaaabc300c08991d6cea05</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x7f67639ffc8c93dd558d452b8920b28815638c44</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/polygon/0x276c9cbaa4bdf57d7109a41e67bd09699536fa3d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x041fdf3f472d2c8a7ecc458fc3b7f543e6c57ef7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3c281a39944a2319aa653d81cfd93ca10983d234</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x96419929d7949d6a801a6909c145c8eef6a40431</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xfea9dcdc9e23a9068bf557ad5b186675c61d33ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xdb6e0e5094a25a052ab6845a9f1e486b9a9b3dde</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xcde172dc5ffc46d228838446c57c1227e0b82049</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xff0c532fdb8cd566ae169c1cb157ff2bdc83e105</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x9a26f5433671751c3276a065f57e5a02d2817973</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3636a7734b669ce352e97780df361ce1f809c58c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x50c5725949a6f0c72e6c4a641f24049a917db0cb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xe3086852a4b125803c815a158249ae468a3254ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xbeb0fd48c2ba0f1aacad2814605f09e08a96b94e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xbc45647ea894030a4e9801ec03479739fa2485f0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x768be13e1680b5ebe0024c42c896e3db59ec0149</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x928a6a9fc62b2c94baf2992a6fba4715f5bb0066</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xbf4db8b7a679f89ef38125d5f84dd1446af2ea3b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xed899bfdb28c8ad65307fa40f4acab113ae2e14c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x1b6a569dd61edce3c383f6d565e2f79ec3a12980</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x76734b57dfe834f102fb61e1ebf844adf8dd931e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4621b7a9c75199271f773ebd9a499dbd165c3191</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xaf07d812d1dcec20bf741075bc18660738d226dd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x7f12d13b34f5f4f0a9449c16bcd42f0da47af200</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x55a6f6cb50db03259f6ab17979a4891313be2f45</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x968d6a288d7b024d5012c0b25d67a889e4e3ec19</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x7a8a5012022bccbf3ea4b03cd2bb5583d915fb1a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xcde90558fc317c69580deeaf3efc509428df9080</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x0028e1e60167b48a938b785aa5292917e7eaca8b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x76e7447bafa3f0acafc9692629b1d1bc937ca15d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x15ac90165f8b45a80534228bdcb124a011f62fee</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4045b33f339a3027af80013fb5451fdbb01a4492</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xddf98aad8180c3e368467782cd07ae2e3e8d36a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x698dc45e4f10966f6d1d98e3bfd7071d8144c233</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x3c8665472ec5af30981b06b4e0143663ebedcc1e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x18a8bd1fe17a1bb9ffb39ecd83e9489cfd17a022</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xba0dda8762c24da9487f5fa026a9b64b695a07ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x13741c5df9ab03e7aa9fb3bf1f714551dd5a5f8a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xebff2db643cf955247339c8c6bcd8406308ca437</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xfadb26be94c1f959f900bf88cd396b3e803481d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x52c2b317eb0bb61e650683d2f287f56c413e4cf6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x38d513ec43dda20f323f26c7bef74c5cf80b6477</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x33ad778e6c76237d843c52d7cafc972bb7cf8729</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x290814ad0fbd2b935f34d7b40306102313d4c63e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x5e432eecd01c12ee7071ee9219c2477a347da192</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xbdf5bafee1291eec45ae3aadac89be8152d4e673</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xff62ddfa80e513114c3a0bf4d6ffff1c1d17aadf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8c81b4c816d66d36c4bf348bdec01dbcbc70e987</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x6b82297c6f1f9c3b1f501450d2ee7c37667ab70d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x42069babe14fb1802c5cb0f50bb9d2ad6fef55e2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x72499bddb67f4ca150e1f522ca82c87bc9fb18c8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x0578d8a44db98b23bf096a382e016e29a5ce0ffe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8fe815417913a93ea99049fc0718ee1647a2a07c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x7d12aeb5d96d221071d176980d23c213d88d9998</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xb166e8b140d35d9d8226e40c09f757bac5a4d87d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8853f0c059c27527d33d02378e5e4f6d5afb574a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xf3c052f2baab885c610a748eb01dfbb643ba835b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xcd1cffa8ebc66f1a2cf7675b48ba955ffcb82d8e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xde7a416ac821c77478340eebaa21b68297025ef3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x2da56acb9ea78330f947bd57c54119debda7af71</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8972ab69d499b5537a31576725f0af8f67203d38</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x88faea256f789f8dd50de54f9c807eef24f71b16</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x42069de48741db40aef864f8764432bbccbd0b69</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x9a27c6759a6de0f26ac41264f0856617dec6bc3f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xfaa4f3bcfc87d791e9305951275e0f62a98bcb10</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xfd9fa4f785331ce88b5af8994a047ba087c705d8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x21eceaf3bf88ef0797e3927d855ca5bb569a47fc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x7d9ce55d54ff3feddb611fc63ff63ec01f26d15f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4229c271c19ca5f319fb67b4bc8a40761a6d6299</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x80f45eacf6537498ecc660e4e4a2d2f99e195cf4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x1a475d06d967aeb686c98de80d079d72097aeacf</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x4fb9b20dafe45d91ae287f2e07b2e79709308178</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xd3741ac9b3f280b0819191e4b30be4ecd990771e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x09579452bc3872727a5d105f342645792bb8a82b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x8a24d7260cd02d3dfd8eefb66bc17ad4b17d494c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xd88611a629265c9af294ffdd2e7fa4546612273e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x9a86980d3625b4a6e69d8a4606d51cbc019e2002</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x1c7a460413dd4e964f96d8dfc56e7223ce88cd85</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x776aaef8d8760129a0398cf8674ee28cefc0eab9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x28e29ec91db66733a94ee8e3b86a6199117baf99</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xb9898511bd2bad8bfc23eba641ef97a08f27e730</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x76baa16ff15d61d32e6b3576c3a8c83a25c2f180</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x2816a491dd0b7a88d84cbded842a618e59016888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0xa7ea9d5d4d4c7cf7dbde5871e6d108603c6942a5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/base/0x586e10db93630a4d2da6c6a34ba715305b556f04</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xf486ad071f3bee968384d2e39e2d8af0fcf6fd46</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x76d36d44dc4595e8d2eb3ad745f175eda134284f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x1fa4a73a3f0133f0025378af00236f3abdee5d63</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xb3ed0a426155b79b898849803e3b36552f7ed507</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x0ef4a107b48163ab4b57fca36e1352151a587be4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x62694d43ccb9b64e76e38385d15e325c7712a735</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xa2b726b1145a4773f68593cf171187d8ebe4d495</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0xf275e1ac303a4c9d987a2c48b8e555a77fec3f1c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/bnb/0x11a31b833d43853f8869c9eec17f60e3b4d2a753</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
   <url>
     <loc>https://app.uniswap.org/explore/tokens/celo/0x48065fbbe25f71c9282ddf5e1cd6d6a887483d5e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbadff0ef41d2a68f22de21eabca8a59aaf495cf0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1fdd61ef9a5c31b9a2abc7d39c139c779e8412af</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4ade2b180f65ed752b6f1296d0418ad21eb578c0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0c5cb676e38d6973837b9496f6524835208145a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb69753c06bb5c366be51e73bfc0cc2e3dc07e371</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8143182a775c54578c8b7b3ef77982498866945d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x76e222b07c53d28b89b0bac18602810fc22b49a8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x18aaa7115705e8be94bffebde57af9bfc265b998</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7d8146cf21e8d7cbe46054e01588207b51198729</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1ce270557c1f68cfb577b856766310bf8b47fd9c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x793a5d8b30aab326f83d20a9370c827fea8fdc51</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xff836a5821e69066c87e268bc51b849fab94240c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf4d2888d29d722226fafa5d9b24f9164c092421e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8ed97a637a790be1feff5e888d43629dc05408f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x31c8eacbffdd875c74b94b077895bd78cf1e64a3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc55126051b22ebb829d00368f4b12bde432de5da</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe0f63a424a4439cbe457d80e4f4b51ad25b2c56c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8881562783028f5c1bcb985d2283d5e170d88888</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x67466be17df832165f8c80a5a120ccc652bd7e69</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd939212f16560447ed82ce46ca40a63db62419b5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x88417754ff7062c10f4e3a4ab7e9f9d9cbda6023</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5afe3855358e112b5647b952709e6165e1c1eeee</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x02e7f808990638e9e67e1f00313037ede2362361</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd2bdaaf2b9cc6981fd273dcb7c04023bfbe0a7fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x112b08621e27e10773ec95d250604a041f36c582</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x32b053f2cba79f80ada5078cb6b305da92bde6e1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5ac34c53a04b9aaa0bf047e7291fb4e8a48f2a18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x26ebb8213fb8d66156f1af8908d43f7e3e367c1d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe3b9cfb8ea8a4f1279fbc28d3e15b4d2d86f18a0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8207c1ffc5b6804f6024322ccf34f29c3541ae26</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x255f1b39172f65dc6406b8bee8b08155c45fe1b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x092baadb7def4c3981454dd9c0a0d7ff07bcfc86</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x53bcf6698c911b2a7409a740eacddb901fc2a2c6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2ac2b254bc18cd4999f64773a966e4f4869c34ee</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x17fc002b466eec40dae837fc4be5c67993ddbd6f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xc8a4eea31e9b6b61c406df013dd4fec76f21e279</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x498bf2b1e120fed3ad3d42ea2165e9b73f99c1e5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe4dddfe67e7164b0fe14e218d80dc4c08edc01cb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x7c8a1a80fdd00c9cccd6ebd573e9ecb49bfa2a59</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1debd73e752beaf79865fd6446b0c970eae7732f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xaf5db6e1cc585ca312e8c8f7c499033590cf5c98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x65559aa14915a70190438ef90104769e5e890a00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x7fb688ccf682d58f86d7e38e03f9d22e7705448b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x73cb180bf0521828d8849bc8cf2b920918e23032</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x2e3d870790dc77a83dd1d18184acc7439a53f475</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0xa00e3a3511aac35ca78530c85007afcd31753819</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x528cdc92eab044e1e39fe43b9514bfdab4412b98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x4f604735c1cf31399c6e711d5962b2b3e0225ad3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x1c954e8fe737f99f68fa1ccda3e51ebdb291948c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xf50d05a1402d0adafa880d36050736f9f6ee7dee</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xab0b2ddb9c7e440fac8e140a89c0dbcbf2d7bbff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x8bc3ec2e7973e64be582a90b08cadd13457160fe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x64060ab139feaae7f06ca4e63189d86adeb51691</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x5ec03c1f7fa7ff05ec476d19e34a22eddb48acdc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x9627a3d6872be48410fcece9b1ddd344bf08c53e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x1ed02954d60ba14e26c230eec40cbac55fa3aeea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8d3419b9a18651f3926a205ee0b1acea1e7192de</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb56d0839998fd79efcd15c27cf966250aa58d6d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x81f91fe59ee415735d59bd5be5cca91a0ea4fa69</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x87c211144b1d9bdaa5a791b8099ea4123dc31d21</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xf4210f93bc68d63df3286c73eba08c6414f40c0d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xece7b98bd817ee5b1f2f536daf34d0b6af8bb542</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4c96a67b0577358894407af7bc3158fc1dffbeb5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x70737489dfdf1a29b7584d40500d3561bd4fe196</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x39353a32eceafe4979a8606512c046c3b6398cc4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x92fb1b7d9730b2f1bd4e2e91368c1eb6fdd2a009</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x174e33ef2effa0a4893d97dda5db4044cc7993a3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xfdc944fb59201fb163596ee5e209ebc8fa4dcdc5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x388e543a5a491e7b42e3fbcd127dd6812ea02d0d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x56a38e7216304108e841579041249feb236c887b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1804e3db872eed4141e482ff74c56862f2791103</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x9de16c805a3227b9b92e39a446f9d56cf59fe640</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb8d98a102b0079b69ffbc760c8d857a31653e56e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x5d6812722c3693078e4a0dbe3e9affc27a0b2768</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x255f1b39172f65dc6406b8bee8b08155c45fe1b6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xc2fe011c3885277c7f0e7ffd45ff90cadc8ecd12</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xc1ffaef4e7d553bbaf13926e258a1a555a363a07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4e73420dcc85702ea134d91a262c8ffc0a72aa70</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xecaf81eb42cd30014eb44130b89bcd6d4ad98b92</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x4eae52907dba9c370e9ee99f0ce810602a4f2c63</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x25d887ce7a35172c62febfd67a1856f20faebb00</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x382ea807a61a418479318efd96f1efbc5c1f2c21</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6468e79a80c0eab0f9a2b574c8d5bc374af59414</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3106a0a076bedae847652f42ef07fd58589e001f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd015422879a1308ba557510345e944b912b9ab73</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5de8ab7e27f6e7a1fff3e5b337584aa43961beef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xcf078da6e85389de507ceede0e3d217e457b9d49</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1bbf25e71ec48b84d773809b4ba55b6f4be946fb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7039cd6d7966672f194e8139074c3d5c4e6dcf65</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x943af17c37207c9d7a27d12cb5055542a0b7afa8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6d68015171eaa7af9a5a0a103664cf1e506ff699</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6942806d1b2d5886d95ce2f04314ece8eb825833</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x949d48eca67b17269629c7194f4b727d4ef9e5d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9361adf2b72f413d96f81ff40d794b47ce13b331</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3bb1be077f3f96722ae92ec985ab37fd0a0c4c51</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xdbb7a34bf10169d6d2d0d02a6cbb436cf4381bfa</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x66bff695f3b16a824869a8018a3a6e3685241269</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x85d19fb57ca7da715695fcf347ca2169144523a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x069d89974f4edabde69450f9cf5cf7d8cbd2568d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0fe13ffe64b28a172c58505e24c0c111d149bd47</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x111111111117dc0aa78b770fa6a738034120c302</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xdc7ac5d5d4a9c3b5d8f3183058a92776dc12f4f3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x482702745260ffd69fc19943f70cffe2cacd70e9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc555d625828c4527d477e595ff1dd5801b4a600e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9eec1a4814323a7396c938bc86aec46b97f1bd82</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x87d73e916d7057945c9bcd8cdd94e42a6f47f776</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x067def80d66fb69c276e53b641f37ff7525162f6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xdd157bd06c1840fa886da18a138c983a7d74c1d7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe80772eaf6e2e18b651f160bc9158b2a5cafca65</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb6093b61544572ab42a0e43af08abafd41bf25a6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x35ca1e5a9b1c09fa542fa18d1ba4d61c8edff852</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x83e60b9f7f4db5cdb0877659b1740e73c662c55b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4d01397994aa636bdcc65c9e8024bc497498c3bb</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xc3abc47863524ced8daf3ef98d74dd881e131c38</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x4d15a3a2286d883af0aa1b3f21367843fac63e07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xfb7f8a2c0526d01bfb00192781b7a7761841b16c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x3809dcdd5dde24b37abe64a5a339784c3323c44f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x85955046df4668e1dd369d2de9f3aeb98dd2a369</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x554cd6bdd03214b10aafa3e0d4d42de0c5d2937b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x4318cb63a2b8edf2de971e2f17f77097e499459d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xab9cb20a28f97e189ca0b666b8087803ad636b3c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x6a8ec2d9bfbdd20a7f5a4e89d640f7e7ceba4499</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x385eeac5cb85a38a9a07a70c73e0a3271cfb54a7</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x0169ec1f8f639b32eec6d923e24c2a2ff45b9dd6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xe161be4a74ab8fa8706a2d03e67c02318d0a0ad6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4d58608eff50b691a3b76189af2a7a123df1e9ba</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x420b0fa3de2efcf2b2fd04152eb1df36a09717cd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1cd38856ee0fdfd65c757e530e3b1de3061008d3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xfad8cb754230dbfd249db0e8eccb5142dd675a0d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xda761a290e01c69325d12d82ac402e5a73d62e81</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xafb5d4d474693e68df500c9c682e6a2841f9661a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x0b3e328455c4059eeb9e3f84b5543f74e24e7e1b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xfc5462143a3178cf044e97c491f6bcb5e38f173e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xed1978d01d4a8a9d6a43ac79403d5b8dfbed739b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xba71cb8ef2d59de7399745793657838829e0b147</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x10c1b6f768e13c624a4a23337f1a5ba5c9be0e4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1b1514c76c54ce8807d7fdedf85c664eee734ece</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x58cd93c4a91c3940109fa27d700f5013b18b5dc2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xea6f7e7e0f46a9e0f4e2048eb129d879f609d632</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x30d19fb77c3ee5cfa97f73d72c6a1e509fa06aef</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xe2dca969624795985f2f083bcd0b674337ba130a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xbb7d61d2511fd2e63f02178ca9b663458af9fc63</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x59f4f336bf3d0c49dbfba4a74ebd2a6ace40539a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x62d0a8458ed7719fdaf978fe5929c6d342b0bfce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb8fda5aee55120247f16225feff266dfdb381d4c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xca530408c3e552b020a2300debc7bd18820fb42f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3ffeea07a27fab7ad1df5297fa75e77a43cb5790</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xcfeb09c3c5f0f78ad72166d55f9e6e9a60e96eec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x467bccd9d29f223bce8043b84e8c8b282827790f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2077d81d0c5258230d5a195233941547cb5f0989</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa0bbbe391b0d0957f1d013381b643041d2ca4022</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd1b89856d82f978d049116eba8b7f9df2f342ff3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x62f03b52c377fea3eb71d451a95ad86c818755d1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3927fb89f34bbee63351a6340558eebf51a19fb8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xacd2c239012d17beb128b0944d49015104113650</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x86b69f38bea3e02f68ff88534bc61ec60e772b19</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6873c95307e13beb58fb8fcddf9a99667655c9e4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x18084fba666a33d37592fa2633fd49a74dd93a88</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6e79b51959cf968d87826592f46f819f92466615</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x80ee5c641a8ffc607545219a3856562f56427fe9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0414d8c87b271266a5864329fb4932bbe19c0c49</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf57e7e7c23978c3caec3c3548e3d615c346e79ff</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb0ffa8000886e57f86dd5264b9582b2ad87b2b91</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1c986661170c1834db49c3830130d4038eeeb866</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9ed7e4b1bff939ad473da5e7a218c771d1569456</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x7f9a7db853ca816b9a138aee3380ef34c437dee0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x371c7ec6d8039ff7933a2aa28eb827ffe1f52f07</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb1bc21f748ae2be95674876710bc6d78235480e0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xadf5dd3e51bf28ab4f07e684ecf5d00691818790</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x1eba7a6a72c894026cd654ac5cdcf83a46445b08</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x38022a157b95c52d43abcac9bd09f028a1079105</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xd2507e7b5794179380673870d88b22f94da6abe0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xc708d6f2153933daa50b2d0758955be0a93a8fec</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x0052074d3eb1429f39e5ea529b54a650c21f5aa4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x4e78011ce80ee02d2c3e649fb657e45898257815</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x7583feddbcefa813dc18259940f76a02710a8905</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xe78aee6ccb05471a69677fb74da80f5d251c042b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x04f177fcacf6fb4d2f95d41d7d3fee8e565ca1d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xa6da8c8999c094432c77e7d318951d34019af24b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x6d3b8c76c5396642960243febf736c6be8b60562</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x7cf7132ede0ca592a236b6198a681bb7b42dd5ae</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x3afeae00a594fbf2e4049f924e3c6ac93296b6e8</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x0a93a7be7e7e426fc046e204c44d6b03a302b631</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xc9b6ef062fab19d3f1eabc36b1f2e852af1acd18</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1754e5aadce9567a95f545b146a616ce34eead53</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xdb173587d459ddb1b9b0f2d6d88febef039304a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x10a7a84c91988138f8dbbc82a23b02c8639e2552</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x92af6f53febd6b4c6f5293840b6076a1b82c4bc2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xeb9e49fb4c33d9f6aefb1b03f9133435e24c0ec6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1b2c141479757b8643a519be4692904088d860b2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4d25e94291fe8dcfbfa572cbb2aaa7b755087c91</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8e0e798966382e53bfb145d474254cbe065c17dc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4b6f82a4ed0b9e3767f53309b87819a78d041a7f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x004aa1586011f3454f487eac8d0d5c647d646c69</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x741777f6b6d8145041f73a0bddd35ae81f55a40f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xc6c58f600917de512cd02d2b6ed595ab54b4c30f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x03aa6298f1370642642415edc0db8b957783e8d6</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x3ee2200efb3400fabb9aacf31297cbdd1d435d47</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x0d8ce2a99bb6e3b7db580ed848240e4a0f9ae153</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xa697e272a73744b343528c3bc4702f2565b2f422</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x301af3eff0c904dc5ddd06faa808f653474f7fcc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x776f9987d9deed90eed791cbd824d971fd5ccf09</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xf7de7e8a6bd59ed41a4b5fe50278b3b7f31384df</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x19e6bfc1a6e4b042fb20531244d47e252445df01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x4338665cbb7b2485a8855a139b75d5e34ab0db94</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x2940566eb50f15129238f4dc599adc4f742d7d8e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xbb73bb2505ac4643d5c0a99c2a1f34b3dfd09d11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x4ea98c1999575aaadfb38237dd015c5e773f75a2</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/celo/0x1d18d0386f51ab03e7e84e71bda1681eba865f1f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x57b96d4af698605563a4653d882635da59bf11af</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd33526068d116ce69f19a9ee46f0bd304f21a51f</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2a5fa016ffb20c70e2ef36058c08547f344677aa</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbe0ed4138121ecfc5c0e56b40517da27e6c5226b</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9fd9278f04f01c6a39a9d1c1cd79f7782c6ade08</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x054c9d4c6f4ea4e14391addd1812106c97d05690</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7613c48e0cd50e42dd9bf0f6c235063145f6f8dc</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x614da3b37b6f66f7ce69b4bbbcf9a55ce6168707</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x069e4aa272d17d9625aa3b6f863c7ef6cfb96713</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x24da31e7bb182cb2cabfef1d88db19c2ae1f5572</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7d4a23832fad83258b32ce4fd3109ceef4332af4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb58e61c3098d85632df34eecfb899a1ed80921cb</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x67c4d14861f9c975d004cfb3ac305bee673e996e</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x69babe9811cc86dcfc3b8f9a14de6470dd18eda4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x32f0d04b48427a14fb3cbc73db869e691a9fec6f</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4cff49d0a19ed6ff845a9122fa912abcfb1f68a6</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x51cb253744189f11241becb29bedd3f1b5384fdb</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xcf4c91ecafc43c9f382db723ba20b82efa852821</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6968676661ac9851c38907bdfcc22d5dd77b564d</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0d438f3b5175bebc262bf23753c1e53d03432bde</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb98d4c97425d9908e66e53a6fdf673acca0be986</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x68a47fe1cf42eba4a030a10cd4d6a1031ca3ca0a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8a370c951f34e295b2655b47bb0985dd08d8f718</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x525574c899a7c877a11865339e57376092168258</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd9a442856c234a39a81a089c06451ebaa4306a72</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x1c43d05be7e5b54d506e3ddb6f0305e8a66cd04e</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xb766039cc6db368759c1e56b79affe831d0cc507</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x18c14c2d707b2212e17d1579789fc06010cfca23</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xe0ee18eacafddaeb38f8907c74347c44385578ab</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x56659245931cb6920e39c189d2a0e7dd0da2d57b</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xb6a5ae40e79891e4deadad06c8a7ca47396df21c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x04565fe9aa3ae571ada8e1bebf8282c4e5247b2a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xf8a99f2bf2ce5bb6ce4aafcf070d8723bc904aa2</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x3b9728bd65ca2c11a817ce39a6e91808cceef6fd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x6797b6244fa75f2e78cdffc3a4eb169332b730cc</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xe2c86869216ac578bd62a4b8313770d9ee359a05</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x47b464edb8dc9bc67b5cd4c9310bb87b773845bd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x28a730de97dc62a8c88363e0b1049056f1274a70</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xba5ede8d98ab88cea9f0d69918dde28dc23c2553</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8319767a7b602f88e376368dca1b92d38869b9b4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x461ee40928677644b8195662ab91bcdaae6ef105</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x24569d33653c404f90af10a2b98d6e0030d3d267</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x22222bd682745cf032006394750739684e45a5f8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x9124577428c5bd73ad7636cbc5014081384f29d6</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xaa6cccdce193698d33deb9ffd4be74eaa74c4898</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xe095780ba2a64a4efa7a74830f0b71656f0b0ad4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb59c8912c83157a955f9d715e556257f432c35d7</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x7771450ece9c61430953d2646f995e33a06c91f5</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xc48823ec67720a04a9dfd8c7d109b2c3d6622094</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x9ec02756a559700d8d9e79ece56809f7bcc5dc27</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x3593d125a4f7849a1b059e64f4517a86dd60c95d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb0ffa8000886e57f86dd5264b9582b2ad87b2b91</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa045fe936e26e1e1e1fb27c1f2ae3643acde0171</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbeef698bd78139829e540622d5863e723e8715f1</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x426a688ee72811773eb64f5717a32981b56f10c1</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x873259322be8e50d80a4b868d186cc5ab148543a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x661c70333aa1850ccdbae82776bb436a0fcfeefb</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0a2c375553e6965b42c135bb8b15a8914b08de0c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6fba952443be1de22232c824eb8d976b426b3c38</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1abaea1f7c830bd89acc67ec4af516284b1bc33c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb62132e35a6c13ee1ee0f84dc5d40bad8d815206</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb60fdf036f2ad584f79525b5da76c5c531283a1b</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5a3e6a77ba2f983ec0d371ea3b475f8bc0811ad5</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x55296f69f40ea6d20e478533c15a6b08b654e758</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x1a7e4e63778b4f12a199c062f3efdd288afcbce8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x45804880de22913dafe09f4980848ece6ecbaf78</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe5018913f2fdf33971864804ddb5fca25c539032</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x2c650dab03a59332e2e0c0c4a7f726913e5028c1</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x9aee3c99934c88832399d6c6e08ad802112ebeab</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x439c0cf1038f8002a4cad489b427e217ba4b42ad</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb79dd08ea68a908a97220c76d19a6aa9cbde4376</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4b61e2f1bbdee6d746209a693156952936f1702c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x7480527815ccae421400da01e052b120cc4255e9</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x7466de7bb8b5e41ee572f4167de6be782a7fa75d</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x298d411511a05dc1b559ed8f79c56bee06687b14</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8e16d46cb2da01cdd49601ec73d7b0344969ae33</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x18dd5b087bca9920562aff7a0199b96b9230438b</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x37f0c2915cecc7e977183b8543fc0864d03e064c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x37f24b26bcefbfac7f261b97f8036da98f81a299</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xacb5b33ce55ba7729e38b2b59677e71c0112f0d9</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x6985884c4392d348587b19cb9eaaf157f13271cd</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xc71b5f631354be6853efe9c3ab6b9590f8302e81</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x7e744bbb1a49a44dfcc795014a4ba618e418fbbe</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4e3fbd56cd56c3e72c1403e103b45db9da5b9d2b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x0c04ff41b11065eed8c9eda4d461ba6611591395</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x636bd98fc13908e475f56d8a38a6e03616ec5563</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x590246bfbf89b113d8ac36faeea12b7589f7fe5b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x80034f803afb1c6864e3ca481ef1362c54d094b9</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x73fbd93bfda83b111ddc092aa3a4ca77fd30d380</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xff33a6b3dc0127862eedd3978609404b22298a54</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc770eefad204b5180df6a14ee197d99d808ee52d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa0385e7283c83e2871e9af49eec0966088421ddd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb2617246d0c6c0087f18703d576831899ca94f01</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xba386a4ca26b85fd057ab1ef86e3dc7bdeb5ce70</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x9ebb0895bd9c7c9dfab0d8d877c66ba613ac98ea</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd12a99dbc40036cec6f1b776dccd2d36f5953b94</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x8ab2ff0116a279a99950c66a12298962d152b83c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x420698cfdeddea6bc78d59bc17798113ad278f9d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xa8c8cfb141a3bb59fea1e2ea6b79b5ecbcd7b6ca</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd8e8438cf7beed13cfabc82f300fb6573962c9e3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb1c9d42fa4ba691efe21656a7e6953d999b990c4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xdadeca1167fe47499e53eb50f261103630974905</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xa05245ade25cc1063ee50cf7c083b4524c1c4302</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x4fafad147c8cd0e52f83830484d164e960bdc6c3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x4dd9077269dd08899f2a9e73507125962b5bc87f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8931ee05ec111325c1700b68e5ef7b887e00661d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x26f1bb40ea88b46ceb21557dc0ffac7b7c0ad40f</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x642e993fa91ffe9fb24d39a8eb0e0663145f8e92</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x0c41f1fc9022feb69af6dc666abfe73c9ffda7ce</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xf7ccb8a6e3400eb8eb0c47619134f7516e025215</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x2416092f143378750bb29b79ed961ab195cceea5</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xf0268c5f9aa95baf5c25d646aabb900ac12f0800</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x0c067fc190cde145b0c537765a78d4e19873a5cc</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xbe5614875952b1683cb0a2c20e6509be46d353a4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x87a0233a8cb4392ec3eb8fa467817fc0b6a326dd</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xdfbea88c4842d30c26669602888d746d30f9d60d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x80b3455e1db60b4cba46aba12e8b1e256dd64979</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x747747e47a48c669be384e0dfb248eee6ba04039</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/celo/0x50e85c754929840b58614f48e29c64bc78c58345</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x02f92800f57bcd74066f5709f1daa1a4302df875</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x967da4048cd07ab37855c090aaf366e4ce1b9f48</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x729031b3995538ddf6b6bce6e68d5d6fdeb3ccb5</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x6dea81c8171d0ba574754ef6f8b412f2ed88c54d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x97a9a15168c22b3c137e6381037e1499c8ad0978</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x5faa989af96af85384b8a938c2ede4a7378d9875</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x4691937a7508860f876c9c0a2a617e7d9e945d4b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb50721bcf8d664c30412cfbc6cf7a15145234ad1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x037a54aab062628c9bbae1fdb1583c195585fe41</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xcb8b5cd20bdcaea9a010ac1f8d835824f5c87a04</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xdfb8be6f8c87f74295a87de951974362cedcfa30</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x354a6da3fcde098f8389cad84b0182725c6c91de</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x3f56e0c36d275367b8c502090edf38289b3dea0d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0x6f9590958ce2beaf9c92a3a8fca6d1ddf310e052</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0x3e5d9d8a63cc8a88748f229999cf59487e90721e</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/optimism/0xecc68d0451e20292406967fe7c04280e5238ac7d</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xf1c1a3c2481a3a8a3f173a9ab5ade275292a6fa3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xb5e0cfe1b4db501ac003b740665bf43192cc7853</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xffa188493c15dfaf2c206c97d8633377847b6a52</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xb5c064f955d8e7f38fe0460c556a72987494ee17</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x4f604735c1cf31399c6e711d5962b2b3e0225ad3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xf0949dd87d2531d665010d6274f06a357669457a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x14e5386f47466a463f85d151653e1736c0c50fc3</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0xadac33f543267c4d59a8c299cf804c303bc3e4ac</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xcfa3ef56d303ae4faaba0592388f19d7c3399fb4</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x67ce18961c3269ca03c2e5632f1938cc53e614a1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x48164ea5df090e80a0eaee1147e466ea28669221</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x3054e8f8fba3055a42e5f5228a2a4e2ab1326933</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x42069d11a2cc72388a2e06210921e839cfbd3280</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x74ff3cbf86f95fea386f79633d7bc4460d415f34</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x2d6a3893966dda77749cc7e4003ab15f5cfa3cc1</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x51b75da3da2e413ea1b8ed3eb078dc712304761c</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x8ad5b9007556749de59e088c88801a3aaa87134b</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xbd97693278f1948c59f65f130fd87e7ff7c61d11</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x3992b27da26848c2b19cea6fd25ad5568b68ab98</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x34980c35353a8d7b1a1ba02e02e387a8383e004a</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0xdebd6e2da378784a69dc6ec99fe254223b312287</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/celo/0x456a3d042c0dbd3db53d5489e98dfb038553b0d0</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/celo/0x9995cc8f20db5896943afc8ee0ba463259c931ed</loc>
-    <lastmod>2024-07-05T19:43:14.783Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x30d20208d987713f46dfd34ef128bb16c404d10f</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x19848077f45356b21164c412eff3d3e4ff6ebc31</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x53206bf5b6b8872c1bb0b3c533e06fde2f7e22e4</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x07ddacf367f0d40bd68b4b80b4709a37bdc9f847</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xbdbe9f26918918bd3f43a0219d54e5fda9ce1bb3</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xb9d09bc374577dac1ab853de412a903408204ea8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xe72b141df173b999ae7c1adcbf60cc9833ce56a8</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x214549b0317564de15770561221433fb3e8c995c</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xc82e3db60a52cf7529253b4ec688f631aad9e7c2</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xf3dcbc6d72a4e1892f7917b7c43b74131df8480e</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x62e3b3c557c792c4a70765b3cdb5b56b1879f82d</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x2598c30330d5771ae9f983979209486ae26de875</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd4f4d0a10bcae123bb6655e8fe93a30d01eebd04</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/arbitrum/0xa0995d43901551601060447f9abf93ebc277cec2</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x40379a439d4f6795b6fc9aa5687db461677a2dba</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/polygon/0x433cde5a82b5e0658da3543b47a375dffd126eb6</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x619c4bbbd65f836b78b36cbe781513861d57f39d</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x1e0bb24ed6c806c01ef2f880a4b91adb90099ea7</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x0dd7913197bfb6d2b1f03f9772ced06298f1a644</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xfbb75a59193a3525a8825bebe7d4b56899e2f7e1</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0xc3de830ea07524a0761646a6a4e4be0e114a3c83</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/base/0x3792dbdd07e87413247df995e692806aa13d3299</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/bnb/0x527856315a4bcd2f428ea7fa05ea251f7e96a50a</loc>
-    <lastmod>2024-07-10T19:43:34.135Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0x292fcdd1b104de5a00250febba9bc6a5092a0076</loc>
-    <lastmod>2024-07-10T23:20:47.940Z</lastmod>
-    <priority>0.8</priority>
-  </url>
-  <url>
-    <loc>https://app.uniswap.org/explore/tokens/ethereum/0xd749b369d361396286f8cc28a99dd3425ac05619</loc>
-    <lastmod>2024-07-10T23:20:47.940Z</lastmod>
+    <lastmod>2024-05-20T17:20:52.753Z</lastmod>
     <priority>0.8</priority>
   </url>
 </urlset>
\ No newline at end of file
diff --git a/apps/web/src/assets/images/extensionIllustration.jpg b/apps/web/src/assets/images/extensionIllustration.jpg
new file mode 100644
index 00000000000..48f2bc5f806
Binary files /dev/null and b/apps/web/src/assets/images/extensionIllustration.jpg differ
diff --git a/apps/web/src/assets/images/extensionIllustration.png b/apps/web/src/assets/images/extensionIllustration.png
deleted file mode 100644
index 2c53c063430..00000000000
Binary files a/apps/web/src/assets/images/extensionIllustration.png and /dev/null differ
diff --git a/apps/web/src/assets/images/walletIllustration.jpg b/apps/web/src/assets/images/walletIllustration.jpg
new file mode 100644
index 00000000000..344aaa8a87d
Binary files /dev/null and b/apps/web/src/assets/images/walletIllustration.jpg differ
diff --git a/apps/web/src/assets/images/walletIllustration.png b/apps/web/src/assets/images/walletIllustration.png
deleted file mode 100644
index d3cbab40423..00000000000
Binary files a/apps/web/src/assets/images/walletIllustration.png and /dev/null differ
diff --git a/apps/web/src/components/AccountDetails/AddressDisplay.tsx b/apps/web/src/components/AccountDetails/AddressDisplay.tsx
deleted file mode 100644
index 82970fb6775..00000000000
--- a/apps/web/src/components/AccountDetails/AddressDisplay.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import useENSName from 'hooks/useENSName'
-import styled from 'lib/styled-components'
-import { CopyHelper, EllipsisStyle } from 'theme/components'
-import { Flex } from 'ui/src'
-import { Unitag } from 'ui/src/components/icons'
-import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
-import { shortenAddress } from 'utilities/src/addresses'
-
-const IdentifierText = styled.span`
-  ${EllipsisStyle}
-  max-width: 120px;
-  @media screen and (min-width: 1440px) {
-    max-width: 180px;
-  }
-`
-
-export function AddressDisplay({ address, enableCopyAddress }: { address: Address; enableCopyAddress?: boolean }) {
-  const { ENSName } = useENSName(address)
-  const { unitag } = useUnitagByAddress(address)
-  const uniswapUsername = unitag?.username
-
-  const AddressDisplay = (
-    <Flex row gap="2px" alignItems="center">
-      <IdentifierText>{uniswapUsername ?? ENSName ?? shortenAddress(address)}</IdentifierText>
-      {uniswapUsername && <Unitag size={18} />}
-    </Flex>
-  )
-
-  if (!enableCopyAddress) {
-    return AddressDisplay
-  }
-
-  return (
-    <CopyHelper
-      iconSize={14}
-      iconPosition="right"
-      toCopy={uniswapUsername ? uniswapUsername + '.uni.eth' : ENSName ? ENSName : address}
-    >
-      {AddressDisplay}
-    </CopyHelper>
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/ActionTile.tsx b/apps/web/src/components/AccountDrawer/ActionTile.tsx
index 5df06d3915f..1d8ca7c9269 100644
--- a/apps/web/src/components/AccountDrawer/ActionTile.tsx
+++ b/apps/web/src/components/AccountDrawer/ActionTile.tsx
@@ -2,10 +2,10 @@ import { ButtonEmphasis, ButtonSize, LoadingButtonSpinner, ThemeButton } from 'c
 import Column from 'components/Column'
 import Row from 'components/Row'
 import Tooltip from 'components/Tooltip'
-import styled from 'lib/styled-components'
 import { ReactNode, useReducer } from 'react'
 import { Info } from 'react-feather'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { ThemedText } from 'theme/components/text'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
diff --git a/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx b/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
index 1210e9e0875..3fd5cf43775 100644
--- a/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
+++ b/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
@@ -4,7 +4,6 @@ import { ActionTile } from 'components/AccountDrawer/ActionTile'
 import IconButton, { IconHoverText, IconWithConfirmTextButton } from 'components/AccountDrawer/IconButton'
 import MiniPortfolio from 'components/AccountDrawer/MiniPortfolio'
 import { EmptyWallet } from 'components/AccountDrawer/MiniPortfolio/EmptyWallet'
-import { ExtensionDeeplinks } from 'components/AccountDrawer/MiniPortfolio/ExtensionDeeplinks'
 import { portfolioFadeInAnimation } from 'components/AccountDrawer/MiniPortfolio/PortfolioRow'
 import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { Status } from 'components/AccountDrawer/Status'
@@ -20,9 +19,7 @@ import { LoadingBubble } from 'components/Tokens/loading'
 import { useTokenBalancesQuery } from 'graphql/data/apollo/TokenBalancesProvider'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import useENSName from 'hooks/useENSName'
-import { useIsUniExtensionAvailable } from 'hooks/useUniswapWalletOptions'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useProfilePageState, useSellAsset, useWalletCollections } from 'nft/hooks'
 import { ProfilePageStateType } from 'nft/types'
 import { useCallback, useState } from 'react'
@@ -30,6 +27,7 @@ import { useNavigate } from 'react-router-dom'
 import { useCloseModal, useFiatOnrampAvailability, useOpenModal, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import { useUserHasAvailableClaim, useUserUnclaimedAmount } from 'state/claim/hooks'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { ArrowDownCircleFilled } from 'ui/src/components/icons'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
@@ -41,8 +39,8 @@ import { isPathBlocked } from 'utils/blockedPaths'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { useDisconnect } from 'wagmi'
 
-const AuthenticatedHeaderWrapper = styled.div<{ isUniExtensionAvailable?: boolean }>`
-  padding: ${({ isUniExtensionAvailable }) => (isUniExtensionAvailable ? 16 : 20)}px 16px;
+const AuthenticatedHeaderWrapper = styled.div`
+  padding: 20px 16px;
   display: flex;
   flex-direction: column;
   flex: 1;
@@ -104,13 +102,11 @@ export default function AuthenticatedHeader({ account, openSettings }: { account
   const { ENSName } = useENSName(account)
   const navigate = useNavigate()
   const closeModal = useCloseModal()
-  const openReceiveModal = useOpenModal(ApplicationModal.RECEIVE_CRYPTO)
   const setSellPageState = useProfilePageState((state) => state.setProfilePageState)
   const resetSellAssets = useSellAsset((state) => state.reset)
   const clearCollectionFilters = useWalletCollections((state) => state.clearCollectionFilters)
   const shouldShowBuyFiatButton = !isPathBlocked('/buy')
   const { formatNumber, formatDelta } = useFormatter()
-  const isUniExtensionAvailable = useIsUniExtensionAvailable()
 
   const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregatorWeb)
   const shouldDisableNFTRoutes = useDisableNFTRoutes()
@@ -181,7 +177,7 @@ export default function AuthenticatedHeader({ account, openSettings }: { account
   const amount = unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')
 
   return (
-    <AuthenticatedHeaderWrapper isUniExtensionAvailable={isUniExtensionAvailable}>
+    <AuthenticatedHeaderWrapper>
       <HeaderWrapper>
         <Status account={account} ensUsername={ENSName} uniswapUsername={unitag?.username} />
         <IconContainer>
@@ -232,52 +228,46 @@ export default function AuthenticatedHeader({ account, openSettings }: { account
             <LoadingBubble height="16px" width="100px" margin="4px 0 20px 0" />
           </Column>
         )}
-        {isUniExtensionAvailable ? (
-          <ExtensionDeeplinks account={account} />
+        <Row gap="8px" marginBottom={!fiatOnrampAvailable && fiatOnrampAvailabilityChecked ? '20px' : '0px'}>
+          {shouldShowBuyFiatButton && (
+            <ActionTile
+              dataTestId="wallet-buy-crypto"
+              Icon={<CreditCardIcon />}
+              name={t('common.buy.label')}
+              onClick={handleBuyCryptoClick}
+              disabled={disableBuyCryptoButton}
+              loading={fiatOnrampAvailabilityLoading}
+              error={Boolean(!fiatOnrampAvailable && fiatOnrampAvailabilityChecked)}
+              errorMessage={t('common.restricted.region')}
+              errorTooltip={t('moonpay.restricted.region')}
+            />
+          )}
+          {!shouldDisableNFTRoutes && !forAggregatorEnabled && (
+            <ActionTile
+              dataTestId="nft-view-self-nfts"
+              Icon={<ImagesIcon />}
+              name={t('nft.view')}
+              onClick={navigateToProfile}
+            />
+          )}
+          {forAggregatorEnabled && (
+            <ActionTile
+              dataTestId="wallet-recieve-crypto"
+              Icon={<ArrowDownCircleFilled size={24} />}
+              name={t('common.receive')}
+              onClick={() => undefined} // TODO: implement when recieve modal is implemented
+            />
+          )}
+        </Row>
+        {isEmptyWallet ? (
+          <EmptyWallet handleBuyCryptoClick={handleBuyCryptoClick} handleReceiveCryptoClick={() => undefined} />
         ) : (
-          <>
-            <Row gap="8px" marginBottom={!fiatOnrampAvailable && fiatOnrampAvailabilityChecked ? '20px' : '0px'}>
-              {shouldShowBuyFiatButton && (
-                <ActionTile
-                  dataTestId="wallet-buy-crypto"
-                  Icon={<CreditCardIcon />}
-                  name={t('common.buy.label')}
-                  onClick={handleBuyCryptoClick}
-                  disabled={disableBuyCryptoButton}
-                  loading={fiatOnrampAvailabilityLoading}
-                  error={Boolean(!fiatOnrampAvailable && fiatOnrampAvailabilityChecked)}
-                  errorMessage={t('common.restricted.region')}
-                  errorTooltip={t('moonpay.restricted.region')}
-                />
-              )}
-              {!shouldDisableNFTRoutes && !forAggregatorEnabled && (
-                <ActionTile
-                  dataTestId="nft-view-self-nfts"
-                  Icon={<ImagesIcon />}
-                  name={t('nft.view')}
-                  onClick={navigateToProfile}
-                />
-              )}
-              {forAggregatorEnabled && (
-                <ActionTile
-                  dataTestId="wallet-recieve-crypto"
-                  Icon={<ArrowDownCircleFilled size={24} />}
-                  name={t('common.receive')}
-                  onClick={openReceiveModal}
-                />
-              )}
-            </Row>
-            {isEmptyWallet ? (
-              <EmptyWallet handleBuyCryptoClick={handleBuyCryptoClick} handleReceiveCryptoClick={openReceiveModal} />
-            ) : (
-              <MiniPortfolio account={account} />
-            )}
-            {isUnclaimed && (
-              <UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}>
-                <Trans i18nKey="account.authHeader.claimReward" values={{ amount }} />
-              </UNIButton>
-            )}
-          </>
+          <MiniPortfolio account={account} />
+        )}
+        {isUnclaimed && (
+          <UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}>
+            <Trans i18nKey="account.authHeader.claimReward" values={{ amount }} />
+          </UNIButton>
         )}
       </PortfolioDrawerContainer>
     </AuthenticatedHeaderWrapper>
diff --git a/apps/web/src/components/AccountDrawer/DefaultMenu.tsx b/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
index f3d925d21d4..7e6388835f0 100644
--- a/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
@@ -2,14 +2,13 @@ import AuthenticatedHeader from 'components/AccountDrawer/AuthenticatedHeader'
 import LanguageMenu from 'components/AccountDrawer/LanguageMenu'
 import LocalCurrencyMenu from 'components/AccountDrawer/LocalCurrencyMenu'
 import { LimitsMenu } from 'components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu'
-import { UniExtensionPoolsMenu } from 'components/AccountDrawer/MiniPortfolio/Pools/UniExtensionPoolsMenu'
 import SettingsMenu from 'components/AccountDrawer/SettingsMenu'
 import Column from 'components/Column'
 import WalletModal from 'components/WalletModal'
 import { useAccount } from 'hooks/useAccount'
 import { atom, useAtom } from 'jotai'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useMemo } from 'react'
+import styled from 'styled-components'
 import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 
@@ -24,7 +23,6 @@ export enum MenuState {
   LANGUAGE_SETTINGS = 'language_settings',
   LOCAL_CURRENCY_SETTINGS = 'local_currency_settings',
   LIMITS = 'limits',
-  POOLS = 'pools',
 }
 
 export const miniPortfolioMenuStateAtom = atom(MenuState.DEFAULT)
@@ -80,8 +78,6 @@ function DefaultMenu({ drawerOpen }: { drawerOpen: boolean }) {
         return <LocalCurrencyMenu onClose={openSettings} />
       case MenuState.LIMITS:
         return account.address ? <LimitsMenu onClose={closeLimitsMenu} account={account.address} /> : null
-      case MenuState.POOLS:
-        return account.address ? <UniExtensionPoolsMenu account={account.address} onClose={closeLimitsMenu} /> : null
     }
   }, [
     account.address,
diff --git a/apps/web/src/components/AccountDrawer/DownloadButton.tsx b/apps/web/src/components/AccountDrawer/DownloadButton.tsx
index aea0f44b17d..2b0b702e16e 100644
--- a/apps/web/src/components/AccountDrawer/DownloadButton.tsx
+++ b/apps/web/src/components/AccountDrawer/DownloadButton.tsx
@@ -1,6 +1,6 @@
 import { InterfaceElementName } from '@uniswap/analytics-events'
-import styled from 'lib/styled-components'
 import { PropsWithChildren, useCallback } from 'react'
+import styled from 'styled-components'
 import { ClickableStyle } from 'theme/components'
 import { openDownloadApp } from 'utils/openDownloadApp'
 
diff --git a/apps/web/src/components/AccountDrawer/GitVersionRow.tsx b/apps/web/src/components/AccountDrawer/GitVersionRow.tsx
index f19b7936c8f..be76d36c588 100644
--- a/apps/web/src/components/AccountDrawer/GitVersionRow.tsx
+++ b/apps/web/src/components/AccountDrawer/GitVersionRow.tsx
@@ -1,7 +1,7 @@
 import Tooltip from 'components/Tooltip'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const Container = styled.div`
diff --git a/apps/web/src/components/AccountDrawer/IconButton.tsx b/apps/web/src/components/AccountDrawer/IconButton.tsx
index e75b5b79311..6fce4ae3e9b 100644
--- a/apps/web/src/components/AccountDrawer/IconButton.tsx
+++ b/apps/web/src/components/AccountDrawer/IconButton.tsx
@@ -1,7 +1,7 @@
 import Row from 'components/Row'
-import styled, { DefaultTheme, css } from 'lib/styled-components'
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react'
 import { Icon } from 'react-feather'
+import styled, { DefaultTheme, css } from 'styled-components'
 import { TRANSITION_DURATIONS } from 'theme/styles'
 import useResizeObserver from 'use-resize-observer'
 
@@ -35,11 +35,10 @@ const IconStyles = css<{ hideHorizontal?: boolean }>`
   :hover {
     background-color: ${({ theme }) => theme.surface2};
     transition: ${({
-        theme: {
-          transition: { duration, timing },
-        },
-      }) => `${duration.fast} background-color ${timing.in},`}
-      ${getWidthTransition};
+      theme: {
+        transition: { duration, timing },
+      },
+    }) => `${duration.fast} background-color ${timing.in}, ${getWidthTransition}`};
 
     ${IconHoverText} {
       opacity: 1;
diff --git a/apps/web/src/components/AccountDrawer/LocalCurrencyMenu.tsx b/apps/web/src/components/AccountDrawer/LocalCurrencyMenu.tsx
index aeb887d83d9..30b1b29fb7b 100644
--- a/apps/web/src/components/AccountDrawer/LocalCurrencyMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/LocalCurrencyMenu.tsx
@@ -1,11 +1,11 @@
-import { SlideOutMenu } from 'components/AccountDrawer/SlideOutMenu'
 import { MenuColumn, MenuItem } from 'components/AccountDrawer/shared'
-import { SUPPORTED_LOCAL_CURRENCIES, SupportedLocalCurrency, getLocalCurrencyIcon } from 'constants/localCurrencies'
+import { SlideOutMenu } from 'components/AccountDrawer/SlideOutMenu'
+import { getLocalCurrencyIcon, SUPPORTED_LOCAL_CURRENCIES, SupportedLocalCurrency } from 'constants/localCurrencies'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { useLocalCurrencyLinkProps } from 'hooks/useLocalCurrencyLinkProps'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 
 const StyledLocalCurrencyIcon = styled.div`
   width: 20px;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
index e73c9e4fb82..70528d71e31 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
@@ -9,9 +9,9 @@ import AlertTriangleFilled from 'components/Icons/AlertTriangleFilled'
 import { LoaderV2 } from 'components/Icons/LoadingSpinner'
 import Row from 'components/Row'
 import useENSName from 'hooks/useENSName'
-import styled from 'lib/styled-components'
 import { useCallback } from 'react'
 import { SignatureType } from 'state/signatures/types'
+import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
@@ -49,18 +49,8 @@ function StatusIndicator({ activity: { status, timestamp, offchainOrderDetails }
 }
 
 export function ActivityRow({ activity }: { activity: Activity }) {
-  const {
-    chainId,
-    title,
-    descriptor,
-    logos,
-    otherAccount,
-    currencies,
-    hash,
-    prefixIconSrc,
-    suffixIconSrc,
-    offchainOrderDetails,
-  } = activity
+  const { chainId, title, descriptor, logos, otherAccount, currencies, hash, prefixIconSrc, offchainOrderDetails } =
+    activity
 
   const openOffchainActivityModal = useOpenOffchainActivityModal()
 
@@ -95,7 +85,6 @@ export function ActivityRow({ activity }: { activity: Activity }) {
           <Row gap="4px">
             {prefixIconSrc && <img height="14px" width="14px" src={prefixIconSrc} alt="" />}
             <ThemedText.SubHeader>{title}</ThemedText.SubHeader>
-            {suffixIconSrc && <img height="14px" width="14px" src={suffixIconSrc} alt="" />}
           </Row>
         }
         descriptor={
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelOrdersDialog.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelOrdersDialog.tsx
index c1c51fb0bac..55e255b6fb5 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelOrdersDialog.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelOrdersDialog.tsx
@@ -1,20 +1,20 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import { ConfirmedIcon, LogoContainer, SubmittedIcon } from 'components/AccountDrawer/MiniPortfolio/Activity/Logos'
 import { useCancelOrdersGasEstimate } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
+import GetHelp from 'components/Button/GetHelp'
 import Column from 'components/Column'
 import { Container, Dialog, DialogButtonType, DialogProps } from 'components/Dialog/Dialog'
 import { LoaderV3 } from 'components/Icons/LoadingSpinner'
 import Modal from 'components/Modal'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
 import Row from 'components/Row'
 import { DetailLineItem } from 'components/swap/DetailLineItem'
 import { nativeOnChain } from 'constants/tokens'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import { Plural, Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Slash } from 'react-feather'
 import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
-import { ExternalLink, ThemedText } from 'theme/components'
+import styled, { useTheme } from 'styled-components'
+import { CloseIcon, ExternalLink, ThemedText } from 'theme/components'
 import { InterfaceChainId } from 'uniswap/src/types/chains'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
@@ -24,9 +24,6 @@ const GasEstimateContainer = styled(Row)`
   margin-top: 16px;
   padding-top: 16px;
 `
-const ModalHeader = styled(GetHelpHeader)`
-  padding: 4px 0px;
-`
 
 export enum CancellationState {
   NOT_STARTED = 'not_started',
@@ -107,7 +104,10 @@ export function CancelOrdersDialog(
     return (
       <Modal isOpen $scrollOverlay onDismiss={onCancel} maxHeight="90vh">
         <Container gap="lg">
-          <ModalHeader closeModal={onCancel} />
+          <Row gap="10px" width="100%" padding="4px 0px" justify="end" align="center">
+            <GetHelp />
+            <CloseIcon onClick={onCancel} />
+          </Row>
           <LogoContainer>{icon}</LogoContainer>
           <ThemedText.SubHeaderLarge width="100%" textAlign="center">
             {title}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/Logos.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/Logos.tsx
index 9c5a6081336..17159dfb1c3 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/Logos.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/Logos.tsx
@@ -1,5 +1,5 @@
 import { LoaderV3 } from 'components/Icons/LoadingSpinner'
-import styled, { css, useTheme } from 'lib/styled-components'
+import styled, { css, useTheme } from 'styled-components'
 import { FadePresence, FadePresenceAnimationType } from 'theme/components/FadePresence'
 
 export const LogoContainer = styled.div`
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
index 2ad628133d6..34fc4a6c4b9 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
@@ -25,11 +25,11 @@ import { useUSDPrice } from 'hooks/useUSDPrice'
 import { Trans } from 'i18n'
 import { atom } from 'jotai'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode, useCallback, useMemo, useState } from 'react'
 import { ArrowDown, X } from 'react-feather'
 import { useOrder } from 'state/signatures/hooks'
 import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
+import styled, { useTheme } from 'styled-components'
 import { Divider, ThemedText } from 'theme/components'
 import { UniswapXOrderStatus } from 'types/uniswapx'
 import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelOrdersDialog.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelOrdersDialog.test.tsx.snap
index b5ea2769a18..26fb9013d9e 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelOrdersDialog.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelOrdersDialog.test.tsx.snap
@@ -1,80 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CancelOrdersDialog should render limit order text 1`] = `
-.c2 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c11 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
+.c5 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
+.c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
 }
 
-.c18 {
+.c6 {
+  width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c3 {
-  width: 100%;
+  padding: 0;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
 }
 
-.c8 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c9 {
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -92,7 +52,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   gap: 4px;
 }
 
-.c19 {
+.c20 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -109,7 +69,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   justify-content: flex-start;
 }
 
-.c24 {
+.c25 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -127,14 +87,14 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   gap: 12px;
 }
 
-.c21 {
+.c22 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
-.c14 {
+.c15 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -142,7 +102,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c16 {
+.c17 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -150,7 +110,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -160,15 +120,15 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -179,15 +139,106 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c28 {
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
+.c2 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c12 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 16px;
+}
+
+.c14 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
+.c19 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c3 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c29 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -201,7 +252,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   width: 100%;
 }
 
-.c25 {
+.c26 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -236,30 +287,30 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   user-select: none;
 }
 
-.c25:active .c27 {
+.c26:active .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c25:focus .c27 {
+.c26:focus .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c25:hover .c27 {
+.c26:hover .c28 {
   background-color: #98A1C014;
 }
 
-.c25:disabled {
+.c26:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c25:disabled:active .c27,
-.c25:disabled:focus .c27,
-.c25:disabled:hover .c27 {
+.c26:disabled:active .c28,
+.c26:disabled:focus .c28,
+.c26:disabled:hover .c28 {
   background-color: transparent;
 }
 
-.c29 {
+.c30 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -294,26 +345,26 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   user-select: none;
 }
 
-.c29:active .c27 {
+.c30:active .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c29:focus .c27 {
+.c30:focus .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c29:hover .c27 {
+.c30:hover .c28 {
   background-color: #98A1C014;
 }
 
-.c29:disabled {
+.c30:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c29:disabled:active .c27,
-.c29:disabled:focus .c27,
-.c29:disabled:hover .c27 {
+.c30:disabled:active .c28,
+.c30:disabled:focus .c28,
+.c30:disabled:hover .c28 {
   background-color: transparent;
 }
 
@@ -360,30 +411,6 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -392,7 +419,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -411,14 +438,14 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   border-radius: 12px;
 }
 
-.c15 {
+.c16 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c17 {
+.c18 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -429,7 +456,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   text-align: center;
 }
 
-.c26 {
+.c27 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -443,7 +470,7 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   border-radius: 12px;
 }
 
-.c30 {
+.c31 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -457,21 +484,17 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
-.c22 {
+.c23 {
   cursor: auto;
   color: #7D7D7D;
 }
 
-.c23 {
+.c24 {
   text-align: right;
   overflow-wrap: break-word;
 }
 
-.c20 {
+.c21 {
   border-top: 1px solid #22222212;
   margin-top: 16px;
   padding-top: 16px;
@@ -547,71 +570,68 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <svg
                       fill="none"
@@ -638,34 +658,34 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
                     </svg>
                   </div>
                   <div
-                    class="c13 c3"
+                    class="c14 c3"
                   >
                     <div
-                      class="c14 c15 css-4kpdx7"
+                      class="c15 c16 css-4kpdx7"
                     >
                       Cancel limit
                     </div>
                     <div
-                      class="c16 c17 css-1urox24"
+                      class="c17 c18 css-1urox24"
                     >
                       <div
-                        class="c18"
+                        class="c19"
                       >
                         Your swap could execute before cancellation is processed. Your network costs cannot be refunded. Do you wish to proceed?
                         <div
-                          class="c8 c19 c20"
+                          class="c9 c20 c21"
                         >
                           <div
-                            class="c8 c19 c21"
+                            class="c9 c20 c22"
                           >
                             <div
-                              class="c14 c22 css-142zc9n"
+                              class="c15 c23 css-142zc9n"
                               data-testid="swap-li-label"
                             >
                               Network cost
                             </div>
                             <div
-                              class="c14 c23 css-142zc9n"
+                              class="c15 c24 css-142zc9n"
                             >
                               <span>
                                 -
@@ -678,21 +698,21 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c8 c24"
+                  class="c9 c25"
                 >
                   <button
-                    class="c25 c26"
+                    class="c26 c27"
                   >
                     <div
-                      class="c27 c28"
+                      class="c28 c29"
                     />
                     Never mind
                   </button>
                   <button
-                    class="c29 c30"
+                    class="c30 c31"
                   >
                     <div
-                      class="c27 c28"
+                      class="c28 c29"
                     />
                     Proceed
                   </button>
@@ -713,80 +733,40 @@ exports[`CancelOrdersDialog should render limit order text 1`] = `
 `;
 
 exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
-.c2 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c11 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
+.c5 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
+.c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
 }
 
-.c18 {
+.c6 {
+  width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c3 {
-  width: 100%;
+  padding: 0;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
 }
 
-.c8 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c9 {
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -804,7 +784,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   gap: 4px;
 }
 
-.c19 {
+.c20 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -821,7 +801,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   justify-content: flex-start;
 }
 
-.c24 {
+.c25 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -839,14 +819,14 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   gap: 12px;
 }
 
-.c21 {
+.c22 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
-.c14 {
+.c15 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -854,7 +834,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c16 {
+.c17 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -862,7 +842,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -872,15 +852,15 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -891,15 +871,106 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c28 {
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
+.c2 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c12 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 16px;
+}
+
+.c14 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
+.c19 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c3 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c29 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -913,7 +984,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   width: 100%;
 }
 
-.c25 {
+.c26 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -948,30 +1019,30 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   user-select: none;
 }
 
-.c25:active .c27 {
+.c26:active .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c25:focus .c27 {
+.c26:focus .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c25:hover .c27 {
+.c26:hover .c28 {
   background-color: #98A1C014;
 }
 
-.c25:disabled {
+.c26:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c25:disabled:active .c27,
-.c25:disabled:focus .c27,
-.c25:disabled:hover .c27 {
+.c26:disabled:active .c28,
+.c26:disabled:focus .c28,
+.c26:disabled:hover .c28 {
   background-color: transparent;
 }
 
-.c29 {
+.c30 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1006,26 +1077,26 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   user-select: none;
 }
 
-.c29:active .c27 {
+.c30:active .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c29:focus .c27 {
+.c30:focus .c28 {
   background-color: #B8C0DC3d;
 }
 
-.c29:hover .c27 {
+.c30:hover .c28 {
   background-color: #98A1C014;
 }
 
-.c29:disabled {
+.c30:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c29:disabled:active .c27,
-.c29:disabled:focus .c27,
-.c29:disabled:hover .c27 {
+.c30:disabled:active .c28,
+.c30:disabled:focus .c28,
+.c30:disabled:hover .c28 {
   background-color: transparent;
 }
 
@@ -1072,30 +1143,6 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -1104,7 +1151,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1123,14 +1170,14 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   border-radius: 12px;
 }
 
-.c15 {
+.c16 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c17 {
+.c18 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -1141,7 +1188,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   text-align: center;
 }
 
-.c26 {
+.c27 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1155,7 +1202,7 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   border-radius: 12px;
 }
 
-.c30 {
+.c31 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1169,21 +1216,17 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
-.c22 {
+.c23 {
   cursor: auto;
   color: #7D7D7D;
 }
 
-.c23 {
+.c24 {
   text-align: right;
   overflow-wrap: break-word;
 }
 
-.c20 {
+.c21 {
   border-top: 1px solid #22222212;
   margin-top: 16px;
   padding-top: 16px;
@@ -1259,71 +1302,68 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <svg
                       fill="none"
@@ -1350,34 +1390,34 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
                     </svg>
                   </div>
                   <div
-                    class="c13 c3"
+                    class="c14 c3"
                   >
                     <div
-                      class="c14 c15 css-4kpdx7"
+                      class="c15 c16 css-4kpdx7"
                     >
                       Cancel order
                     </div>
                     <div
-                      class="c16 c17 css-1urox24"
+                      class="c17 c18 css-1urox24"
                     >
                       <div
-                        class="c18"
+                        class="c19"
                       >
                         Your swap could execute before cancellation is processed. Your network costs cannot be refunded. Do you wish to proceed?
                         <div
-                          class="c8 c19 c20"
+                          class="c9 c20 c21"
                         >
                           <div
-                            class="c8 c19 c21"
+                            class="c9 c20 c22"
                           >
                             <div
-                              class="c14 c22 css-142zc9n"
+                              class="c15 c23 css-142zc9n"
                               data-testid="swap-li-label"
                             >
                               Network cost
                             </div>
                             <div
-                              class="c14 c23 css-142zc9n"
+                              class="c15 c24 css-142zc9n"
                             >
                               <span>
                                 -
@@ -1390,21 +1430,21 @@ exports[`CancelOrdersDialog should render order cancel correctly 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c8 c24"
+                  class="c9 c25"
                 >
                   <button
-                    class="c25 c26"
+                    class="c26 c27"
                   >
                     <div
-                      class="c27 c28"
+                      class="c28 c29"
                     />
                     Never mind
                   </button>
                   <button
-                    class="c29 c30"
+                    class="c30 c31"
                   >
                     <div
-                      class="c27 c28"
+                      class="c28 c29"
                     />
                     Proceed
                   </button>
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainActivityModal.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainActivityModal.test.tsx.snap
index 3378ff6b8ec..efa9a0d17f5 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainActivityModal.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainActivityModal.test.tsx.snap
@@ -1,65 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`OrderContent should render without error, filled order 1`] = `
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c10 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c12 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c17 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
-}
-
 .c1 {
   box-sizing: border-box;
   margin: 0;
@@ -176,6 +117,65 @@ exports[`OrderContent should render without error, filled order 1`] = `
   background-color: #22222212;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c12 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 4px;
+}
+
+.c17 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
 .c20 {
   cursor: auto;
   color: #7D7D7D;
@@ -543,65 +543,6 @@ exports[`OrderContent should render without error, filled order 1`] = `
 `;
 
 exports[`OrderContent should render without error, limit order 1`] = `
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c10 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c12 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c17 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
-}
-
 .c1 {
   box-sizing: border-box;
   margin: 0;
@@ -718,6 +659,65 @@ exports[`OrderContent should render without error, limit order 1`] = `
   background-color: #22222212;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c12 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 4px;
+}
+
+.c17 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
 .c26 {
   background-color: transparent;
   bottom: 0;
@@ -1201,65 +1201,6 @@ exports[`OrderContent should render without error, limit order 1`] = `
 `;
 
 exports[`OrderContent should render without error, open order 1`] = `
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c10 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c12 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c17 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
-}
-
 .c1 {
   box-sizing: border-box;
   margin: 0;
@@ -1357,6 +1298,65 @@ exports[`OrderContent should render without error, open order 1`] = `
   background-color: #22222212;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c12 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 4px;
+}
+
+.c17 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
 .c26 {
   background-color: transparent;
   bottom: 0;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/index.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/index.tsx
index f1ddf89f468..cdedd6901fb 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/index.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/index.tsx
@@ -9,9 +9,9 @@ import { hideSpamAtom } from 'components/AccountDrawer/SpamToggle'
 import Column from 'components/Column'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { EmptyWalletModule } from 'nft/components/profile/view/EmptyWalletContent'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const ActivityGroupWrapper = styled(Column)`
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts
index 963943ded32..3f9a04f0117 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts
@@ -29,7 +29,7 @@ function mockSwapInfo(
   inputCurrency: Token,
   inputCurrencyAmountRaw: string,
   outputCurrency: Token,
-  outputCurrencyAmountRaw: string,
+  outputCurrencyAmountRaw: string
 ): ExactInputSwapTransactionInfo | ExactOutputSwapTransactionInfo {
   if (type === MockTradeType.EXACT_INPUT) {
     return {
@@ -109,7 +109,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
               MockUSDC_MAINNET,
               mockCurrencyAmountRawUSDC,
               MockDAI,
-              mockCurrencyAmountRaw,
+              mockCurrencyAmountRaw
             ),
             ...mockCommonFields('0x123', mockAccount1, TransactionStatus.Confirmed),
           } as TransactionDetails,
@@ -121,9 +121,9 @@ jest.mock('../../../../state/transactions/hooks', () => {
             MockUSDC_MAINNET,
             mockCurrencyAmountRawUSDC,
             MockDAI,
-            mockCurrencyAmountRaw,
+            mockCurrencyAmountRaw
           ),
-          '0xswap_exact_input',
+          '0xswap_exact_input'
         ),
         ...mockMultiStatus(
           mockSwapInfo(
@@ -131,9 +131,9 @@ jest.mock('../../../../state/transactions/hooks', () => {
             MockUSDC_MAINNET,
             mockCurrencyAmountRawUSDC,
             MockDAI,
-            mockCurrencyAmountRaw,
+            mockCurrencyAmountRaw
           ),
-          '0xswap_exact_output',
+          '0xswap_exact_output'
         ),
         ...mockMultiStatus(
           {
@@ -142,7 +142,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             spender: mockSpenderAddress,
             amount: mockApprovalAmountRaw,
           },
-          '0xapproval',
+          '0xapproval'
         ),
         ...mockMultiStatus(
           {
@@ -151,7 +151,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             spender: mockSpenderAddress,
             amount: '0',
           },
-          '0xrevoke_approval',
+          '0xrevoke_approval'
         ),
         ...mockMultiStatus(
           {
@@ -160,7 +160,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             currencyAmountRaw: mockCurrencyAmountRaw,
             chainId: mockChainId,
           },
-          '0xwrap',
+          '0xwrap'
         ),
         ...mockMultiStatus(
           {
@@ -169,7 +169,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             currencyAmountRaw: mockCurrencyAmountRaw,
             chainId: mockChainId,
           },
-          '0xunwrap',
+          '0xunwrap'
         ),
         ...mockMultiStatus(
           {
@@ -181,7 +181,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             expectedAmountBaseRaw: mockCurrencyAmountRawUSDC,
             expectedAmountQuoteRaw: mockCurrencyAmountRaw,
           },
-          '0xadd_liquidity_v3',
+          '0xadd_liquidity_v3'
         ),
         ...mockMultiStatus(
           {
@@ -191,7 +191,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             expectedAmountBaseRaw: mockCurrencyAmountRawUSDC,
             expectedAmountQuoteRaw: mockCurrencyAmountRaw,
           },
-          '0xremove_liquidity_v3',
+          '0xremove_liquidity_v3'
         ),
         ...mockMultiStatus(
           {
@@ -201,7 +201,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             expectedAmountBaseRaw: mockCurrencyAmountRawUSDC,
             expectedAmountQuoteRaw: mockCurrencyAmountRaw,
           },
-          '0xadd_liquidity_v2',
+          '0xadd_liquidity_v2'
         ),
         ...mockMultiStatus(
           {
@@ -211,7 +211,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             expectedCurrencyOwed0: mockCurrencyAmountRawUSDC,
             expectedCurrencyOwed1: mockCurrencyAmountRaw,
           },
-          '0xcollect_fees',
+          '0xcollect_fees'
         ),
         ...mockMultiStatus(
           {
@@ -220,7 +220,7 @@ jest.mock('../../../../state/transactions/hooks', () => {
             quoteCurrencyId: MockDAI.address,
             isFork: false,
           },
-          '0xmigrate_v3_liquidity',
+          '0xmigrate_v3_liquidity'
         ),
       ]
     },
@@ -237,7 +237,7 @@ describe('parseLocalActivity', () => {
         MockUSDC_MAINNET,
         mockCurrencyAmountRawUSDC,
         MockDAI,
-        mockCurrencyAmountRaw,
+        mockCurrencyAmountRaw
       ),
       hash: '0x123',
       status: TransactionStatus.Confirmed,
@@ -265,7 +265,7 @@ describe('parseLocalActivity', () => {
         MockUSDC_MAINNET,
         mockCurrencyAmountRawUSDC,
         MockDAI,
-        mockCurrencyAmountRaw,
+        mockCurrencyAmountRaw
       ),
       hash: '0x123',
       status: TransactionStatus.Confirmed,
@@ -292,7 +292,7 @@ describe('parseLocalActivity', () => {
         MockUSDC_MAINNET,
         mockCurrencyAmountRawUSDC,
         MockDAI,
-        mockCurrencyAmountRaw,
+        mockCurrencyAmountRaw
       ),
       hash: '0x123',
       status: TransactionStatus.Confirmed,
@@ -575,8 +575,8 @@ describe('parseLocalActivity', () => {
           type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: UniswapXOrderStatus.FILLED,
         } as SignatureDetails,
-        formatNumber,
-      ),
+        formatNumber
+      )
     ).toBeUndefined()
   })
 
@@ -594,11 +594,11 @@ describe('parseLocalActivity', () => {
             MockUSDC_MAINNET,
             mockCurrencyAmountRawUSDC,
             MockDAI,
-            mockCurrencyAmountRaw,
+            mockCurrencyAmountRaw
           ),
         } as SignatureDetails,
-        formatNumber,
-      ),
+        formatNumber
+      )
     ).toEqual({
       chainId: 1,
       currencies: [MockUSDC_MAINNET, MockDAI],
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
index 1f0a8c0e7ac..37baf7f18d8 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
@@ -24,8 +24,6 @@ import {
   NftApprovalPartsFragment,
   NftApproveForAllPartsFragment,
   NftTransferPartsFragment,
-  OnRampTransactionDetailsPartsFragment,
-  OnRampTransferPartsFragment,
   TokenApprovalPartsFragment,
   TokenAssetPartsFragment,
   TokenTransferPartsFragment,
@@ -358,7 +356,6 @@ function parseLPTransfers(changes: TransactionChanges, formatNumberOrString: For
 }
 
 type TransactionActivity = AssetActivityPartsFragment & { details: TransactionDetailsPartsFragment }
-type FiatOnRampActivity = AssetActivityPartsFragment & { details: OnRampTransactionDetailsPartsFragment }
 
 function parseSendReceive(
   changes: TransactionChanges,
@@ -506,83 +503,6 @@ function parseUniswapXOrder(activity: OrderActivity): Activity | undefined {
   }
 }
 
-function parseFiatOnRampTransaction(activity: TransactionActivity | FiatOnRampActivity): Activity {
-  const chainId = supportedChainIdFromGQLChain(activity.chain)
-  if (!chainId) {
-    const error = new Error('Invalid activity from unsupported chain received from GQL')
-    logger.error(error, {
-      tags: {
-        file: 'parseRemote',
-        function: 'parseRemote',
-      },
-      extra: { activity },
-    })
-    throw error
-  }
-  if (activity.details.__typename === 'OnRampTransactionDetails') {
-    const onRampTransfer = activity.details.onRampTransfer
-    return {
-      from: activity.details.receiverAddress,
-      hash: activity.id,
-      chainId,
-      timestamp: activity.timestamp,
-      logos: [onRampTransfer.token.project?.logo?.url],
-      currencies: [gqlToCurrency(onRampTransfer.token)],
-      title: t('fiatOnRamp.purchasedOn', {
-        serviceProvider: onRampTransfer.serviceProvider.name,
-      }),
-      descriptor: t('fiatOnRamp.exchangeRate', {
-        outputAmount: onRampTransfer.amount,
-        outputSymbol: onRampTransfer.token.symbol,
-        inputAmount: onRampTransfer.sourceAmount,
-        inputSymbol: onRampTransfer.sourceCurrency,
-      }),
-      suffixIconSrc: onRampTransfer.serviceProvider.logoDarkUrl,
-      status: activity.details.status,
-    }
-  } else if (activity.details.__typename === 'TransactionDetails') {
-    const assetChange = activity.details.assetChanges[0]
-    if (assetChange?.__typename !== 'OnRampTransfer') {
-      logger.error('Unexpected asset change type, expected OnRampTransfer', {
-        tags: {
-          file: 'parseRemote',
-          function: 'parseRemote',
-        },
-      })
-    }
-    const onRampTransfer = assetChange as OnRampTransferPartsFragment
-    return {
-      from: activity.details.from,
-      hash: activity.details.hash,
-      chainId,
-      timestamp: activity.timestamp,
-      logos: [onRampTransfer.token.project?.logo?.url],
-      currencies: [gqlToCurrency(onRampTransfer.token)],
-      title: t('fiatOnRamp.purchasedOn', {
-        serviceProvider: onRampTransfer.serviceProvider.name,
-      }),
-      descriptor: t('fiatOnRamp.exchangeRate', {
-        outputAmount: onRampTransfer.amount,
-        outputSymbol: onRampTransfer.token.symbol,
-        inputAmount: onRampTransfer.sourceAmount,
-        inputSymbol: onRampTransfer.sourceCurrency,
-      }),
-      suffixIconSrc: onRampTransfer.serviceProvider.logoDarkUrl,
-      status: activity.details.status,
-    }
-  } else {
-    const error = new Error('Invalid Fiat On Ramp activity type received from GQL')
-    logger.error(error, {
-      tags: {
-        file: 'parseRemote',
-        function: 'parseFiatOnRampTransaction',
-      },
-      extra: { activity },
-    })
-    throw error
-  }
-}
-
 function parseRemoteActivity(
   assetActivity: AssetActivityPartsFragment | undefined,
   account: string,
@@ -598,12 +518,8 @@ function parseRemoteActivity(
       return parseUniswapXOrder(assetActivity as OrderActivity)
     }
 
-    if (
-      assetActivity.details.__typename === 'OnRampTransactionDetails' ||
-      (assetActivity.details.__typename === 'TransactionDetails' &&
-        assetActivity.details.type === TransactionType.OnRamp)
-    ) {
-      return parseFiatOnRampTransaction(assetActivity as TransactionActivity)
+    if (assetActivity.details.__typename === 'OnRampTransactionDetails') {
+      return undefined // TODO(WEB-4187): support onramp transactions
     }
 
     const changes = assetActivity.details.assetChanges.reduce(
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
index 60d8ec7aa32..1c709ea36a3 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
@@ -23,7 +23,6 @@ export type Activity = {
   from: string
   nonce?: number | null
   prefixIconSrc?: string
-  suffixIconSrc?: string
   cancelled?: boolean
   isSpam?: boolean
 }
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.test.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.test.ts
index 7183d388e41..e612bb1cfb1 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.test.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.test.ts
@@ -23,7 +23,7 @@ describe('createGroups', () => {
         transactions: expect.arrayContaining([
           expect.objectContaining({ timestamp: expect.any(Number), status: TransactionStatus.Confirmed }),
         ]),
-      }),
+      })
     )
     expect(createGroups(mockActivities, true)).toEqual([])
   })
@@ -43,7 +43,7 @@ describe('createGroups', () => {
         transactions: expect.arrayContaining([
           expect.objectContaining({ timestamp: 1700000000, status: TransactionStatus.Pending }),
         ]),
-      }),
+      })
     )
 
     expect(result).toContainEqual(
@@ -52,7 +52,7 @@ describe('createGroups', () => {
         transactions: expect.arrayContaining([
           expect.objectContaining({ timestamp: expect.any(Number), status: TransactionStatus.Confirmed }),
         ]),
-      }),
+      })
     )
   })
 })
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/EmptyWallet.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/EmptyWallet.tsx
index 1edf1419eee..9377496bd3c 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/EmptyWallet.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/EmptyWallet.tsx
@@ -1,6 +1,6 @@
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useCallback, useMemo } from 'react'
+import styled from 'styled-components'
 import { Flex, Text, useIsDarkMode } from 'ui/src'
 import { CRYPTO_PURCHASE_BACKGROUND_DARK, CRYPTO_PURCHASE_BACKGROUND_LIGHT } from 'ui/src/assets'
 import { ArrowDownCircle, Buy as BuyIcon } from 'ui/src/components/icons'
@@ -38,8 +38,8 @@ export const EmptyWallet = ({
         BackgroundImageWrapperCallback,
       },
       {
-        title: t('fiatOnRamp.receiveCrypto.title'),
-        blurb: t('fiatOnRamp.receiveCrypto.transferFunds'),
+        title: t('home.tokens.empty.action.receive.title'),
+        blurb: t('home.tokens.empty.action.receive.description'),
         elementName: ElementName.EmptyStateReceive,
         icon: <ArrowDownCircle color="$accent1" size="$icon.28" />,
         onPress: handleReceiveCryptoClick,
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/ExpandoRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/ExpandoRow.tsx
index 691556bd2b7..4286a0317a2 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/ExpandoRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/ExpandoRow.tsx
@@ -1,9 +1,9 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { PropsWithChildren } from 'react'
 import { ChevronDown } from 'react-feather'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const ExpandIcon = styled(ChevronDown)<{ $expanded: boolean }>`
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/ExtensionDeeplinks.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/ExtensionDeeplinks.tsx
deleted file mode 100644
index 192720fc63b..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/ExtensionDeeplinks.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { MenuState, miniPortfolioMenuStateAtom } from 'components/AccountDrawer/DefaultMenu'
-import { useOpenLimitOrders, usePendingActivity } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
-import { useFilterPossiblyMaliciousPositionInfo } from 'components/AccountDrawer/MiniPortfolio/Pools'
-import useMultiChainPositions from 'components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions'
-import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
-import { Pool } from 'components/Icons/Pool'
-import { ExtensionRequestMethods, useUniswapExtensionConnector } from 'components/WalletModal/useOrderedConnections'
-import { t } from 'i18n'
-import { useUpdateAtom } from 'jotai/utils'
-import { useTheme } from 'lib/styled-components'
-import { useEffect, useState } from 'react'
-import { Button, Flex, Image, Text } from 'ui/src'
-import { UNISWAP_LOGO } from 'ui/src/assets'
-import { ArrowRightToLine, RotatableChevron, TimePast } from 'ui/src/components/icons'
-import { iconSizes } from 'ui/src/theme/iconSizes'
-
-const UnreadIndicator = () => {
-  const theme = useTheme()
-
-  return (
-    <Flex position="absolute" left="28px" top="14px">
-      <svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <circle cx="4" cy="4" r="4" fill={theme.accent1} stroke={theme.surface1} strokeWidth="2px" />
-      </svg>
-    </Flex>
-  )
-}
-
-const DeepLinkButton = ({ Icon, Label, onPress }: { Icon: JSX.Element; Label: string; onPress: () => void }) => {
-  return (
-    <Button
-      display="flex"
-      alignItems="center"
-      gap="$spacing12"
-      theme="outline"
-      px="$spacing16"
-      py="$spacing12"
-      fontSize="$large"
-      onPress={onPress}
-      hoverStyle={{ opacity: 0.9 }}
-    >
-      {Icon}
-      <Text display="flex" flex={1} variant="buttonLabel3">
-        {Label}
-      </Text>
-      <RotatableChevron width={iconSizes.icon20} height={iconSizes.icon20} color="$neutral3" direction="right" />
-    </Button>
-  )
-}
-
-export function ExtensionDeeplinks({ account }: { account: string }) {
-  const theme = useTheme()
-  const uniswapExtensionConnector = useUniswapExtensionConnector()
-  const accountDrawer = useAccountDrawer()
-  const setMenu = useUpdateAtom(miniPortfolioMenuStateAtom)
-  const { openLimitOrders } = useOpenLimitOrders(account)
-
-  const [activityUnread, setActivityUnread] = useState(false)
-  const { hasPendingActivity } = usePendingActivity()
-  useEffect(() => {
-    if (hasPendingActivity) {
-      setActivityUnread(true)
-    }
-  }, [hasPendingActivity])
-
-  const { positions } = useMultiChainPositions(account)
-  const filteredPositions = useFilterPossiblyMaliciousPositionInfo(positions)
-
-  if (!uniswapExtensionConnector) {
-    return null
-  }
-
-  return (
-    <Flex gap="$spacing8">
-      <DeepLinkButton
-        Icon={<Image height={iconSizes.icon20} source={UNISWAP_LOGO} width={iconSizes.icon20} />}
-        Label={t('extension.open')}
-        onPress={() => {
-          uniswapExtensionConnector.extensionRequest(ExtensionRequestMethods.OPEN_SIDEBAR, 'Tokens')
-          accountDrawer.close()
-        }}
-      />
-      <DeepLinkButton
-        Icon={
-          <>
-            <TimePast size="$icon.20" color="$neutral1" />
-            {activityUnread && <UnreadIndicator />}
-          </>
-        }
-        Label={t('common.activity')}
-        onPress={() => {
-          uniswapExtensionConnector.extensionRequest(ExtensionRequestMethods.OPEN_SIDEBAR, 'Activity')
-          accountDrawer.close()
-          setActivityUnread(false)
-        }}
-      />
-      {filteredPositions.length > 0 && (
-        <DeepLinkButton
-          Icon={<Pool width="20px" height="20px" fill={theme.neutral1} />}
-          Label={t('common.pools')}
-          onPress={() => setMenu(MenuState.POOLS)}
-        />
-      )}
-      {openLimitOrders.length > 0 && (
-        <DeepLinkButton
-          Icon={<ArrowRightToLine size={iconSizes.icon20} color="$neutral1" />}
-          Label={t('common.limits')}
-          onPress={() => setMenu(MenuState.LIMITS)}
-        />
-      )}
-    </Flex>
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx
index 103c2f58e98..39e30ed4093 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx
@@ -12,10 +12,10 @@ import { parseUnits } from 'ethers/lib/utils'
 import { useCurrencyInfo } from 'hooks/Tokens'
 import { useScreenSize } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Checkbox } from 'nft/components/layout/Checkbox'
 import { useMemo, useState } from 'react'
 import { ArrowRight } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { UniswapXOrderStatus } from 'types/uniswapx'
 import { useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx
index 06dbf0679ba..3014f3d8387 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx
@@ -11,9 +11,9 @@ import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
 import Column from 'components/Column'
 import { LimitDisclaimer } from 'components/swap/LimitDisclaimer'
 import { Plural, Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo, useState } from 'react'
 import { UniswapXOrderDetails } from 'state/signatures/types'
+import styled from 'styled-components'
 import { UniswapXOrderStatus } from 'types/uniswapx'
 
 const Container = styled(Column)`
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx
index 7e36e0aaebe..bb0ee3ae8ef 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx
@@ -1,8 +1,8 @@
 import { useOpenLimitOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
 import { TabButton } from 'components/AccountDrawer/MiniPortfolio/shared'
 import { Plural, Trans, t } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import { Clock } from 'react-feather'
+import { useTheme } from 'styled-components'
 
 function getExtraWarning(openLimitOrders: any[]) {
   if (openLimitOrders.length >= 100) {
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitDetailActivityRow.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitDetailActivityRow.test.tsx.snap
index 0d27cc71a9e..d3f174be935 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitDetailActivityRow.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitDetailActivityRow.test.tsx.snap
@@ -1,29 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`LimitDetailActivityRow should render with valid details 1`] = `
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c4 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
 .c0 {
   box-sizing: border-box;
   margin: 0;
@@ -88,6 +65,29 @@ exports[`LimitDetailActivityRow should render with valid details 1`] = `
   letter-spacing: -0.01em;
 }
 
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c4 {
+  display: grid;
+  grid-auto-rows: auto;
+  -webkit-box-flex: 1;
+  -webkit-flex-grow: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+}
+
 .c2 {
   gap: 12px;
   height: 68px;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitsMenu.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitsMenu.test.tsx.snap
index b029f5fc5af..61a187120b3 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitsMenu.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitsMenu.test.tsx.snap
@@ -1,44 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`LimitsMenu should render when there are two open orders 1`] = `
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
-}
-
-.c17 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
 .c13 {
   box-sizing: border-box;
   margin: 0;
@@ -122,6 +84,44 @@ exports[`LimitsMenu should render when there are two open orders 1`] = `
   opacity: 0.4;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
+.c17 {
+  display: grid;
+  grid-auto-rows: auto;
+  -webkit-box-flex: 1;
+  -webkit-flex-grow: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+}
+
 .c7 {
   background-color: #F9F9F9;
   border-radius: 12px;
@@ -588,44 +588,6 @@ exports[`LimitsMenu should render when there are two open orders 1`] = `
 `;
 
 exports[`LimitsMenu should render when there is one open order 1`] = `
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 8px;
-}
-
-.c17 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
 .c13 {
   box-sizing: border-box;
   margin: 0;
@@ -709,6 +671,44 @@ exports[`LimitsMenu should render when there is one open order 1`] = `
   opacity: 0.4;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 8px;
+}
+
+.c17 {
+  display: grid;
+  grid-auto-rows: auto;
+  -webkit-box-flex: 1;
+  -webkit-flex-grow: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+}
+
 .c7 {
   background-color: #F9F9F9;
   border-radius: 12px;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/NFTItem.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/NFTItem.tsx
index 3787f70b3e8..3e5f5e6bfaf 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/NFTItem.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/NFTItem.tsx
@@ -4,13 +4,13 @@ import Column from 'components/Column'
 import Row from 'components/Row'
 import { MouseFollowTooltip, TooltipSize } from 'components/Tooltip'
 import { t } from 'i18next'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { NftCard } from 'nft/components/card'
 import { detailsHref } from 'nft/components/card/utils'
 import { VerifiedIcon } from 'nft/components/icons'
 import { WalletAsset } from 'nft/types'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { capitalize } from 'tsafe'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/index.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/index.tsx
index e23566da226..deb977c21a9 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/index.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/NFTs/index.tsx
@@ -4,7 +4,6 @@ import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { TabButton } from 'components/AccountDrawer/MiniPortfolio/shared'
 import { useNftBalance } from 'graphql/data/nft/NftBalance'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { LoadingAssets } from 'nft/components/collection/CollectionAssetLoading'
 import { EmptyWalletModule } from 'nft/components/profile/view/EmptyWalletContent'
 import { useProfilePageState, useSellAsset, useWalletCollections } from 'nft/hooks'
@@ -12,6 +11,7 @@ import { ProfilePageStateType } from 'nft/types'
 import { useCallback, useState } from 'react'
 import InfiniteScroll from 'react-infinite-scroll-component'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { Gallery } from 'ui/src/components/icons'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/UniExtensionPoolsMenu.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/UniExtensionPoolsMenu.tsx
deleted file mode 100644
index 85ff437a5be..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/UniExtensionPoolsMenu.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import Pools from 'components/AccountDrawer/MiniPortfolio/Pools'
-import { SlideOutMenu } from 'components/AccountDrawer/SlideOutMenu'
-import Column from 'components/Column'
-import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
-
-const Container = styled(Column)`
-  height: 100%;
-  position: relative;
-`
-
-export function UniExtensionPoolsMenu({ onClose, account }: { account: string; onClose: () => void }) {
-  return (
-    <SlideOutMenu title={<Trans i18nKey="common.pools" />} onClose={onClose}>
-      <Container>
-        <Pools account={account} />
-      </Container>
-    </SlideOutMenu>
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
index e909758c2c8..1ad6803f1db 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
@@ -98,7 +98,7 @@ export function usePoolPriceMap(positions: PositionInfo[] | undefined) {
 }
 
 function useFeeValue(token: Token, fee: number | undefined, queriedPrice: number | undefined) {
-  const { price: stablecoinPrice } = useStablecoinPrice(!queriedPrice ? token : undefined)
+  const stablecoinPrice = useStablecoinPrice(!queriedPrice ? token : undefined)
   return useMemo(() => {
     // Prefers gql price, as fetching stablecoinPrice will trigger multiple infura calls for each pool position
     const price = queriedPrice ?? (stablecoinPrice ? parseFloat(stablecoinPrice.toSignificant()) : undefined)
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/index.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/index.tsx
index 93913c03cb7..5edea6ccc1a 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/index.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/index.tsx
@@ -17,10 +17,10 @@ import { useAccount } from 'hooks/useAccount'
 import { useFilterPossiblyMaliciousPositions } from 'hooks/useFilterPossiblyMaliciousPositions'
 import { useSwitchChain } from 'hooks/useSwitchChain'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { EmptyWalletModule } from 'nft/components/profile/view/EmptyWalletContent'
 import { useCallback, useMemo, useReducer } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
@@ -31,7 +31,7 @@ import { NumberType, useFormatter } from 'utils/formatNumbers'
  * filters the PositionDetails data for malicious content,
  * and then returns the original data in its original format.
  */
-export function useFilterPossiblyMaliciousPositionInfo(positions: PositionInfo[] | undefined): PositionInfo[] {
+function useFilterPossiblyMaliciousPositionInfo(positions: PositionInfo[] | undefined): PositionInfo[] {
   const tokenIdsToPositionInfo: Record<string, PositionInfo> = useMemo(
     () =>
       positions
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
index a3e35f8aa86..38314513aeb 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
@@ -13,7 +13,7 @@ import {
   usePoolPriceMap,
   useV3ManagerContracts,
 } from 'components/AccountDrawer/MiniPortfolio/Pools/hooks'
-import { PRODUCTION_CHAIN_IDS } from 'constants/chains'
+import { L1_CHAIN_IDS, L2_CHAIN_IDS, TESTNET_CHAIN_IDS } from 'constants/chains'
 import { BigNumber } from 'ethers/lib/ethers'
 import { Interface } from 'ethers/lib/utils'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -51,6 +51,10 @@ type FeeAmounts = [BigNumber, BigNumber]
 
 const MAX_UINT128 = BigNumber.from(2).pow(128).sub(1)
 
+const DEFAULT_CHAINS = [...L1_CHAIN_IDS, ...L2_CHAIN_IDS].filter((chain: number) => {
+  return !TESTNET_CHAIN_IDS.includes(chain)
+})
+
 type UseMultiChainPositionsData = { positions?: PositionInfo[]; loading: boolean }
 
 /**
@@ -62,10 +66,7 @@ type UseMultiChainPositionsData = { positions?: PositionInfo[]; loading: boolean
  * @param chains - chains to fetch positions from
  * @returns positions, fees
  */
-export default function useMultiChainPositions(
-  account: string,
-  chains = PRODUCTION_CHAIN_IDS,
-): UseMultiChainPositionsData {
+export default function useMultiChainPositions(account: string, chains = DEFAULT_CHAINS): UseMultiChainPositionsData {
   const pms = useV3ManagerContracts(chains)
   const multicalls = useInterfaceMulticallContracts(chains)
 
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
index 4af15148e66..bccd8611878 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
@@ -10,8 +10,8 @@ import {
 } from 'components/DoubleLogo'
 import Identicon from 'components/Identicon'
 import { ChainLogo } from 'components/Logo/ChainLogo'
-import styled from 'lib/styled-components'
 import React from 'react'
+import styled from 'styled-components'
 import { InterfaceChainId, UniverseChainId } from 'uniswap/src/types/chains'
 
 const UnknownContract = styled(UnknownStatus)`
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
index 2569e566a31..7e55431cea9 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
@@ -1,7 +1,7 @@
 import Column, { AutoColumn } from 'components/Column'
 import Row from 'components/Row'
 import { LoadingBubble } from 'components/Tokens/loading'
-import styled, { css, keyframes } from 'lib/styled-components'
+import styled, { css, keyframes } from 'styled-components'
 
 export const PortfolioRowWrapper = styled(Row)<{ onClick?: any }>`
   gap: 12px;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Tokens/index.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Tokens/index.tsx
index 025b8e38146..73467be9f9e 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Tokens/index.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Tokens/index.tsx
@@ -14,10 +14,10 @@ import { useTokenBalancesQuery } from 'graphql/data/apollo/TokenBalancesProvider
 import { PortfolioToken } from 'graphql/data/portfolios'
 import { getTokenDetailsURL, gqlToCurrency } from 'graphql/data/util'
 import { useAtomValue } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { EmptyWalletModule } from 'nft/components/profile/view/EmptyWalletContent'
 import { useCallback, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { PortfolioTokenBalancePartsFragment } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/index.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/index.tsx
index 4cc631dd607..a93dcd4f03d 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/index.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/index.tsx
@@ -12,8 +12,8 @@ import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { Trans } from 'i18n'
 import { atom, useAtom } from 'jotai'
-import styled, { useTheme } from 'lib/styled-components'
 import { useEffect, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/shared.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/shared.tsx
index 161a71452f9..bd8aaff7e91 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/shared.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/shared.tsx
@@ -1,8 +1,8 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { ArrowRight } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 
diff --git a/apps/web/src/components/AccountDrawer/SettingsMenu.tsx b/apps/web/src/components/AccountDrawer/SettingsMenu.tsx
index a2259883571..ab6316f70db 100644
--- a/apps/web/src/components/AccountDrawer/SettingsMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/SettingsMenu.tsx
@@ -11,9 +11,9 @@ import { LOCALE_LABEL } from 'constants/locales'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { useActiveLocale } from 'hooks/useActiveLocale'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { ChevronRight } from 'react-feather'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import ThemeToggle from 'theme/components/ThemeToggle'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
diff --git a/apps/web/src/components/AccountDrawer/SettingsToggle.tsx b/apps/web/src/components/AccountDrawer/SettingsToggle.tsx
index 5d4661d2d07..39117ffdf28 100644
--- a/apps/web/src/components/AccountDrawer/SettingsToggle.tsx
+++ b/apps/web/src/components/AccountDrawer/SettingsToggle.tsx
@@ -1,8 +1,8 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import Toggle from 'components/Toggle'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const StyledColumn = styled(Column)`
diff --git a/apps/web/src/components/AccountDrawer/SlideOutMenu.tsx b/apps/web/src/components/AccountDrawer/SlideOutMenu.tsx
index 2d8d5f040ec..e8ce58bacd2 100644
--- a/apps/web/src/components/AccountDrawer/SlideOutMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/SlideOutMenu.tsx
@@ -1,7 +1,7 @@
 import Column from 'components/Column'
 import { ScrollBarStyles } from 'components/Common'
-import styled from 'lib/styled-components'
 import { ArrowLeft } from 'react-feather'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 
 const Menu = styled(Column)`
diff --git a/apps/web/src/components/AccountDrawer/Status.tsx b/apps/web/src/components/AccountDrawer/Status.tsx
index bf8eced156e..07d981c554e 100644
--- a/apps/web/src/components/AccountDrawer/Status.tsx
+++ b/apps/web/src/components/AccountDrawer/Status.tsx
@@ -1,4 +1,3 @@
-import { AddressDisplay } from 'components/AccountDetails/AddressDisplay'
 import Column from 'components/Column'
 import { ENS } from 'components/Icons/ENS'
 import { EthMini } from 'components/Icons/EthMini'
@@ -6,10 +5,11 @@ import StatusIcon from 'components/Identicon/StatusIcon'
 import Popover from 'components/Popover'
 import Row from 'components/Row'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled from 'lib/styled-components'
 import { useRef, useState } from 'react'
 import { MoreHorizontal } from 'react-feather'
-import { ClickableStyle, CopyHelper, ThemedText } from 'theme/components'
+import styled from 'styled-components'
+import { ClickableStyle, CopyHelper, EllipsisStyle, ThemedText } from 'theme/components'
+import { Unitag } from 'ui/src/components/icons'
 import { shortenAddress } from 'utilities/src/addresses'
 
 const Container = styled.div`
@@ -26,6 +26,13 @@ const Identifiers = styled.div`
   overflow: hidden;
   flex: 1 1 auto;
 `
+const IdentifierText = styled.span`
+  ${EllipsisStyle}
+  max-width: 120px;
+  @media screen and (min-width: 1440px) {
+    max-width: 180px;
+  }
+`
 const SecondaryIdentifiersContainer = styled(Row)`
   position: relative;
   user-select: none;
@@ -73,7 +80,7 @@ function SecondaryIdentifier({
   )
 }
 
-export function SecondaryIdentifiers({
+function SecondaryIdentifiers({
   account,
   uniswapUsername,
   ensUsername,
@@ -123,19 +130,26 @@ export function Status({
   account,
   ensUsername,
   uniswapUsername,
-  showAddressCopy = true,
 }: {
   account: string
   ensUsername: string | null
   uniswapUsername?: string
-  showAddressCopy?: boolean
 }) {
   return (
     <Container data-testid="account-drawer-status">
       <StatusIcon size={40} />
       <Identifiers>
         <ThemedText.SubHeader>
-          <AddressDisplay enableCopyAddress={showAddressCopy} address={account} />
+          <CopyHelper
+            iconSize={14}
+            iconPosition="right"
+            toCopy={uniswapUsername ? uniswapUsername + '.uni.eth' : ensUsername ? ensUsername : account}
+          >
+            <Row gap="2px">
+              <IdentifierText>{uniswapUsername ?? ensUsername ?? shortenAddress(account)}</IdentifierText>
+              {uniswapUsername && <Unitag size={18} />}
+            </Row>
+          </CopyHelper>
         </ThemedText.SubHeader>
         {(uniswapUsername || ensUsername) && (
           <SecondaryIdentifiers account={account} ensUsername={ensUsername} uniswapUsername={uniswapUsername} />
diff --git a/apps/web/src/components/AccountDrawer/UniwalletModal.tsx b/apps/web/src/components/AccountDrawer/UniwalletModal.tsx
index 170e3d11755..960b07d1a11 100644
--- a/apps/web/src/components/AccountDrawer/UniwalletModal.tsx
+++ b/apps/web/src/components/AccountDrawer/UniwalletModal.tsx
@@ -8,9 +8,9 @@ import { useConnectorWithId } from 'components/WalletModal/useOrderedConnections
 import { CONNECTION } from 'components/Web3Provider/constants'
 import { useConnect } from 'hooks/useConnect'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { QRCodeSVG } from 'qrcode.react'
 import { useCallback, useEffect, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { CloseIcon, ThemedText } from 'theme/components'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { isWebAndroid, isWebIOS } from 'utilities/src/platform'
@@ -69,8 +69,6 @@ export default function UniwalletModal() {
   useEffect(() => {
     if (open) {
       sendAnalyticsEvent(InterfaceEventName.UNIWALLET_CONNECT_MODAL_OPENED)
-    } else {
-      setUri(undefined)
     }
   }, [open])
 
diff --git a/apps/web/src/components/AccountDrawer/__snapshots__/index.test.tsx.snap b/apps/web/src/components/AccountDrawer/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index ccd52f478d3..00000000000
--- a/apps/web/src/components/AccountDrawer/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,1657 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountDrawer tests AccountDrawer styles when isUniExtensionAvailable is false 1`] = `
-<DocumentFragment>
-  .c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c14 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.c8 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c15 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: flex-start;
-  -webkit-box-align: flex-start;
-  -ms-flex-align: flex-start;
-  align-items: flex-start;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c9 {
-  -webkit-flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c9 > * {
-  margin: !important;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c24 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c25 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c25:hover {
-  opacity: 0.6;
-}
-
-.c25:active {
-  opacity: 0.4;
-}
-
-.c4 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.c22 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c11 {
-  background-color: #FFFFFF;
-  -webkit-transition: width ease-in-out 125ms;
-  transition: width ease-in-out 125ms;
-  border-radius: 12px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  height: 32px;
-  width: 32px;
-  color: #7D7D7D;
-  border: none;
-  outline: none;
-}
-
-.c11:hover {
-  background-color: #F9F9F9;
-  -webkit-transition: 125ms background-color ease-in, width ease-in-out 125ms;
-  transition: 125ms background-color ease-in, width ease-in-out 125ms;
-}
-
-.c11:active {
-  background-color: #FFFFFF;
-  -webkit-transition: background-color 125ms linear, width ease-in-out 125ms;
-  transition: background-color 125ms linear, width ease-in-out 125ms;
-}
-
-.c12 {
-  width: 24px;
-  height: 24px;
-  margin: auto;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c19 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c18 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: unset;
-  border: none;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  opacity: 1;
-  padding: 18px;
-  -webkit-transition: 125ms;
-  transition: 125ms;
-}
-
-.c21 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: row nowrap;
-  -ms-flex-flow: row nowrap;
-  flex-flow: row nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  color: #222222;
-  font-size: 16px;
-  font-weight: 535;
-  padding: 0 8px;
-}
-
-.c20 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c20 img {
-  border: 1px solid #22222212;
-  border-radius: 12px;
-}
-
-.c20 > img,
-.c20 span {
-  height: 40px;
-  width: 40px;
-}
-
-.c17 {
-  -webkit-align-items: stretch;
-  -webkit-box-align: stretch;
-  -ms-flex-align: stretch;
-  align-items: stretch;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  position: relative;
-  width: 100%;
-  background-color: #F9F9F9;
-}
-
-.c17:hover {
-  cursor: pointer;
-  background-color: #22222212;
-}
-
-.c17:focus {
-  background-color: #22222212;
-}
-
-.c26 {
-  font-weight: 535;
-  color: #7D7D7D;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  background-color: #FFFFFF;
-  width: 100%;
-  padding: 14px 16px 16px;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  gap: 16px;
-}
-
-.c16 {
-  display: grid;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  grid-gap: 2px;
-  border-radius: 12px;
-  overflow: hidden;
-  opacity: 1;
-  max-height: 100vh;
-  -webkit-transition: max-height 125ms ease-in-out,opacity 125ms ease-in-out;
-  transition: max-height 125ms ease-in-out,opacity 125ms ease-in-out;
-}
-
-.c23 {
-  padding: 0 4px;
-}
-
-.c5 {
-  width: 100%;
-  height: 100%;
-}
-
-.c1 {
-  z-index: 1040;
-  overflow: hidden;
-  top: 0;
-  left: 0;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0,0,0,0.60);
-  opacity: 0;
-  pointer-events: none;
-}
-
-.c3 {
-  overflow-y: auto;
-  overflow-x: hidden;
-  -webkit-scrollbar-width: thin;
-  -moz-scrollbar-width: thin;
-  -ms-scrollbar-width: thin;
-  scrollbar-width: thin;
-  -webkit-scrollbar-color: #22222212 transparent;
-  -moz-scrollbar-color: #22222212 transparent;
-  -ms-scrollbar-color: #22222212 transparent;
-  scrollbar-color: #22222212 transparent;
-  height: 100%;
-  -webkit-scrollbar-gutter: stable;
-  -moz-scrollbar-gutter: stable;
-  -ms-scrollbar-gutter: stable;
-  scrollbar-gutter: stable;
-  overscroll-behavior: contain;
-  border-radius: 12px;
-}
-
-.c3::-webkit-scrollbar {
-  background: transparent;
-  width: 4px;
-  overflow-y: scroll;
-}
-
-.c3::-webkit-scrollbar-thumb {
-  background: #22222212;
-  border-radius: 8px;
-}
-
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  height: calc(100% - 2 * 8px);
-  overflow: hidden;
-  position: fixed;
-  right: 8px;
-  top: 8px;
-  z-index: 1030;
-}
-
-.c2 {
-  margin-right: -320px;
-  height: 100%;
-  overflow: hidden;
-  border-radius: 12px;
-  width: 320px;
-  max-width: 320px;
-  font-size: 16px;
-  background-color: #FFFFFF;
-  border: 1px solid #22222212;
-  box-shadow: 8px 12px 20px rgba(51,53,72,0.04),4px 6px 12px rgba(51,53,72,0.02),4px 4px 8px rgba(51,53,72,0.04);
-  -webkit-transition: margin-right 250ms;
-  transition: margin-right 250ms;
-}
-
-@media (max-width:960px) {
-  .c20 {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media (max-width:960px) {
-  .c16 {
-    grid-template-columns: 1fr;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c1 {
-    opacity: 0;
-    pointer-events: none;
-    -webkit-transition: opacity 250ms ease-in-out;
-    transition: opacity 250ms ease-in-out;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c0 {
-    height: 100%;
-    top: 100%;
-    left: 0;
-    right: 0;
-    width: 100%;
-    overflow: visible;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c2 {
-    z-index: 1060;
-    position: absolute;
-    margin-right: 0;
-    top: 0;
-    height: calc(100% - 72px);
-    width: 100%;
-    max-width: 100%;
-    border-bottom-right-radius: 0px;
-    border-bottom-left-radius: 0px;
-    box-shadow: unset;
-    -webkit-transition: top 250ms;
-    transition: top 250ms;
-  }
-}
-
-@media screen and (min-width:1440px) {
-  .c2 {
-    margin-right: -390px;
-    width: 390px;
-    max-width: 390px;
-  }
-}
-
-<span
-    class="t_light is_inversed _dsp_contents"
-  >
-    <span
-      class=" t_light _dsp_contents is_Theme"
-    >
-      <div
-        class="c0"
-      >
-        <div
-          class="c1"
-        />
-        <div
-          class="c2"
-          data-testid="account-drawer"
-        >
-          <div
-            class="c3"
-            id="wallet-dropdown-scroll-wrapper"
-          >
-            <div
-              class="c4 c5"
-            >
-              <div
-                class="c6"
-                data-testid="wallet-modal"
-              >
-                <div
-                  tabindex="0"
-                />
-                <div
-                  class="c7 c8 c9"
-                  width="100%"
-                >
-                  <div
-                    class="c10 css-n8z49y"
-                  >
-                    Connect a wallet
-                  </div>
-                  <button
-                    class="c11"
-                    data-testid="wallet-settings"
-                  >
-                    <span
-                      class="c12"
-                    >
-                      <svg
-                        fill="none"
-                        height="24"
-                        size="24"
-                        viewBox="0 0 24 24"
-                        width="24"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M20.83 14.6C19.9 14.06 19.33 13.07 19.33 12C19.33 10.93 19.9 9.93999 20.83 9.39999C20.99 9.29999 21.05 9.1 20.95 8.94L19.28 6.06C19.22 5.95 19.11 5.89001 19 5.89001C18.94 5.89001 18.88 5.91 18.83 5.94C18.37 6.2 17.85 6.34 17.33 6.34C16.8 6.34 16.28 6.19999 15.81 5.92999C14.88 5.38999 14.31 4.41 14.31 3.34C14.31 3.15 14.16 3 13.98 3H10.02C9.83999 3 9.69 3.15 9.69 3.34C9.69 4.41 9.12 5.38999 8.19 5.92999C7.72 6.19999 7.20001 6.34 6.67001 6.34C6.15001 6.34 5.63001 6.2 5.17001 5.94C5.01001 5.84 4.81 5.9 4.72 6.06L3.04001 8.94C3.01001 8.99 3 9.05001 3 9.10001C3 9.22001 3.06001 9.32999 3.17001 9.39999C4.10001 9.93999 4.67001 10.92 4.67001 11.99C4.67001 13.07 4.09999 14.06 3.17999 14.6H3.17001C3.01001 14.7 2.94999 14.9 3.04999 15.06L4.72 17.94C4.78 18.05 4.89 18.11 5 18.11C5.06 18.11 5.12001 18.09 5.17001 18.06C6.11001 17.53 7.26 17.53 8.19 18.07C9.11 18.61 9.67999 19.59 9.67999 20.66C9.67999 20.85 9.82999 21 10.02 21H13.98C14.16 21 14.31 20.85 14.31 20.66C14.31 19.59 14.88 18.61 15.81 18.07C16.28 17.8 16.8 17.66 17.33 17.66C17.85 17.66 18.37 17.8 18.83 18.06C18.99 18.16 19.19 18.1 19.28 17.94L20.96 15.06C20.99 15.01 21 14.95 21 14.9C21 14.78 20.94 14.67 20.83 14.6ZM12 15C10.34 15 9 13.66 9 12C9 10.34 10.34 9 12 9C13.66 9 15 10.34 15 12C15 13.66 13.66 15 12 15Z"
-                          fill="currentColor"
-                        />
-                      </svg>
-                    </span>
-                  </button>
-                </div>
-                <div
-                  class="c13"
-                >
-                  <div
-                    class="c14 c15"
-                  >
-                    <div
-                      class="c16"
-                      data-testid="option-grid"
-                    >
-                      <div
-                        class="c17"
-                      >
-                        <button
-                          class="c18"
-                          data-testid="wallet-option-uniswapWalletConnect"
-                        >
-                          <div
-                            class="c19"
-                          >
-                            <div
-                              class="c20"
-                            >
-                              <img
-                                alt="Uniswap Wallet"
-                                src="uniswap-wallet-icon.png"
-                              />
-                            </div>
-                            <div
-                              class="c21"
-                            >
-                              Uniswap Wallet
-                            </div>
-                          </div>
-                        </button>
-                      </div>
-                      <div
-                        class="c17"
-                      >
-                        <button
-                          class="c18"
-                          data-testid="wallet-option-walletConnect"
-                        >
-                          <div
-                            class="c19"
-                          >
-                            <div
-                              class="c20"
-                            >
-                              <img
-                                alt="WalletConnect"
-                                src="walletconnect-icon.svg"
-                              />
-                            </div>
-                            <div
-                              class="c21"
-                            >
-                              WalletConnect
-                            </div>
-                          </div>
-                        </button>
-                      </div>
-                      <div
-                        class="c17"
-                      >
-                        <button
-                          class="c18"
-                          data-testid="wallet-option-coinbaseWallet"
-                        >
-                          <div
-                            class="c19"
-                          >
-                            <div
-                              class="c20"
-                            >
-                              <img
-                                alt="Coinbase Wallet"
-                                src="coinbase-icon.svg"
-                              />
-                            </div>
-                            <div
-                              class="c21"
-                            >
-                              Coinbase Wallet
-                            </div>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="c22"
-                  >
-                    <div
-                      class="c23"
-                    >
-                      <div
-                        class="c24 css-142zc9n"
-                      >
-                        By connecting a wallet, you agree to Uniswap Labs’ 
-                        <a
-                          class="c25 c26"
-                          href="https://uniswap.org/terms-of-service/"
-                          rel="noopener noreferrer"
-                          target="_blank"
-                        >
-                          Terms of Service 
-                        </a>
-                        and consent to its 
-                        <a
-                          class="c25 c26"
-                          href="https://uniswap.org/privacy-policy"
-                          rel="noopener noreferrer"
-                          target="_blank"
-                        >
-                          Privacy Policy.
-                        </a>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </span>
-  </span>
-</DocumentFragment>
-`;
-
-exports[`AccountDrawer tests AccountDrawer styles when isUniExtensionAvailable is true 1`] = `
-<DocumentFragment>
-  .c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c15 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c19 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  padding: 8px 0px;
-}
-
-.c23 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-left: 18px;
-  margin-right: 18px;
-}
-
-.c27 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.c8 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c16 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c18 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c20 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  padding: 8px 0px;
-}
-
-.c24 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c28 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: flex-start;
-  -webkit-box-align: flex-start;
-  -ms-flex-align: flex-start;
-  align-items: flex-start;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c9 {
-  -webkit-flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c9 > * {
-  margin: !important;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c36 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c37 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c37:hover {
-  opacity: 0.6;
-}
-
-.c37:active {
-  opacity: 0.4;
-}
-
-.c4 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c26 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.c11 {
-  background-color: #FFFFFF;
-  -webkit-transition: width ease-in-out 125ms;
-  transition: width ease-in-out 125ms;
-  border-radius: 12px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  height: 32px;
-  width: 32px;
-  color: #7D7D7D;
-  border: none;
-  outline: none;
-}
-
-.c11:hover {
-  background-color: #F9F9F9;
-  -webkit-transition: 125ms background-color ease-in, width ease-in-out 125ms;
-  transition: 125ms background-color ease-in, width ease-in-out 125ms;
-}
-
-.c11:active {
-  background-color: #FFFFFF;
-  -webkit-transition: background-color 125ms linear, width ease-in-out 125ms;
-  transition: background-color 125ms linear, width ease-in-out 125ms;
-}
-
-.c12 {
-  width: 24px;
-  height: 24px;
-  margin: auto;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c32 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c31 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: unset;
-  border: none;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  opacity: 1;
-  padding: 18px;
-  -webkit-transition: 125ms;
-  transition: 125ms;
-}
-
-.c34 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: row nowrap;
-  -ms-flex-flow: row nowrap;
-  flex-flow: row nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  color: #222222;
-  font-size: 16px;
-  font-weight: 535;
-  padding: 0 8px;
-}
-
-.c33 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c33 img {
-  border: 1px solid #22222212;
-  border-radius: 12px;
-}
-
-.c33 > img,
-.c33 span {
-  height: 40px;
-  width: 40px;
-}
-
-.c30 {
-  -webkit-align-items: stretch;
-  -webkit-box-align: stretch;
-  -ms-flex-align: stretch;
-  align-items: stretch;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  position: relative;
-  width: 100%;
-  background-color: #F9F9F9;
-}
-
-.c30:hover {
-  cursor: pointer;
-  background-color: #22222212;
-}
-
-.c30:focus {
-  background-color: #22222212;
-}
-
-.c38 {
-  font-weight: 535;
-  color: #7D7D7D;
-}
-
-.c17 {
-  padding: 16px;
-  gap: 12px;
-  border-radius: 16px;
-  border: 1px solid #22222212;
-  overflow: hidden;
-  max-height: 72px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-}
-
-.c17:hover {
-  background: #22222212;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-flow: column nowrap;
-  -ms-flex-flow: column nowrap;
-  flex-flow: column nowrap;
-  background-color: #FFFFFF;
-  width: 100%;
-  padding: 0px 16px 16px;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  gap: 16px;
-}
-
-.c29 {
-  display: grid;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  grid-gap: 2px;
-  border-radius: 12px;
-  overflow: hidden;
-  opacity: 1;
-  max-height: 100vh;
-  -webkit-transition: max-height 125ms ease-in-out,opacity 125ms ease-in-out;
-  transition: max-height 125ms ease-in-out,opacity 125ms ease-in-out;
-}
-
-.c35 {
-  padding: 0 4px;
-}
-
-.c21 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c21:hover {
-  opacity: 0.6;
-}
-
-.c21:active {
-  opacity: 0.4;
-}
-
-.c22 {
-  height: 1px;
-  width: 100%;
-  background: #22222212;
-}
-
-.c25 {
-  height: 20px;
-  width: 20px;
-  fill: #7D7D7D;
-  -webkit-flex-shrink: 0;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-}
-
-.c5 {
-  width: 100%;
-  height: 100%;
-}
-
-.c1 {
-  z-index: 1040;
-  overflow: hidden;
-  top: 0;
-  left: 0;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0,0,0,0.60);
-  opacity: 0;
-  pointer-events: none;
-}
-
-.c3 {
-  overflow-y: auto;
-  overflow-x: hidden;
-  -webkit-scrollbar-width: thin;
-  -moz-scrollbar-width: thin;
-  -ms-scrollbar-width: thin;
-  scrollbar-width: thin;
-  -webkit-scrollbar-color: #22222212 transparent;
-  -moz-scrollbar-color: #22222212 transparent;
-  -ms-scrollbar-color: #22222212 transparent;
-  scrollbar-color: #22222212 transparent;
-  height: 100%;
-  -webkit-scrollbar-gutter: stable;
-  -moz-scrollbar-gutter: stable;
-  -ms-scrollbar-gutter: stable;
-  scrollbar-gutter: stable;
-  overscroll-behavior: contain;
-  border-radius: 12px;
-}
-
-.c3::-webkit-scrollbar {
-  background: transparent;
-  width: 4px;
-  overflow-y: scroll;
-}
-
-.c3::-webkit-scrollbar-thumb {
-  background: #22222212;
-  border-radius: 8px;
-}
-
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  height: calc(100% - 2 * 8px);
-  overflow: hidden;
-  position: fixed;
-  right: 8px;
-  top: 8px;
-  z-index: 1030;
-  height: auto;
-  max-height: calc(100% - 88px);
-  right: 24px;
-  top: 72px;
-  -webkit-scrollbar-width: thin;
-  -moz-scrollbar-width: thin;
-  -ms-scrollbar-width: thin;
-  scrollbar-width: thin;
-  -webkit-scrollbar-color: #22222212 transparent;
-  -moz-scrollbar-color: #22222212 transparent;
-  -ms-scrollbar-color: #22222212 transparent;
-  scrollbar-color: #22222212 transparent;
-  height: 100%;
-}
-
-.c0::-webkit-scrollbar {
-  background: transparent;
-  width: 4px;
-  overflow-y: scroll;
-}
-
-.c0::-webkit-scrollbar-thumb {
-  background: #22222212;
-  border-radius: 8px;
-}
-
-.c2 {
-  margin-right: -368px;
-  height: 100%;
-  overflow: hidden;
-  border-radius: 12px;
-  width: 320px;
-  max-width: 320px;
-  font-size: 16px;
-  background-color: #FFFFFF;
-  border: 1px solid #22222212;
-  box-shadow: 8px 12px 20px rgba(51,53,72,0.04),4px 6px 12px rgba(51,53,72,0.02),4px 4px 8px rgba(51,53,72,0.04);
-  -webkit-transition: margin-right 250ms;
-  transition: margin-right 250ms;
-  height: -webkit-max-content;
-  height: -moz-max-content;
-  height: max-content;
-  max-height: 100%;
-  width: 368px;
-  max-width: 368px;
-  border-radius: 20px;
-  box-shadow: 8px 12px 20px rgba(51,53,72,0.04),4px 6px 12px rgba(51,53,72,0.02),4px 4px 8px rgba(51,53,72,0.04);
-  -webkit-transform: scale(0.96);
-  -ms-transform: scale(0.96);
-  transform: scale(0.96);
-  -webkit-transform-origin: top right;
-  -ms-transform-origin: top right;
-  transform-origin: top right;
-  opacity: 0;
-  overflow-y: scroll;
-  -webkit-transition: -webkit-transform 125ms ease-in-out, opacity 125ms ease-in-out;
-  -webkit-transition: transform 125ms ease-in-out, opacity 125ms ease-in-out;
-  transition: transform 125ms ease-in-out, opacity 125ms ease-in-out;
-}
-
-@media (max-width:960px) {
-  .c33 {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media (max-width:960px) {
-  .c29 {
-    grid-template-columns: 1fr;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c1 {
-    opacity: 0;
-    pointer-events: none;
-    -webkit-transition: opacity 250ms ease-in-out;
-    transition: opacity 250ms ease-in-out;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c0 {
-    height: 100%;
-    top: 100%;
-    left: 0;
-    right: 0;
-    width: 100%;
-    overflow: visible;
-  }
-}
-
-@media only screen and (max-width:640px) {
-  .c2 {
-    z-index: 1060;
-    position: absolute;
-    margin-right: 0;
-    top: 0;
-    height: calc(100% - 72px);
-    width: 100%;
-    max-width: 100%;
-    border-bottom-right-radius: 0px;
-    border-bottom-left-radius: 0px;
-    box-shadow: unset;
-    -webkit-transition: top 250ms;
-    transition: top 250ms;
-  }
-}
-
-@media screen and (min-width:1440px) {
-  .c2 {
-    margin-right: -390px;
-    width: 390px;
-    max-width: 390px;
-  }
-}
-
-<span
-    class=" _dsp_contents"
-  >
-    <span
-      class=" t_light _dsp_contents is_Theme"
-    >
-      <div
-        class="c0"
-      >
-        <div
-          class="c1"
-        />
-        <div
-          class="c2"
-          data-testid="account-drawer"
-        >
-          <div
-            class="c3"
-            id="wallet-dropdown-scroll-wrapper"
-          >
-            <div
-              class="c4 c5"
-            >
-              <div
-                class="c6"
-                data-testid="wallet-modal"
-              >
-                <div
-                  tabindex="0"
-                />
-                <div
-                  class="c7 c8 c9"
-                  width="100%"
-                >
-                  <div
-                    class="c10 css-n8z49y"
-                  >
-                    Connect a wallet
-                  </div>
-                  <button
-                    class="c11"
-                    data-testid="wallet-settings"
-                  >
-                    <span
-                      class="c12"
-                    >
-                      <svg
-                        fill="none"
-                        height="24"
-                        size="24"
-                        viewBox="0 0 24 24"
-                        width="24"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M20.83 14.6C19.9 14.06 19.33 13.07 19.33 12C19.33 10.93 19.9 9.93999 20.83 9.39999C20.99 9.29999 21.05 9.1 20.95 8.94L19.28 6.06C19.22 5.95 19.11 5.89001 19 5.89001C18.94 5.89001 18.88 5.91 18.83 5.94C18.37 6.2 17.85 6.34 17.33 6.34C16.8 6.34 16.28 6.19999 15.81 5.92999C14.88 5.38999 14.31 4.41 14.31 3.34C14.31 3.15 14.16 3 13.98 3H10.02C9.83999 3 9.69 3.15 9.69 3.34C9.69 4.41 9.12 5.38999 8.19 5.92999C7.72 6.19999 7.20001 6.34 6.67001 6.34C6.15001 6.34 5.63001 6.2 5.17001 5.94C5.01001 5.84 4.81 5.9 4.72 6.06L3.04001 8.94C3.01001 8.99 3 9.05001 3 9.10001C3 9.22001 3.06001 9.32999 3.17001 9.39999C4.10001 9.93999 4.67001 10.92 4.67001 11.99C4.67001 13.07 4.09999 14.06 3.17999 14.6H3.17001C3.01001 14.7 2.94999 14.9 3.04999 15.06L4.72 17.94C4.78 18.05 4.89 18.11 5 18.11C5.06 18.11 5.12001 18.09 5.17001 18.06C6.11001 17.53 7.26 17.53 8.19 18.07C9.11 18.61 9.67999 19.59 9.67999 20.66C9.67999 20.85 9.82999 21 10.02 21H13.98C14.16 21 14.31 20.85 14.31 20.66C14.31 19.59 14.88 18.61 15.81 18.07C16.28 17.8 16.8 17.66 17.33 17.66C17.85 17.66 18.37 17.8 18.83 18.06C18.99 18.16 19.19 18.1 19.28 17.94L20.96 15.06C20.99 15.01 21 14.95 21 14.9C21 14.78 20.94 14.67 20.83 14.6ZM12 15C10.34 15 9 13.66 9 12C9 10.34 10.34 9 12 9C13.66 9 15 10.34 15 12C15 13.66 13.66 15 12 15Z"
-                          fill="currentColor"
-                        />
-                      </svg>
-                    </span>
-                  </button>
-                </div>
-                <div
-                  class="c13"
-                >
-                  <div
-                    class="c14"
-                  >
-                    <div
-                      class="c15 c16 c17"
-                    >
-                      <svg
-                        fill="none"
-                        stroke-width="8"
-                        style="color: rgb(252, 114, 255); width: 40px; height: 40px; min-width: 40px; background-color: rgb(255, 239, 255); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px; padding: 7px 7px 7px 7px;"
-                        viewBox="0 0 22 22"
-                      >
-                        <path
-                          d="M6.92609 1.83331H3.87053C3.33028 1.83331 2.81215 2.04793 2.43013 2.42995C2.04811 2.81197 1.8335 3.33009 1.8335 3.87035V6.92591M20.1668 6.92591V3.87035C20.1668 3.33009 19.9522 2.81197 19.5702 2.42995C19.1882 2.04793 18.67 1.83331 18.1298 1.83331H15.0742M15.0742 20.1666H18.1298C18.67 20.1666 19.1882 19.952 19.5702 19.57C19.9522 19.188 20.1668 18.6699 20.1668 18.1296V15.0741M1.8335 15.0741V18.1296C1.8335 18.6699 2.04811 19.188 2.43013 19.57C2.81215 19.952 3.33028 20.1666 3.87053 20.1666H6.92609M12.1829 12.1827V14.5483M12.1829 16.9139H14.5484V12.1827M14.5482 13.3654H16.9138M16.914 15.7311V16.9139M5.67739 5.08581H9.22578C9.5524 5.08581 9.81717 5.35059 9.81717 5.67721V9.22559C9.81717 9.55221 9.5524 9.81699 9.22578 9.81699H5.67739C5.35077 9.81699 5.08599 9.55221 5.08599 9.22559V5.67721C5.08599 5.35059 5.35077 5.08581 5.67739 5.08581ZM5.67739 12.1827H9.22578C9.5524 12.1827 9.81717 12.4475 9.81717 12.7741V16.3225C9.81717 16.6491 9.5524 16.9139 9.22578 16.9139H5.67739C5.35077 16.9139 5.08599 16.6491 5.08599 16.3225V12.7741C5.08599 12.4475 5.35077 12.1827 5.67739 12.1827ZM12.7743 5.08581H16.3226C16.6493 5.08581 16.914 5.35059 16.914 5.67721V9.22559C16.914 9.55221 16.6493 9.81699 16.3226 9.81699H12.7743C12.4476 9.81699 12.1829 9.55221 12.1829 9.22559V5.67721C12.1829 5.35059 12.4476 5.08581 12.7743 5.08581Z"
-                          stroke="currentColor"
-                          stroke-linecap="round"
-                          stroke-linejoin="round"
-                          stroke-width="1.75"
-                        />
-                      </svg>
-                      <div
-                        class="c15 c18"
-                      >
-                        <div
-                          class="c4"
-                        >
-                          <span
-                            class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                            data-disable-theme="true"
-                          >
-                            Uniswap Mobile
-                          </span>
-                          <span
-                            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400 _whiteSpace-nowrap"
-                            data-disable-theme="true"
-                          >
-                            Scan QR code to connect
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="c19 c20 c21"
-                >
-                  <div
-                    class="c22"
-                  />
-                  <div
-                    class="c23 c24"
-                  >
-                    <span
-                      class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-14px _lineHeight-20px _fontWeight-400 _whiteSpace-nowrap"
-                      data-disable-theme="true"
-                    >
-                      Other wallets
-                    </span>
-                    <svg
-                      class="c25"
-                      fill="none"
-                      height="28"
-                      viewBox="0 0 28 28"
-                      width="28"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.9912 11.9609C14.2812 11.9609 14.5273 11.8379 14.8086 11.6094L20.75 6.81055C20.9609 6.62598 21.0928 6.3623 21.0928 6.0459C21.0928 5.43945 20.6094 5 20.0557 5C19.8008 5 19.5371 5.10547 19.291 5.30762L14 9.5791L8.7002 5.30762C8.44531 5.10547 8.19043 5 7.93555 5C7.38184 5 6.89844 5.43945 6.89844 6.0459C6.89844 6.3623 7.03027 6.62598 7.24121 6.81055L13.1738 11.6006C13.4639 11.8379 13.71 11.9609 13.9912 11.9609Z"
-                        fill="#70757A"
-                      />
-                      <path
-                        d="M14.0928 15C13.8115 15 13.5654 15.1318 13.2754 15.3604L7.34277 20.1592C7.13184 20.335 7 20.5986 7 20.9238C7 21.5215 7.4834 21.9609 8.03711 21.9609C8.29199 21.9609 8.54688 21.8643 8.80176 21.6621L14.1016 17.3906L19.3926 21.6621C19.6387 21.8643 19.9023 21.9609 20.1572 21.9609C20.7109 21.9609 21.1943 21.5215 21.1943 20.9238C21.1943 20.5986 21.0625 20.335 20.8516 20.1592L14.9102 15.3604C14.6289 15.1318 14.3828 15 14.0928 15Z"
-                        fill="#70757A"
-                      />
-                    </svg>
-                  </div>
-                  <div
-                    class="c22"
-                  />
-                </div>
-                <div
-                  class="c26"
-                >
-                  <div
-                    class="c27 c28"
-                  >
-                    <div
-                      class="c29"
-                      data-testid="option-grid"
-                    >
-                      <div
-                        class="c30"
-                      >
-                        <button
-                          class="c31"
-                          data-testid="wallet-option-walletConnect"
-                        >
-                          <div
-                            class="c32"
-                          >
-                            <div
-                              class="c33"
-                            >
-                              <img
-                                alt="WalletConnect"
-                                src="walletconnect-icon.svg"
-                              />
-                            </div>
-                            <div
-                              class="c34"
-                            >
-                              WalletConnect
-                            </div>
-                          </div>
-                        </button>
-                      </div>
-                      <div
-                        class="c30"
-                      >
-                        <button
-                          class="c31"
-                          data-testid="wallet-option-coinbaseWallet"
-                        >
-                          <div
-                            class="c32"
-                          >
-                            <div
-                              class="c33"
-                            >
-                              <img
-                                alt="Coinbase Wallet"
-                                src="coinbase-icon.svg"
-                              />
-                            </div>
-                            <div
-                              class="c34"
-                            >
-                              Coinbase Wallet
-                            </div>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="c14"
-                  >
-                    <div
-                      class="c35"
-                    >
-                      <div
-                        class="c36 css-142zc9n"
-                      >
-                        By connecting a wallet, you agree to Uniswap Labs’ 
-                        <a
-                          class="c37 c38"
-                          href="https://uniswap.org/terms-of-service/"
-                          rel="noopener noreferrer"
-                          target="_blank"
-                        >
-                          Terms of Service 
-                        </a>
-                        and consent to its 
-                        <a
-                          class="c37 c38"
-                          href="https://uniswap.org/privacy-policy"
-                          rel="noopener noreferrer"
-                          target="_blank"
-                        >
-                          Privacy Policy.
-                        </a>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </span>
-  </span>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/AccountDrawer/index.test.tsx b/apps/web/src/components/AccountDrawer/index.test.tsx
deleted file mode 100644
index 9d041bf0e19..00000000000
--- a/apps/web/src/components/AccountDrawer/index.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import AccountDrawer, { DRAWER_WIDTH, MODAL_WIDTH } from 'components/AccountDrawer'
-import { useIsUniExtensionAvailable, useUniswapWalletOptions } from 'hooks/useUniswapWalletOptions'
-import { mocked } from 'test-utils/mocked'
-import { render, screen } from 'test-utils/render'
-
-jest.mock('hooks/useUniswapWalletOptions', () => ({
-  useIsUniExtensionAvailable: jest.fn(),
-  useUniswapWalletOptions: jest.fn(),
-}))
-
-describe('AccountDrawer tests', () => {
-  it('AccountDrawer styles when isUniExtensionAvailable is false', () => {
-    mocked(useUniswapWalletOptions).mockReturnValue(false)
-    mocked(useIsUniExtensionAvailable).mockReturnValue(false)
-
-    const { asFragment } = render(<AccountDrawer />)
-    expect(asFragment()).toMatchSnapshot()
-    const drawerWrapper = screen.getByTestId('account-drawer')
-    expect(drawerWrapper).toBeInTheDocument()
-    expect(drawerWrapper).toHaveStyleRule('width', DRAWER_WIDTH)
-  })
-
-  it('AccountDrawer styles when isUniExtensionAvailable is true', () => {
-    mocked(useUniswapWalletOptions).mockReturnValue(true)
-    mocked(useIsUniExtensionAvailable).mockReturnValue(true)
-
-    const { asFragment } = render(<AccountDrawer />)
-    expect(asFragment()).toMatchSnapshot()
-    const drawerWrapper = screen.getByTestId('account-drawer')
-    expect(drawerWrapper).toBeInTheDocument()
-    expect(drawerWrapper).toHaveStyleRule('width', MODAL_WIDTH)
-  })
-})
diff --git a/apps/web/src/components/AccountDrawer/index.tsx b/apps/web/src/components/AccountDrawer/index.tsx
index 110a4d2b04e..10f22cb519f 100644
--- a/apps/web/src/components/AccountDrawer/index.tsx
+++ b/apps/web/src/components/AccountDrawer/index.tsx
@@ -2,17 +2,13 @@ import { InterfaceEventName } from '@uniswap/analytics-events'
 import DefaultMenu from 'components/AccountDrawer/DefaultMenu'
 import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { ScrollBarStyles } from 'components/Common'
-import { Web3StatusRef } from 'components/Web3Status'
 import { useWindowSize } from 'hooks/screenSize'
 import useDisableScrolling from 'hooks/useDisableScrolling'
-import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import usePrevious from 'hooks/usePrevious'
-import { useIsUniExtensionAvailable } from 'hooks/useUniswapWalletOptions'
-import { useAtom } from 'jotai'
-import styled, { css } from 'lib/styled-components'
 import { useEffect, useRef, useState } from 'react'
 import { ChevronsRight } from 'react-feather'
 import { useGesture } from 'react-use-gesture'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
@@ -20,12 +16,10 @@ import Trace from 'uniswap/src/features/telemetry/Trace'
 import { isMobile } from 'utilities/src/platform'
 
 const DRAWER_WIDTH_XL = '390px'
-export const DRAWER_WIDTH = '320px'
+const DRAWER_WIDTH = '320px'
 const DRAWER_MARGIN = '8px'
 const DRAWER_OFFSET = '10px'
 
-export const MODAL_WIDTH = '368px'
-
 const ScrimBackground = styled.div<{ $open: boolean; $maxWidth?: number; $zIndex?: number }>`
   z-index: ${({ $zIndex }) => $zIndex ?? Z_INDEX.modalBackdrop};
   overflow: hidden;
@@ -77,7 +71,7 @@ const AccountDrawerScrollWrapper = styled.div`
   border-radius: 12px;
 `
 
-const Container = styled.div<{ isUniExtensionAvailable?: boolean }>`
+const Container = styled.div`
   display: flex;
   flex-direction: row;
   height: calc(100% - 2 * ${DRAWER_MARGIN});
@@ -87,8 +81,6 @@ const Container = styled.div<{ isUniExtensionAvailable?: boolean }>`
   top: ${DRAWER_MARGIN};
   z-index: ${Z_INDEX.fixed};
 
-  ${({ isUniExtensionAvailable }) => isUniExtensionAvailable && ExtensionContainerStyles}
-
   @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
     height: 100%;
     top: 100%;
@@ -99,17 +91,8 @@ const Container = styled.div<{ isUniExtensionAvailable?: boolean }>`
   }
 `
 
-const ExtensionContainerStyles = css`
-  height: auto;
-  max-height: calc(100% - ${({ theme }) => theme.navHeight + 16}px);
-  right: 24px;
-  top: ${({ theme }) => theme.navHeight}px;
-  ${ScrollBarStyles}
-`
-
-const AccountDrawerWrapper = styled.div<{ open: boolean; isUniExtensionAvailable?: boolean }>`
-  margin-right: ${({ open, isUniExtensionAvailable }) =>
-    open ? 0 : '-' + (isUniExtensionAvailable ? MODAL_WIDTH : DRAWER_WIDTH)};
+const AccountDrawerWrapper = styled.div<{ open: boolean }>`
+  margin-right: ${({ open }) => (open ? 0 : '-' + DRAWER_WIDTH)};
   height: 100%;
   overflow: hidden;
 
@@ -143,23 +126,6 @@ const AccountDrawerWrapper = styled.div<{ open: boolean; isUniExtensionAvailable
 
   box-shadow: ${({ theme }) => theme.deprecated_deepShadow};
   transition: margin-right ${({ theme }) => theme.transition.duration.medium};
-
-  ${({ isUniExtensionAvailable }) => isUniExtensionAvailable && ExtensionDrawerWrapperStyles}
-`
-
-const ExtensionDrawerWrapperStyles = css<{ open: boolean }>`
-  height: max-content;
-  max-height: 100%;
-  width: ${MODAL_WIDTH};
-  max-width: ${MODAL_WIDTH};
-  border-radius: 20px;
-  box-shadow: ${({ theme }) => theme.deprecated_deepShadow};
-  transform: scale(${({ open }) => (open ? 1 : 0.96)});
-  transform-origin: top right;
-  opacity: ${({ open }) => (open ? 1 : 0)};
-  overflow-y: scroll;
-  transition: ${({ theme }) => `transform ${theme.transition.duration.fast} ${theme.transition.timing.inOut},
-    opacity ${theme.transition.duration.fast} ${theme.transition.timing.inOut}`};
 `
 
 const CloseIcon = styled(ChevronsRight).attrs({ size: 24 })`
@@ -189,22 +155,6 @@ function AccountDrawer() {
   const accountDrawer = useAccountDrawer()
   const wasAccountDrawerOpen = usePrevious(accountDrawer.isOpen)
   const scrollRef = useRef<HTMLDivElement>(null)
-  const modalRef = useRef<HTMLDivElement>(null)
-  const isUniExtensionAvailable = useIsUniExtensionAvailable()
-  const [web3StatusRef] = useAtom(Web3StatusRef)
-
-  useOnClickOutside(
-    modalRef,
-    () => {
-      if (isUniExtensionAvailable) {
-        accountDrawer.close()
-      }
-    },
-    // Prevents quick close & re-open when tapping the Web3Status
-    // stopPropagation does not work here
-    web3StatusRef ? [web3StatusRef] : [],
-  )
-
   useEffect(() => {
     if (wasAccountDrawerOpen && !accountDrawer.isOpen) {
       scrollRef.current?.scrollTo({ top: 0, behavior: 'smooth' })
@@ -276,8 +226,8 @@ function AccountDrawer() {
   })
 
   return (
-    <Container isUniExtensionAvailable={isUniExtensionAvailable}>
-      {accountDrawer.isOpen && !isUniExtensionAvailable && (
+    <Container>
+      {accountDrawer.isOpen && (
         <Trace logPress eventOnTrigger={InterfaceEventName.MINI_PORTFOLIO_TOGGLED} properties={{ type: 'close' }}>
           <CloseDrawer onClick={accountDrawer.close} data-testid="close-account-drawer">
             <CloseIcon />
@@ -286,9 +236,6 @@ function AccountDrawer() {
       )}
       <Scrim onClick={accountDrawer.close} $open={accountDrawer.isOpen} />
       <AccountDrawerWrapper
-        isUniExtensionAvailable={isUniExtensionAvailable}
-        ref={modalRef}
-        data-testid="account-drawer"
         open={accountDrawer.isOpen}
         {...(isMobile
           ? {
diff --git a/apps/web/src/components/AccountDrawer/shared.tsx b/apps/web/src/components/AccountDrawer/shared.tsx
index f875926a8e1..9a4a8414994 100644
--- a/apps/web/src/components/AccountDrawer/shared.tsx
+++ b/apps/web/src/components/AccountDrawer/shared.tsx
@@ -1,10 +1,10 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { Check } from 'react-feather'
 import type { To } from 'react-router-dom'
 import { Link } from 'react-router-dom'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, ThemedText } from 'theme/components'
 
diff --git a/apps/web/src/components/AddressInputPanel/index.tsx b/apps/web/src/components/AddressInputPanel/index.tsx
index 948b123442a..74f7c724031 100644
--- a/apps/web/src/components/AddressInputPanel/index.tsx
+++ b/apps/web/src/components/AddressInputPanel/index.tsx
@@ -3,8 +3,8 @@ import { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
 import useENS from 'hooks/useENS'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ChangeEvent, ReactNode, useCallback } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { flexColumnNoWrap } from 'theme/styles'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
diff --git a/apps/web/src/components/AddressQRModal/index.tsx b/apps/web/src/components/AddressQRModal/index.tsx
deleted file mode 100644
index 4c9ba407b31..00000000000
--- a/apps/web/src/components/AddressQRModal/index.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { AddressDisplay } from 'components/AccountDetails/AddressDisplay'
-import { SecondaryIdentifiers } from 'components/AccountDrawer/Status'
-import { useAvatarColorProps } from 'components/AddressQRModal/useAvatarColorProps'
-import Identicon from 'components/Identicon'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
-import { PRODUCTION_CHAIN_IDS } from 'constants/chains'
-import useENSName from 'hooks/useENSName'
-import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
-import { useCallback } from 'react'
-import { useModalIsOpen, useOpenModal, useToggleModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
-import { ExternalLink, ThemedText } from 'theme/components'
-import { AdaptiveWebModalSheet, Flex, QRCodeDisplay, Text, useSporeColors } from 'ui/src'
-import { NetworkLogos } from 'uniswap/src/components/network/NetworkLogos'
-import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
-
-const HelpCenterLink = styled(ExternalLink)`
-  font-size: 14px;
-  margin: 4px auto 0 auto;
-`
-
-const UNICON_SIZE = 50
-const QR_CODE_SIZE = 240
-
-export function AddressQRModal({ accountAddress }: { accountAddress: Address }) {
-  const colors = useSporeColors()
-  const toggleModal = useToggleModal(ApplicationModal.RECEIVE_CRYPTO_QR)
-  const isOpen = useModalIsOpen(ApplicationModal.RECEIVE_CRYPTO_QR)
-  const openReceiveCryptoModal = useOpenModal(ApplicationModal.RECEIVE_CRYPTO)
-  const { ENSName } = useENSName(accountAddress)
-  const { unitag } = useUnitagByAddress(accountAddress)
-  const hasSecondaryIdentifier = ENSName || unitag?.username
-  const { smartColor } = useAvatarColorProps(accountAddress)
-
-  const goBack = useCallback(() => {
-    toggleModal()
-    openReceiveCryptoModal()
-  }, [toggleModal, openReceiveCryptoModal])
-
-  return (
-    <AdaptiveWebModalSheet isOpen={isOpen} onClose={toggleModal} width={420}>
-      <Flex pb="$spacing16" gap="$spacing24">
-        <GetHelpHeader goBack={goBack} closeModal={toggleModal} />
-        <Flex gap="$spacing12">
-          <Flex alignItems="center">
-            {hasSecondaryIdentifier && (
-              <Text variant="heading3">
-                <SecondaryIdentifiers
-                  account={accountAddress!}
-                  ensUsername={ENSName}
-                  uniswapUsername={unitag?.username}
-                />
-              </Text>
-            )}
-            <ThemedText.SubHeader>
-              <AddressDisplay enableCopyAddress address={accountAddress} />
-            </ThemedText.SubHeader>
-          </Flex>
-          <QRCodeDisplay
-            hideOutline
-            color={smartColor}
-            containerBackgroundColor={colors.surface1.val}
-            displayShadow={false}
-            logoSize={UNICON_SIZE + 8}
-            safeAreaColor="$surface1"
-            size={QR_CODE_SIZE}
-            encodedValue={accountAddress!}
-          >
-            <Flex
-              justifyContent="center"
-              alignItems="center"
-              p="$spacing4"
-              backgroundColor="$surface1"
-              borderRadius="$roundedFull"
-            >
-              <Identicon size={UNICON_SIZE} account={accountAddress} />
-            </Flex>
-          </QRCodeDisplay>
-          <Text color="$neutral2" lineHeight={20} textAlign="center" variant="body3">
-            <Trans i18nKey="fiatOnRamp.receiveCrypto.modal.addressQr.supportedNetworks" />
-          </Text>
-          <NetworkLogos showFirstChainLabel borderRadius="$roundedFull" chains={PRODUCTION_CHAIN_IDS} />
-          <HelpCenterLink href="https://support.uniswap.org/hc/en-us/articles/14569415293325-Networks-on-Uniswap">
-            <Trans i18nKey="common.learnMore.link" />
-          </HelpCenterLink>
-        </Flex>
-      </Flex>
-    </AdaptiveWebModalSheet>
-  )
-}
diff --git a/apps/web/src/components/AddressQRModal/useAvatarColorProps.tsx b/apps/web/src/components/AddressQRModal/useAvatarColorProps.tsx
deleted file mode 100644
index 9cf7c4b2381..00000000000
--- a/apps/web/src/components/AddressQRModal/useAvatarColorProps.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import useENSAvatar from 'hooks/useENSAvatar'
-import { useMemo } from 'react'
-import {
-  GradientProps,
-  getUniconColors,
-  passesContrast,
-  useExtractedColors,
-  useIsDarkMode,
-  useSporeColors,
-} from 'ui/src'
-import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
-
-// Fetches avatar for address, in priority uses: unitag avatar, ens avatar, undefined
-//  Note that this hook is used instead of just useENSAvatar because our implementation
-//  of useENSAvatar checks for reverse name resolution which Unitags does not support.
-//  Chose to do this because even if we used useENSAvatar without reverse name resolution,
-//  there is more latency because it has to go to the contract via CCIP-read first.
-function useAvatar(address: string | undefined): {
-  avatar: Maybe<string>
-  loading: boolean
-} {
-  const { unitag, loading: unitagLoading } = useUnitagByAddress(address)
-  const { avatar: ensAvatar, loading: ensLoading } = useENSAvatar(address)
-  const unitagAvatar = unitag?.metadata?.avatar
-
-  if (!address) {
-    return { loading: false, avatar: undefined }
-  }
-
-  if (unitagAvatar) {
-    return { avatar: unitagAvatar, loading: false }
-  }
-
-  if (ensAvatar) {
-    return { avatar: ensAvatar, loading: false }
-  }
-
-  return { avatar: undefined, loading: ensLoading || unitagLoading }
-}
-
-type AvatarColors = {
-  primary: string
-  base: string
-  detail: string
-}
-
-type ColorProps = {
-  smartColor: string
-  gradientProps: GradientProps
-}
-
-export const useAvatarColorProps = (address: Address): ColorProps => {
-  const colors = useSporeColors()
-  const isDarkMode = useIsDarkMode()
-  const { color: uniconColor } = getUniconColors(address, isDarkMode) as { color: string }
-  const { avatar, loading: avatarLoading } = useAvatar(address)
-  const { colors: avatarColors } = useExtractedColors(avatar) as { colors: AvatarColors }
-  const hasAvatar = !!avatar && !avatarLoading
-
-  const smartColor: string = useMemo<string>(() => {
-    const contrastThreshold = 3 // WCAG AA standard for contrast
-    const backgroundColor = colors.surface2.val // replace with your actual background color
-
-    if (hasAvatar && avatarColors && avatarColors.primary) {
-      if (passesContrast(avatarColors.primary, backgroundColor, contrastThreshold)) {
-        return avatarColors.primary
-      }
-      if (passesContrast(avatarColors.base, backgroundColor, contrastThreshold)) {
-        return avatarColors.base
-      }
-      if (passesContrast(avatarColors.detail, backgroundColor, contrastThreshold)) {
-        return avatarColors.detail
-      }
-      // Modify the color if it doesn't pass the contrast check
-      // Replace 'modifiedColor' with the actual color you want to use
-      return colors.neutral1.val as string
-    }
-    return uniconColor
-  }, [avatarColors, hasAvatar, uniconColor, colors.surface2.val, colors.neutral1.val])
-
-  return { smartColor, gradientProps: {} }
-}
diff --git a/apps/web/src/components/Badge/RangeBadge.tsx b/apps/web/src/components/Badge/RangeBadge.tsx
index 5befc16a237..c1a21524d40 100644
--- a/apps/web/src/components/Badge/RangeBadge.tsx
+++ b/apps/web/src/components/Badge/RangeBadge.tsx
@@ -1,7 +1,7 @@
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { AlertTriangle, Slash } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 
 const BadgeWrapper = styled.div`
   font-size: 14px;
diff --git a/apps/web/src/components/Badge/index.tsx b/apps/web/src/components/Badge/index.tsx
index 7a816e62739..50ebce1f4df 100644
--- a/apps/web/src/components/Badge/index.tsx
+++ b/apps/web/src/components/Badge/index.tsx
@@ -1,6 +1,6 @@
-import styled, { DefaultTheme } from 'lib/styled-components'
 import { readableColor } from 'polished'
 import { PropsWithChildren } from 'react'
+import styled, { DefaultTheme } from 'styled-components'
 
 export enum BadgeVariant {
   DEFAULT = 'DEFAULT',
diff --git a/apps/web/src/components/Banner/Outage/OutageBanner.tsx b/apps/web/src/components/Banner/Outage/OutageBanner.tsx
index 652b2f229e4..33bcbae705e 100644
--- a/apps/web/src/components/Banner/Outage/OutageBanner.tsx
+++ b/apps/web/src/components/Banner/Outage/OutageBanner.tsx
@@ -2,9 +2,9 @@ import { Container, PopupContainer, StyledXButton, TextContainer } from 'compone
 import { chainIdToBackendChain } from 'constants/chains'
 import { ChainOutageData } from 'featureFlags/flags/outageBanner'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useState } from 'react'
 import { Globe } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { capitalize } from 'tsafe'
 import { UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/Banner/shared/styled.tsx b/apps/web/src/components/Banner/shared/styled.tsx
index 71fb9a6999c..a9633549142 100644
--- a/apps/web/src/components/Banner/shared/styled.tsx
+++ b/apps/web/src/components/Banner/shared/styled.tsx
@@ -1,6 +1,6 @@
 import { OpacityHoverState } from 'components/Common'
-import styled from 'lib/styled-components'
 import { X } from 'react-feather'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/components/BreadcrumbNav/index.tsx b/apps/web/src/components/BreadcrumbNav/index.tsx
index b74d044ff4e..ce151ee05ed 100644
--- a/apps/web/src/components/BreadcrumbNav/index.tsx
+++ b/apps/web/src/components/BreadcrumbNav/index.tsx
@@ -4,10 +4,10 @@ import Tooltip, { TooltipSize } from 'components/Tooltip'
 import { useScreenSize } from 'hooks/screenSize'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useCallback, useState } from 'react'
 import { Copy } from 'react-feather'
 import { Link } from 'react-router-dom'
+import styled, { useTheme } from 'styled-components'
 import { ClickableStyle } from 'theme/components'
 import { shortenAddress } from 'utilities/src/addresses'
 
diff --git a/apps/web/src/components/Button/GetHelp.tsx b/apps/web/src/components/Button/GetHelp.tsx
index fa242990aef..e09be814654 100644
--- a/apps/web/src/components/Button/GetHelp.tsx
+++ b/apps/web/src/components/Button/GetHelp.tsx
@@ -1,7 +1,7 @@
 import { EnvelopeHeartIcon } from 'components/Icons/EnvelopeHeart'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 
diff --git a/apps/web/src/components/Button/index.tsx b/apps/web/src/components/Button/index.tsx
index 51c4e2d8a1b..67b6207650c 100644
--- a/apps/web/src/components/Button/index.tsx
+++ b/apps/web/src/components/Button/index.tsx
@@ -1,9 +1,9 @@
 import { RowBetween } from 'components/Row'
-import styled, { DefaultTheme, useTheme } from 'lib/styled-components'
 import { darken } from 'polished'
 import { forwardRef } from 'react'
 import { Check, ChevronDown } from 'react-feather'
 import { ButtonProps as ButtonPropsOriginal, Button as RebassButton } from 'rebass/styled-components'
+import styled, { DefaultTheme, useTheme } from 'styled-components'
 
 export { default as LoadingButtonSpinner } from './LoadingButtonSpinner'
 
diff --git a/apps/web/src/components/Card/index.tsx b/apps/web/src/components/Card/index.tsx
index b53036bd0a0..9fb4767ff03 100644
--- a/apps/web/src/components/Card/index.tsx
+++ b/apps/web/src/components/Card/index.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { Box } from 'rebass/styled-components'
+import styled from 'styled-components'
 
 const Card = styled(Box)<{ width?: string; padding?: string; border?: string; $borderRadius?: string }>`
   width: ${({ width }) => width ?? '100%'};
diff --git a/apps/web/src/components/Charts/ChartHeader.tsx b/apps/web/src/components/Charts/ChartHeader.tsx
index 138877d5c65..8104a75884f 100644
--- a/apps/web/src/components/Charts/ChartHeader.tsx
+++ b/apps/web/src/components/Charts/ChartHeader.tsx
@@ -2,9 +2,9 @@ import { useHeaderDateFormatter } from 'components/Charts/hooks'
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { getProtocolColor, getProtocolName } from 'graphql/data/util'
-import styled, { useTheme } from 'lib/styled-components'
 import { UTCTimestamp } from 'lightweight-charts'
 import { ReactElement, ReactNode } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { EllipsisStyle } from 'theme/components'
 import { ThemedText } from 'theme/components/text'
 import { textFadeIn } from 'theme/styles'
diff --git a/apps/web/src/components/Charts/ChartModel.tsx b/apps/web/src/components/Charts/ChartModel.tsx
index 683cbf24c94..9a34b582f53 100644
--- a/apps/web/src/components/Charts/ChartModel.tsx
+++ b/apps/web/src/components/Charts/ChartModel.tsx
@@ -8,7 +8,6 @@ import { useActiveLocale } from 'hooks/useActiveLocale'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans } from 'i18n'
 import { useUpdateAtom } from 'jotai/utils'
-import styled, { DefaultTheme, useTheme } from 'lib/styled-components'
 import {
   BarPrice,
   CrosshairMode,
@@ -21,6 +20,7 @@ import {
   createChart,
 } from 'lightweight-charts'
 import { ReactElement, useEffect, useMemo, useRef, useState } from 'react'
+import styled, { DefaultTheme, useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/components/Charts/LoadingState.tsx b/apps/web/src/components/Charts/LoadingState.tsx
index 98db0c3e61d..c09dcaaaf35 100644
--- a/apps/web/src/components/Charts/LoadingState.tsx
+++ b/apps/web/src/components/Charts/LoadingState.tsx
@@ -3,9 +3,9 @@ import Column from 'components/Column'
 import Row from 'components/Row'
 import { MissingDataIcon } from 'components/Table/icons'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { lighten } from 'polished'
 import { PropsWithChildren, ReactNode } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 import { opacify } from 'theme/utils'
diff --git a/apps/web/src/components/Charts/PriceChart/index.tsx b/apps/web/src/components/Charts/PriceChart/index.tsx
index 5a4d6e43937..7fe21437037 100644
--- a/apps/web/src/components/Charts/PriceChart/index.tsx
+++ b/apps/web/src/components/Charts/PriceChart/index.tsx
@@ -9,7 +9,6 @@ import { PriceChartType } from 'components/Charts/utils'
 import { RowBetween } from 'components/Row'
 import { DeltaArrow, DeltaText, calculateDelta } from 'components/Tokens/TokenDetails/Delta'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import {
   AreaData,
   AreaSeriesPartialOptions,
@@ -23,6 +22,7 @@ import {
   UTCTimestamp,
 } from 'lightweight-charts'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/Charts/SparklineChart/LineChart.tsx b/apps/web/src/components/Charts/SparklineChart/LineChart.tsx
index 6278dd6c934..3cb3fd376c9 100644
--- a/apps/web/src/components/Charts/SparklineChart/LineChart.tsx
+++ b/apps/web/src/components/Charts/SparklineChart/LineChart.tsx
@@ -1,8 +1,8 @@
 import { Group } from '@visx/group'
 import { LinePath } from '@visx/shape'
 import { CurveFactory } from 'd3'
-import { useTheme } from 'lib/styled-components'
 import React, { ReactNode } from 'react'
+import { useTheme } from 'styled-components'
 
 interface LineChartProps<T> {
   data: T[]
diff --git a/apps/web/src/components/Charts/SparklineChart/index.tsx b/apps/web/src/components/Charts/SparklineChart/index.tsx
index 58f8e927806..778e9e3892f 100644
--- a/apps/web/src/components/Charts/SparklineChart/index.tsx
+++ b/apps/web/src/components/Charts/SparklineChart/index.tsx
@@ -4,8 +4,8 @@ import { LoadingBubble } from 'components/Tokens/loading'
 import { curveCardinal, scaleLinear } from 'd3'
 import { SparklineMap, TopToken } from 'graphql/data/TopTokens'
 import { PricePoint } from 'graphql/data/util'
-import styled, { useTheme } from 'lib/styled-components'
 import { memo } from 'react'
+import styled, { useTheme } from 'styled-components'
 
 const LoadingContainer = styled.div`
   height: 100%;
diff --git a/apps/web/src/components/Charts/StackedLineChart/index.tsx b/apps/web/src/components/Charts/StackedLineChart/index.tsx
index 904826ec0c6..ad297d7012e 100644
--- a/apps/web/src/components/Charts/StackedLineChart/index.tsx
+++ b/apps/web/src/components/Charts/StackedLineChart/index.tsx
@@ -3,7 +3,6 @@ import { Chart, ChartModel, ChartModelParams } from 'components/Charts/ChartMode
 import { StackedAreaSeriesOptions } from 'components/Charts/StackedLineChart/stacked-area-series/options'
 import { StackedAreaSeries } from 'components/Charts/StackedLineChart/stacked-area-series/stacked-area-series'
 import { getProtocolColor } from 'graphql/data/util'
-import { useTheme } from 'lib/styled-components'
 import {
   CustomStyleOptions,
   DeepPartial,
@@ -14,6 +13,7 @@ import {
   WhitespaceData,
 } from 'lightweight-charts'
 import { useMemo } from 'react'
+import { useTheme } from 'styled-components'
 import { PriceSource } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 export interface StackedLineData extends WhitespaceData<UTCTimestamp> {
diff --git a/apps/web/src/components/Charts/TimeSelector.tsx b/apps/web/src/components/Charts/TimeSelector.tsx
index 4563ec74b7e..9a8448e5c2f 100644
--- a/apps/web/src/components/Charts/TimeSelector.tsx
+++ b/apps/web/src/components/Charts/TimeSelector.tsx
@@ -3,7 +3,7 @@ import { MEDIUM_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
 import { TimePeriod } from 'graphql/data/util'
 import { atom } from 'jotai'
 import { useAtomValue } from 'jotai/utils'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const refitChartContentAtom = atom<(() => void) | undefined>(undefined)
 const DEFAULT_TIME_SELECTOR_OPTIONS = ORDERED_TIMES.map((time: TimePeriod) => ({ time, display: DISPLAYS[time] }))
diff --git a/apps/web/src/components/Charts/VolumeChart/index.tsx b/apps/web/src/components/Charts/VolumeChart/index.tsx
index 10a8df85615..49391813d2e 100644
--- a/apps/web/src/components/Charts/VolumeChart/index.tsx
+++ b/apps/web/src/components/Charts/VolumeChart/index.tsx
@@ -10,8 +10,8 @@ import { useHeaderDateFormatter } from 'components/Charts/hooks'
 import { BIPS_BASE } from 'constants/misc'
 import { TimePeriod, toHistoryDuration } from 'graphql/data/util'
 import { t } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import { useMemo } from 'react'
+import { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { HistoryDuration } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/Column/index.tsx b/apps/web/src/components/Column/index.tsx
index 9d18001eede..a75d9d60837 100644
--- a/apps/web/src/components/Column/index.tsx
+++ b/apps/web/src/components/Column/index.tsx
@@ -1,7 +1,6 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { Gap } from 'theme'
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const Column = styled.div<{
   gap?: Gap | string
   flex?: string
@@ -12,8 +11,6 @@ export const Column = styled.div<{
   gap: ${({ gap, theme }) => (gap && theme.grids[gap as Gap]) || gap};
   ${({ flex }) => flex && `flex: ${flex};`}
 `
-
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const ColumnCenter = styled(Column)`
   width: 100%;
   align-items: center;
diff --git a/apps/web/src/components/Common/index.tsx b/apps/web/src/components/Common/index.tsx
index 150327fb54c..2def1d4a25c 100644
--- a/apps/web/src/components/Common/index.tsx
+++ b/apps/web/src/components/Common/index.tsx
@@ -1,4 +1,4 @@
-import { css } from 'lib/styled-components'
+import { css } from 'styled-components'
 
 export const ScrollBarStyles = css<{ $isHorizontalScroll?: boolean }>`
   // Firefox scrollbar styling
diff --git a/apps/web/src/components/ConfirmSwapModal/Head.tsx b/apps/web/src/components/ConfirmSwapModal/Head.tsx
index b052b9df029..f8b485e7b26 100644
--- a/apps/web/src/components/ConfirmSwapModal/Head.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/Head.tsx
@@ -1,7 +1,17 @@
+import GetHelpButton from 'components/Button/GetHelp'
 import { ConfirmModalState } from 'components/ConfirmSwapModal'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
+import Row from 'components/Row'
 import { Trans } from 'i18n'
+import { X } from 'react-feather'
+import styled from 'styled-components'
+import { ClickableStyle, ThemedText } from 'theme/components'
+import { FadePresence } from 'theme/components/FadePresence'
 
+const CloseIcon = styled(X)<{ onClick: () => void }>`
+  color: ${({ theme }) => theme.neutral1};
+  cursor: pointer;
+  ${ClickableStyle}
+`
 export function SwapHead({
   onDismiss,
   isLimitTrade,
@@ -11,12 +21,21 @@ export function SwapHead({
   isLimitTrade: boolean
   confirmModalState: ConfirmModalState
 }) {
-  const swapTitle = isLimitTrade ? <Trans i18nKey="swap.reviewLimit" /> : <Trans i18nKey="swap.review" />
   return (
-    <GetHelpHeader
-      title={confirmModalState === ConfirmModalState.REVIEWING && swapTitle}
-      closeModal={onDismiss}
-      closeDataTestId="confirmation-close-icon"
-    />
+    <Row width="100%" align="center">
+      {confirmModalState === ConfirmModalState.REVIEWING && (
+        <Row justify="left">
+          <FadePresence>
+            <ThemedText.SubHeader>
+              {isLimitTrade ? <Trans i18nKey="swap.reviewLimit" /> : <Trans i18nKey="swap.review" />}
+            </ThemedText.SubHeader>
+          </FadePresence>
+        </Row>
+      )}
+      <Row justify="right" gap="10px">
+        <GetHelpButton />
+        <CloseIcon onClick={onDismiss} data-testid="confirmation-close-icon" />
+      </Row>
+    </Row>
   )
 }
diff --git a/apps/web/src/components/ConfirmSwapModal/Modal.tsx b/apps/web/src/components/ConfirmSwapModal/Modal.tsx
index cdf26104a70..821629c4f81 100644
--- a/apps/web/src/components/ConfirmSwapModal/Modal.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/Modal.tsx
@@ -2,9 +2,9 @@ import { InterfaceModalName } from '@uniswap/analytics-events'
 import { AutoColumn } from 'components/Column'
 import { ConfirmModalState } from 'components/ConfirmSwapModal'
 import Modal from 'components/Modal'
-import styled from 'lib/styled-components'
 import { PropsWithChildren, useRef } from 'react'
 import { animated, easings, useSpring } from 'react-spring'
+import styled from 'styled-components'
 import { TRANSITION_DURATIONS } from 'theme/styles'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import useResizeObserver from 'use-resize-observer'
diff --git a/apps/web/src/components/ConfirmSwapModal/Pending.tsx b/apps/web/src/components/ConfirmSwapModal/Pending.tsx
index 44bc3149000..dbb545556c0 100644
--- a/apps/web/src/components/ConfirmSwapModal/Pending.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/Pending.tsx
@@ -13,12 +13,12 @@ import { useAccount } from 'hooks/useAccount'
 import { SwapResult } from 'hooks/useSwapCallback'
 import { useUnmountingAnimation } from 'hooks/useUnmountingAnimation'
 import { Trans, t } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { ReactNode, useMemo, useRef } from 'react'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
 import { isLimitTrade, isUniswapXTradeType } from 'state/routing/utils'
 import { useOrder } from 'state/signatures/hooks'
 import { useIsTransactionConfirmed, useSwapTransactionStatus } from 'state/transactions/hooks'
+import styled, { css } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { AnimationType } from 'theme/components/FadePresence'
 import { ThemedText } from 'theme/components/text'
diff --git a/apps/web/src/components/ConfirmSwapModal/ProgressIndicator.tsx b/apps/web/src/components/ConfirmSwapModal/ProgressIndicator.tsx
index fc1c1c2f270..2e1cb248d25 100644
--- a/apps/web/src/components/ConfirmSwapModal/ProgressIndicator.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/ProgressIndicator.tsx
@@ -10,12 +10,12 @@ import { useColor } from 'hooks/useColor'
 import { SwapResult } from 'hooks/useSwapCallback'
 import { t } from 'i18n'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled, { useTheme } from 'lib/styled-components'
 import { useEffect, useMemo, useState } from 'react'
 import { InterfaceTrade } from 'state/routing/types'
 import { isLimitTrade, isUniswapXSwapTrade, isUniswapXTradeType } from 'state/routing/utils'
 import { useOrder } from 'state/signatures/hooks'
 import { useIsTransactionConfirmed, useSwapTransactionStatus } from 'state/transactions/hooks'
+import styled, { useTheme } from 'styled-components'
 import { colors } from 'theme/colors'
 import { Divider } from 'theme/components'
 import { UniswapXOrderStatus } from 'types/uniswapx'
diff --git a/apps/web/src/components/ConfirmSwapModal/Step.tsx b/apps/web/src/components/ConfirmSwapModal/Step.tsx
index f0d398cd26b..789d5e4e397 100644
--- a/apps/web/src/components/ConfirmSwapModal/Step.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/Step.tsx
@@ -2,8 +2,8 @@ import Column from 'components/Column'
 import { CheckMark } from 'components/Icons/CheckMark'
 import { LoaderV3 } from 'components/Icons/LoadingSpinner'
 import Row, { RowBetween } from 'components/Row'
-import styled, { Keyframes, keyframes } from 'lib/styled-components'
 import { ReactElement, useEffect, useState } from 'react'
+import styled, { Keyframes, keyframes } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 
 export interface StepDetails {
diff --git a/apps/web/src/components/ConfirmSwapModal/TradeSummary.tsx b/apps/web/src/components/ConfirmSwapModal/TradeSummary.tsx
index 678b29c37fb..91971afa4fb 100644
--- a/apps/web/src/components/ConfirmSwapModal/TradeSummary.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/TradeSummary.tsx
@@ -1,8 +1,8 @@
 import CurrencyLogo from 'components/Logo/CurrencyLogo'
 import Row from 'components/Row'
-import { useTheme } from 'lib/styled-components'
 import { ArrowRight } from 'react-feather'
 import { InterfaceTrade } from 'state/routing/types'
+import { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/ConfirmSwapModal/__snapshots__/Head.test.tsx.snap b/apps/web/src/components/ConfirmSwapModal/__snapshots__/Head.test.tsx.snap
index 86623136beb..3ce8c20dd60 100644
--- a/apps/web/src/components/ConfirmSwapModal/__snapshots__/Head.test.tsx.snap
+++ b/apps/web/src/components/ConfirmSwapModal/__snapshots__/Head.test.tsx.snap
@@ -2,13 +2,72 @@
 
 exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
 <DocumentFragment>
-  .c2 {
+  .c0 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  width: 100%;
+}
+
+.c2 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
+.c1 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
 .c3 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: left;
+  -webkit-justify-content: left;
+  -ms-flex-pack: left;
+  justify-content: left;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: right;
+  -webkit-justify-content: right;
+  -ms-flex-pack: right;
+  justify-content: right;
+  gap: 10px;
+}
+
+.c9 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -26,25 +85,28 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
   gap: 4px;
 }
 
-.c4 {
+.c5 {
   color: #222222;
-  cursor: pointer;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
+  -webkit-letter-spacing: -0.01em;
+  -moz-letter-spacing: -0.01em;
+  -ms-letter-spacing: -0.01em;
+  letter-spacing: -0.01em;
 }
 
-.c4:hover {
-  opacity: 0.6;
+.c4 {
+  -webkit-transition: display 250ms ease-in-out, -webkit-transform 250ms ease-in-out;
+  -webkit-transition: display 250ms ease-in-out, transform 250ms ease-in-out;
+  transition: display 250ms ease-in-out, transform 250ms ease-in-out;
+  -webkit-animation: iCPeaJ 250ms ease-in-out forwards;
+  animation: iCPeaJ 250ms ease-in-out forwards;
 }
 
-.c4:active {
-  opacity: 0.4;
+.c4.exiting {
+  -webkit-animation: bbnGid 250ms ease-in-out;
+  animation: bbnGid 250ms ease-in-out;
 }
 
-.c0 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -55,15 +117,15 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
   font-weight: 500;
 }
 
-.c0:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c0:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c1 {
+.c8 {
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -77,16 +139,34 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
   stroke: none;
 }
 
-.c1:hover {
+.c8:hover {
   background: #22222212;
   color: #222222;
   opacity: unset;
 }
 
-.c1:hover path {
+.c8:hover path {
   fill: #222222;
 }
 
+.c10 {
+  color: #222222;
+  cursor: pointer;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+}
+
+.c10:hover {
+  opacity: 0.6;
+}
+
+.c10:active {
+  opacity: 0.4;
+}
+
 <span
     class=" _dsp_contents"
   >
@@ -94,29 +174,33 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
       class=" t_light _dsp_contents is_Theme"
     >
       <div
-        class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037"
+        class="c0 c1"
+        width="100%"
       >
         <div
-          class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+          class="c2 c3"
         >
-          <span
-            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-400"
-            data-disable-theme="true"
+          <div
+            class="c4"
           >
-            Review limit
-          </span>
+            <div
+              class="c5 css-n8z49y"
+            >
+              Review limit
+            </div>
+          </div>
         </div>
         <div
-          class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+          class="c2 c6"
         >
           <a
-            class="c0 c1"
+            class="c7 c8"
             href="https://support.uniswap.org/hc/en-us"
             rel="noopener noreferrer"
             target="_blank"
           >
             <div
-              class="c2 c3"
+              class="c2 c9"
             >
               <svg
                 fill="none"
@@ -134,7 +218,7 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
             </div>
           </a>
           <svg
-            class="c4"
+            class="c10"
             data-testid="confirmation-close-icon"
             fill="none"
             height="24"
@@ -168,13 +252,72 @@ exports[`ConfirmSwapModal/Head should render correctly for a Limit order 1`] = `
 
 exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] = `
 <DocumentFragment>
-  .c2 {
+  .c0 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  width: 100%;
+}
+
+.c2 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
+.c1 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+}
+
 .c3 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: left;
+  -webkit-justify-content: left;
+  -ms-flex-pack: left;
+  justify-content: left;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: right;
+  -webkit-justify-content: right;
+  -ms-flex-pack: right;
+  justify-content: right;
+  gap: 10px;
+}
+
+.c9 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -192,25 +335,28 @@ exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] =
   gap: 4px;
 }
 
-.c4 {
+.c5 {
   color: #222222;
-  cursor: pointer;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
+  -webkit-letter-spacing: -0.01em;
+  -moz-letter-spacing: -0.01em;
+  -ms-letter-spacing: -0.01em;
+  letter-spacing: -0.01em;
 }
 
-.c4:hover {
-  opacity: 0.6;
+.c4 {
+  -webkit-transition: display 250ms ease-in-out, -webkit-transform 250ms ease-in-out;
+  -webkit-transition: display 250ms ease-in-out, transform 250ms ease-in-out;
+  transition: display 250ms ease-in-out, transform 250ms ease-in-out;
+  -webkit-animation: iCPeaJ 250ms ease-in-out forwards;
+  animation: iCPeaJ 250ms ease-in-out forwards;
 }
 
-.c4:active {
-  opacity: 0.4;
+.c4.exiting {
+  -webkit-animation: bbnGid 250ms ease-in-out;
+  animation: bbnGid 250ms ease-in-out;
 }
 
-.c0 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -221,15 +367,15 @@ exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] =
   font-weight: 500;
 }
 
-.c0:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c0:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c1 {
+.c8 {
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -243,16 +389,34 @@ exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] =
   stroke: none;
 }
 
-.c1:hover {
+.c8:hover {
   background: #22222212;
   color: #222222;
   opacity: unset;
 }
 
-.c1:hover path {
+.c8:hover path {
   fill: #222222;
 }
 
+.c10 {
+  color: #222222;
+  cursor: pointer;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+}
+
+.c10:hover {
+  opacity: 0.6;
+}
+
+.c10:active {
+  opacity: 0.4;
+}
+
 <span
     class="t_light is_inversed _dsp_contents"
   >
@@ -260,29 +424,33 @@ exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] =
       class=" t_light _dsp_contents is_Theme"
     >
       <div
-        class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037"
+        class="c0 c1"
+        width="100%"
       >
         <div
-          class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+          class="c2 c3"
         >
-          <span
-            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-400"
-            data-disable-theme="true"
+          <div
+            class="c4"
           >
-            Review swap
-          </span>
+            <div
+              class="c5 css-n8z49y"
+            >
+              Review swap
+            </div>
+          </div>
         </div>
         <div
-          class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+          class="c2 c6"
         >
           <a
-            class="c0 c1"
+            class="c7 c8"
             href="https://support.uniswap.org/hc/en-us"
             rel="noopener noreferrer"
             target="_blank"
           >
             <div
-              class="c2 c3"
+              class="c2 c9"
             >
               <svg
                 fill="none"
@@ -300,7 +468,7 @@ exports[`ConfirmSwapModal/Head should render correctly for a classic swap 1`] =
             </div>
           </a>
           <svg
-            class="c4"
+            class="c10"
             data-testid="confirmation-close-icon"
             fill="none"
             height="24"
diff --git a/apps/web/src/components/ConfirmSwapModal/__snapshots__/Pending.test.tsx.snap b/apps/web/src/components/ConfirmSwapModal/__snapshots__/Pending.test.tsx.snap
index 2882a1c2616..ede721b758d 100644
--- a/apps/web/src/components/ConfirmSwapModal/__snapshots__/Pending.test.tsx.snap
+++ b/apps/web/src/components/ConfirmSwapModal/__snapshots__/Pending.test.tsx.snap
@@ -36,44 +36,6 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   width: 64px;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c12 {
   box-sizing: border-box;
   margin: 0;
@@ -158,6 +120,44 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   opacity: 0.4;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c14 {
   position: relative;
   display: -webkit-box;
@@ -438,44 +438,6 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   width: 64px;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c12 {
   box-sizing: border-box;
   margin: 0;
@@ -560,6 +522,44 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   opacity: 0.4;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c14 {
   position: relative;
   display: -webkit-box;
@@ -860,44 +860,6 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   position: absolute;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c8 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c14 {
   box-sizing: border-box;
   margin: 0;
@@ -963,6 +925,44 @@ exports[`Pending - classic trade titles renders classic trade correctly, with ap
   letter-spacing: -0.01em;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c8 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c16 {
   position: relative;
   display: -webkit-box;
@@ -1237,44 +1237,6 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   width: 64px;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c12 {
   box-sizing: border-box;
   margin: 0;
@@ -1315,6 +1277,44 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   letter-spacing: -0.01em;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c14 {
   position: relative;
   display: -webkit-box;
@@ -1578,44 +1578,6 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   width: 64px;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c12 {
   box-sizing: border-box;
   margin: 0;
@@ -1700,6 +1662,44 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   opacity: 0.4;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c14 {
   position: relative;
   display: -webkit-box;
@@ -2000,44 +2000,6 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   position: absolute;
 }
 
-.c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 24px;
-}
-
-.c8 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
 .c14 {
   box-sizing: border-box;
   margin: 0;
@@ -2103,6 +2065,44 @@ exports[`Pending - uniswapX trade titles renders limit order correctly, with app
   letter-spacing: -0.01em;
 }
 
+.c0 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 24px;
+}
+
+.c8 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 12px;
+}
+
+.c1 {
+  width: 100%;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
 .c16 {
   position: relative;
   display: -webkit-box;
diff --git a/apps/web/src/components/ConfirmSwapModal/animations.ts b/apps/web/src/components/ConfirmSwapModal/animations.ts
index db541f0fd03..e56246ef0a0 100644
--- a/apps/web/src/components/ConfirmSwapModal/animations.ts
+++ b/apps/web/src/components/ConfirmSwapModal/animations.ts
@@ -1,4 +1,4 @@
-import { css, keyframes } from 'lib/styled-components'
+import { css, keyframes } from 'styled-components'
 
 const slideIn = keyframes`
   from { opacity: 0; transform: translateX(40px) }
diff --git a/apps/web/src/components/ConfirmSwapModal/index.tsx b/apps/web/src/components/ConfirmSwapModal/index.tsx
index 15fb7a5a5d6..5563cb36dc3 100644
--- a/apps/web/src/components/ConfirmSwapModal/index.tsx
+++ b/apps/web/src/components/ConfirmSwapModal/index.tsx
@@ -13,7 +13,6 @@ import { Field } from 'components/swap/constants'
 import { useConfirmModalState } from 'hooks/useConfirmModalState'
 import { Allowance, AllowanceState } from 'hooks/usePermit2Allowance'
 import { SwapResult } from 'hooks/useSwapCallback'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useMemo } from 'react'
 import { useSuppressPopups } from 'state/application/hooks'
 import { PopupType } from 'state/application/reducer'
@@ -21,6 +20,7 @@ import { InterfaceTrade } from 'state/routing/types'
 import { isLimitTrade, isPreviewTrade, isUniswapXTradeType } from 'state/routing/utils'
 import { useOrder } from 'state/signatures/hooks'
 import { useSwapTransactionStatus } from 'state/transactions/hooks'
+import styled from 'styled-components'
 import { ThemeProvider } from 'theme'
 import { FadePresence } from 'theme/components/FadePresence'
 import { UniswapXOrderStatus } from 'types/uniswapx'
diff --git a/apps/web/src/components/ConnectedAccountBlocked/index.tsx b/apps/web/src/components/ConnectedAccountBlocked/index.tsx
index 643190aeb48..3b07e156b7e 100644
--- a/apps/web/src/components/ConnectedAccountBlocked/index.tsx
+++ b/apps/web/src/components/ConnectedAccountBlocked/index.tsx
@@ -2,7 +2,7 @@ import Column from 'components/Column'
 import Modal from 'components/Modal'
 import { BlockedIcon } from 'components/TokenSafety/TokenSafetyIcon'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
+import styled, { useTheme } from 'styled-components'
 import { CopyHelper, ExternalLink, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 
diff --git a/apps/web/src/components/CurrencyInputPanel/FiatValue.tsx b/apps/web/src/components/CurrencyInputPanel/FiatValue.tsx
index 9ac5d193e1c..cd61988322f 100644
--- a/apps/web/src/components/CurrencyInputPanel/FiatValue.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/FiatValue.tsx
@@ -3,8 +3,8 @@ import Row from 'components/Row'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { warningSeverity } from 'utils/prices'
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx
index 3553728d157..e8376bc892c 100644
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx
@@ -1,8 +1,8 @@
 import { Percent } from '@uniswap/sdk-core'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { X } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx
index d4ed05cd83e..5ba0fbd5d64 100644
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx
@@ -3,7 +3,7 @@ import CurrencyLogo from 'components/Logo/CurrencyLogo'
 import Row from 'components/Row'
 import { PrefetchBalancesWrapper } from 'graphql/data/apollo/TokenBalancesProvider'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx
index 0e6f8c8d9ed..38a41d573d3 100644
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx
@@ -14,13 +14,13 @@ import CurrencySearchModal from 'components/SearchModal/CurrencySearchModal'
 import { parseUnits } from 'ethers/lib/utils'
 import { PrefetchBalancesWrapper } from 'graphql/data/apollo/TokenBalancesProvider'
 import JSBI from 'jsbi'
-import styled from 'lib/styled-components'
 import { ReversedArrowsIcon } from 'nft/components/icons'
 import { LIMIT_FORM_CURRENCY_SEARCH_FILTERS } from 'pages/Swap/Limit/LimitForm'
 import { useCallback, useMemo, useState } from 'react'
 import { useLimitContext, useLimitPrice } from 'state/limit/LimitContext'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
 import { CurrencyState } from 'state/swap/types'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx b/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
index ae3c666b5c6..7668f7317a0 100644
--- a/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
@@ -18,13 +18,13 @@ import { useIsSupportedChainId } from 'constants/chains'
 import { PrefetchBalancesWrapper } from 'graphql/data/apollo/TokenBalancesProvider'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import ms from 'ms'
 import { darken } from 'polished'
 import { ReactNode, forwardRef, useCallback, useEffect, useState } from 'react'
 import { Lock } from 'react-feather'
 import { useCurrencyBalance } from 'state/connection/hooks'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap, flexRowNoWrap } from 'theme/styles'
 import { Text } from 'ui/src'
diff --git a/apps/web/src/components/CurrencyInputPanel/index.tsx b/apps/web/src/components/CurrencyInputPanel/index.tsx
index 53361fd4510..adf8244b277 100644
--- a/apps/web/src/components/CurrencyInputPanel/index.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/index.tsx
@@ -15,10 +15,10 @@ import { useIsSupportedChainId } from 'constants/chains'
 import { PrefetchBalancesWrapper } from 'graphql/data/apollo/TokenBalancesProvider'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { darken } from 'polished'
 import { ReactNode, useCallback, useState } from 'react'
 import { useCurrencyBalance } from 'state/connection/hooks'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap, flexRowNoWrap } from 'theme/styles'
diff --git a/apps/web/src/components/Dialog/Dialog.tsx b/apps/web/src/components/Dialog/Dialog.tsx
index 4b591f6f848..841221f4e96 100644
--- a/apps/web/src/components/Dialog/Dialog.tsx
+++ b/apps/web/src/components/Dialog/Dialog.tsx
@@ -1,12 +1,12 @@
 import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
+import GetHelp from 'components/Button/GetHelp'
 import { ColumnCenter } from 'components/Column'
 import Modal from 'components/Modal'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
 import Row from 'components/Row'
-import styled, { DefaultTheme } from 'lib/styled-components'
 import { ReactNode } from 'react'
+import styled, { DefaultTheme } from 'styled-components'
 import { Gap } from 'theme'
-import { ThemedText } from 'theme/components'
+import { CloseIcon, ThemedText } from 'theme/components'
 
 export const Container = styled(ColumnCenter)`
   background-color: ${({ theme }) => theme.surface1};
@@ -49,10 +49,6 @@ const StyledButton = styled(ThemeButton)<{ $color?: keyof DefaultTheme }>`
   border-radius: 12px;
 `
 
-const DialogHeader = styled(GetHelpHeader)`
-  padding: 4px 0px;
-`
-
 export enum DialogButtonType {
   Primary = 'primary',
   Error = 'error',
@@ -155,7 +151,10 @@ export function Dialog(props: DialogProps) {
   return (
     <Modal $scrollOverlay isOpen={props.isVisible} onDismiss={props.onCancel}>
       <Container gap="lg">
-        <DialogHeader closeModal={props.onCancel} closeDataTestId="Dialog-closeButton" />
+        <Row gap="10px" width="100%" padding="4px 0px" justify="end" align="center">
+          <GetHelp />
+          <CloseIcon data-testid="Dialog-closeButton" onClick={props.onCancel} />
+        </Row>
         <DialogContent {...props} />
       </Container>
     </Modal>
diff --git a/apps/web/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap b/apps/web/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
index fb2ac6f8b3f..92fe5e2910e 100644
--- a/apps/web/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
+++ b/apps/web/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
@@ -1,13 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Dialog /> renders different button types 1`] = `
-.c8 {
+.c5 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
 .c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
+}
+
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -25,7 +52,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   gap: 4px;
 }
 
-.c18 {
+.c19 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -43,7 +70,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   gap: 12px;
 }
 
-.c14 {
+.c15 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -51,7 +78,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c16 {
+.c17 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -59,7 +86,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -69,15 +96,15 @@ exports[`<Dialog /> renders different button types 1`] = `
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -88,15 +115,15 @@ exports[`<Dialog /> renders different button types 1`] = `
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c22 {
+.c23 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -110,7 +137,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   width: 100%;
 }
 
-.c19 {
+.c20 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -145,30 +172,30 @@ exports[`<Dialog /> renders different button types 1`] = `
   user-select: none;
 }
 
-.c19:active .c21 {
+.c20:active .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c19:focus .c21 {
+.c20:focus .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c19:hover .c21 {
+.c20:hover .c22 {
   background-color: #98A1C014;
 }
 
-.c19:disabled {
+.c20:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c19:disabled:active .c21,
-.c19:disabled:focus .c21,
-.c19:disabled:hover .c21 {
+.c20:disabled:active .c22,
+.c20:disabled:focus .c22,
+.c20:disabled:hover .c22 {
   background-color: transparent;
 }
 
-.c23 {
+.c24 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -203,29 +230,53 @@ exports[`<Dialog /> renders different button types 1`] = `
   user-select: none;
 }
 
-.c23:active .c21 {
+.c24:active .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c23:focus .c21 {
+.c24:focus .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c23:hover .c21 {
+.c24:hover .c22 {
   background-color: #98A1C014;
 }
 
-.c23:disabled {
+.c24:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c23:disabled:active .c21,
-.c23:disabled:focus .c21,
-.c23:disabled:hover .c21 {
+.c24:disabled:active .c22,
+.c24:disabled:focus .c22,
+.c24:disabled:hover .c22 {
   background-color: transparent;
 }
 
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
 .c2 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -241,7 +292,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   gap: 24px;
 }
 
-.c11 {
+.c12 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -256,7 +307,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   gap: 16px;
 }
 
-.c13 {
+.c14 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -322,30 +373,6 @@ exports[`<Dialog /> renders different button types 1`] = `
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -354,7 +381,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -373,14 +400,14 @@ exports[`<Dialog /> renders different button types 1`] = `
   border-radius: 12px;
 }
 
-.c15 {
+.c16 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c17 {
+.c18 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -391,7 +418,7 @@ exports[`<Dialog /> renders different button types 1`] = `
   text-align: center;
 }
 
-.c20 {
+.c21 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -404,10 +431,6 @@ exports[`<Dialog /> renders different button types 1`] = `
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
 @media screen and (max-width:640px) {
   .c0[data-reach-dialog-overlay] {
     -webkit-align-items: flex-end;
@@ -478,88 +501,85 @@ exports[`<Dialog /> renders different button types 1`] = `
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <div>
                       Mock Icon
                     </div>
                   </div>
                   <div
-                    class="c13 c3"
+                    class="c14 c3"
                   >
                     <div
-                      class="c14 c15 css-4kpdx7"
+                      class="c15 c16 css-4kpdx7"
                     >
                       <div>
                         Mock Title
                       </div>
                     </div>
                     <div
-                      class="c16 c17 css-1urox24"
+                      class="c17 c18 css-1urox24"
                     >
                       <div>
                         Mock Description
@@ -571,24 +591,24 @@ exports[`<Dialog /> renders different button types 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c8 c18"
+                  class="c9 c19"
                 >
                   <button
-                    class="c19 c20"
+                    class="c20 c21"
                     disabled=""
                   >
                     <div
-                      class="c21 c22"
+                      class="c22 c23"
                     />
                     <div>
                       Left Button
                     </div>
                   </button>
                   <button
-                    class="c23 c20"
+                    class="c24 c21"
                   >
                     <div
-                      class="c21 c22"
+                      class="c22 c23"
                     />
                     <div>
                       Right Button
@@ -611,13 +631,40 @@ exports[`<Dialog /> renders different button types 1`] = `
 `;
 
 exports[`<Dialog /> renders the Dialog component correctly 1`] = `
-.c8 {
+.c5 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
 .c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
+}
+
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -635,7 +682,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   gap: 4px;
 }
 
-.c18 {
+.c19 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -653,7 +700,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   gap: 12px;
 }
 
-.c14 {
+.c15 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -661,7 +708,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c16 {
+.c17 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -669,7 +716,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -679,15 +726,15 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -698,15 +745,15 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c22 {
+.c23 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -720,7 +767,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   width: 100%;
 }
 
-.c19 {
+.c20 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -755,29 +802,53 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   user-select: none;
 }
 
-.c19:active .c21 {
+.c20:active .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c19:focus .c21 {
+.c20:focus .c22 {
   background-color: #B8C0DC3d;
 }
 
-.c19:hover .c21 {
+.c20:hover .c22 {
   background-color: #98A1C014;
 }
 
-.c19:disabled {
+.c20:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c19:disabled:active .c21,
-.c19:disabled:focus .c21,
-.c19:disabled:hover .c21 {
+.c20:disabled:active .c22,
+.c20:disabled:focus .c22,
+.c20:disabled:hover .c22 {
   background-color: transparent;
 }
 
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
 .c2 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -793,7 +864,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   gap: 24px;
 }
 
-.c11 {
+.c12 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -808,7 +879,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   gap: 16px;
 }
 
-.c13 {
+.c14 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -874,30 +945,6 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -906,7 +953,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -925,14 +972,14 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   border-radius: 12px;
 }
 
-.c15 {
+.c16 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c17 {
+.c18 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -943,7 +990,7 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   text-align: center;
 }
 
-.c20 {
+.c21 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -956,10 +1003,6 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
 @media screen and (max-width:640px) {
   .c0[data-reach-dialog-overlay] {
     -webkit-align-items: flex-end;
@@ -1030,88 +1073,85 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <div>
                       Mock Icon
                     </div>
                   </div>
                   <div
-                    class="c13 c3"
+                    class="c14 c3"
                   >
                     <div
-                      class="c14 c15 css-4kpdx7"
+                      class="c15 c16 css-4kpdx7"
                     >
                       <div>
                         Mock Title
                       </div>
                     </div>
                     <div
-                      class="c16 c17 css-1urox24"
+                      class="c17 c18 css-1urox24"
                     >
                       <div>
                         Mock Description
@@ -1123,23 +1163,23 @@ exports[`<Dialog /> renders the Dialog component correctly 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c8 c18"
+                  class="c9 c19"
                 >
                   <button
-                    class="c19 c20"
+                    class="c20 c21"
                   >
                     <div
-                      class="c21 c22"
+                      class="c22 c23"
                     />
                     <div>
                       Left Button
                     </div>
                   </button>
                   <button
-                    class="c19 c20"
+                    class="c20 c21"
                   >
                     <div
-                      class="c21 c22"
+                      class="c22 c23"
                     />
                     <div>
                       Right Button
diff --git a/apps/web/src/components/DoubleLogo/index.tsx b/apps/web/src/components/DoubleLogo/index.tsx
index 455a88c98b9..33cd363d436 100644
--- a/apps/web/src/components/DoubleLogo/index.tsx
+++ b/apps/web/src/components/DoubleLogo/index.tsx
@@ -3,7 +3,7 @@ import blankTokenUrl from 'assets/svg/blank_token.svg'
 import { MissingImageLogo } from 'components/Logo/AssetLogo'
 import { ChainLogo } from 'components/Logo/ChainLogo'
 import { useCurrencyInfo } from 'hooks/Tokens'
-import styled, { css } from 'lib/styled-components'
+import styled, { css } from 'styled-components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 import { useLogolessColorScheme } from 'ui/src'
 import { InterfaceChainId, UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/DropdownSelector/FilterButton.tsx b/apps/web/src/components/DropdownSelector/FilterButton.tsx
index 7ebe269ba03..87d16a587df 100644
--- a/apps/web/src/components/DropdownSelector/FilterButton.tsx
+++ b/apps/web/src/components/DropdownSelector/FilterButton.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 const FilterButton = styled.button<{ active: boolean; highlight?: boolean }>`
   height: 100%;
   color: ${({ theme }) => theme.neutral1};
diff --git a/apps/web/src/components/DropdownSelector/index.tsx b/apps/web/src/components/DropdownSelector/index.tsx
index 4409d1dd543..3052c498689 100644
--- a/apps/web/src/components/DropdownSelector/index.tsx
+++ b/apps/web/src/components/DropdownSelector/index.tsx
@@ -2,9 +2,9 @@ import Column from 'components/Column'
 import FilterButton from 'components/DropdownSelector/FilterButton'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled, { css } from 'lib/styled-components'
 import React, { useRef } from 'react'
 import { ChevronDown } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { dropdownSlideDown } from 'theme/styles'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/components/ErrorBoundary/index.tsx b/apps/web/src/components/ErrorBoundary/index.tsx
index 3c05ec11515..c7d6095af2e 100644
--- a/apps/web/src/components/ErrorBoundary/index.tsx
+++ b/apps/web/src/components/ErrorBoundary/index.tsx
@@ -4,10 +4,10 @@ import { Column } from 'components/Column'
 import { useIsMobile } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ChevronUpIcon } from 'nft/components/icons'
 import { PropsWithChildren, useState } from 'react'
 import { Copy } from 'react-feather'
+import styled from 'styled-components'
 import { CopyToClipboard, ExternalLink, ThemedText } from 'theme/components'
 import { isRemoteReportingEnabled } from 'utils/env'
 
diff --git a/apps/web/src/components/Expand/index.tsx b/apps/web/src/components/Expand/index.tsx
index 0cc0b7ded72..8e8efd7ac6c 100644
--- a/apps/web/src/components/Expand/index.tsx
+++ b/apps/web/src/components/Expand/index.tsx
@@ -1,9 +1,9 @@
 import AnimatedDropdown from 'components/AnimatedDropdown'
 import Column from 'components/Column'
 import Row, { RowBetween } from 'components/Row'
-import styled from 'lib/styled-components'
 import { PropsWithChildren, ReactElement } from 'react'
 import { ChevronDown } from 'react-feather'
+import styled from 'styled-components'
 
 const ButtonContainer = styled(Row)`
   cursor: pointer;
diff --git a/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx b/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
index 50d1aaadfc5..9f13bb75b90 100644
--- a/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
+++ b/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
@@ -2,14 +2,14 @@ import { SmallButtonPrimary } from 'components/Button'
 import Column from 'components/Column'
 import Modal from 'components/Modal'
 import Row from 'components/Row'
-import { useQuickRouteChains } from 'featureFlags/dynamicConfig/quickRouteChains'
-import styled from 'lib/styled-components'
+import { QUICK_ROUTE_CONFIG_KEY, useQuickRouteChains } from 'featureFlags/dynamicConfig/quickRouteChains'
 import { PropsWithChildren } from 'react'
 import { X } from 'react-feather'
 import { useCloseModal, useModalIsOpen } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
-import { DynamicConfigKeys, DynamicConfigs, QuickRouteChainsConfigKey } from 'uniswap/src/features/gating/configs'
+import { DynamicConfigs, getConfigName } from 'uniswap/src/features/gating/configs'
 import { FeatureFlags, getFeatureFlagName } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlagWithExposureLoggingDisabled } from 'uniswap/src/features/gating/hooks'
 import { Statsig } from 'uniswap/src/features/gating/sdk/statsig'
@@ -154,29 +154,24 @@ function FeatureFlagOption({ flag, label }: FeatureFlagProps) {
   )
 }
 
-function DynamicConfigDropdown<Conf extends DynamicConfigs, Key extends DynamicConfigKeys[Conf]>({
-  config,
-  key,
-  label,
-  options,
-  selected,
-  parser,
-}: {
-  config: Conf
-  key: Key
+interface DynamicConfigDropdownProps {
+  config: DynamicConfigs
   label: string
   options: any[]
   selected: any[]
   parser: (opt: string) => any
-}) {
+}
+
+function DynamicConfigDropdown({ config, label, options, selected, parser }: DynamicConfigDropdownProps) {
+  const configName = getConfigName(config)
   const handleSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
     const selectedValues = Array.from(e.target.selectedOptions, (opt) => parser(opt.value))
-    Statsig.overrideConfig(config, { [key]: selectedValues })
+    Statsig.overrideConfig(configName, { [QUICK_ROUTE_CONFIG_KEY]: selectedValues })
   }
   return (
-    <CenteredRow key={config}>
+    <CenteredRow key={configName}>
       <FlagInfo>
-        <FlagName>{config}</FlagName>
+        <FlagName>{configName}</FlagName>
         <FlagDescription>{label}</FlagDescription>
       </FlagInfo>
       <select multiple onChange={handleSelectChange}>
@@ -242,7 +237,6 @@ export default function FeatureFlagModal() {
               options={WEB_SUPPORTED_CHAIN_IDS}
               parser={Number.parseInt}
               config={DynamicConfigs.QuickRouteChains}
-              key={QuickRouteChainsConfigKey.Chains}
               label="Enable quick routes for these chains"
             />
           </FeatureFlagGroup>
diff --git a/apps/web/src/components/FeeSelector/FeeOption.tsx b/apps/web/src/components/FeeSelector/FeeOption.tsx
index 5235d4a3971..98791f5bda4 100644
--- a/apps/web/src/components/FeeSelector/FeeOption.tsx
+++ b/apps/web/src/components/FeeSelector/FeeOption.tsx
@@ -5,7 +5,7 @@ import { FeeTierPercentageBadge } from 'components/FeeSelector/FeeTierPercentage
 import { FEE_AMOUNT_DETAIL } from 'components/FeeSelector/shared'
 import { useFeeTierDistribution } from 'hooks/useFeeTierDistribution'
 import { PoolState } from 'hooks/usePools'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/FeeSelector/index.tsx b/apps/web/src/components/FeeSelector/index.tsx
index 5cd69f5319b..8f865af6d79 100644
--- a/apps/web/src/components/FeeSelector/index.tsx
+++ b/apps/web/src/components/FeeSelector/index.tsx
@@ -13,10 +13,10 @@ import { useFeeTierDistribution } from 'hooks/useFeeTierDistribution'
 import { PoolState, usePools } from 'hooks/usePools'
 import usePrevious from 'hooks/usePrevious'
 import { Trans } from 'i18n'
-import styled, { keyframes } from 'lib/styled-components'
 import { DynamicSection } from 'pages/AddLiquidity/styled'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Box } from 'rebass'
+import styled, { keyframes } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { InterfaceChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/FiatOnrampModal/index.tsx b/apps/web/src/components/FiatOnrampModal/index.tsx
index 69502f2dd1e..705892d9c92 100644
--- a/apps/web/src/components/FiatOnrampModal/index.tsx
+++ b/apps/web/src/components/FiatOnrampModal/index.tsx
@@ -1,18 +1,18 @@
 import Circle from 'assets/images/blue-loader.svg'
 import { MOONPAY_SUPPORTED_CURRENCY_CODES } from 'components/FiatOnrampModal/constants'
 import { getDefaultCurrencyCode, parsePathParts } from 'components/FiatOnrampModal/utils'
+import Modal from 'components/Modal'
 import { getChain, getChainFromChainUrlParam, getChainUrlParam } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import useParsedQueryString from 'hooks/useParsedQueryString'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useCallback, useEffect, useState } from 'react'
 import { useHref } from 'react-router-dom'
 import { useCloseModal, useModalIsOpen } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { useTheme } from 'styled-components'
 import { CustomLightSpinner, ThemedText } from 'theme/components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
-import { AdaptiveWebModalSheet } from 'ui/src'
 import { logger } from 'utilities/src/logger/logger'
 
 const MOONPAY_DARK_BACKGROUND = '#1c1c1e'
@@ -147,7 +147,7 @@ export default function FiatOnrampModal() {
   }, [fetchSignedIframeUrl])
 
   return (
-    <AdaptiveWebModalSheet isOpen={fiatOnrampModalOpen} onClose={() => closeModal()}>
+    <Modal isOpen={fiatOnrampModalOpen} onDismiss={() => closeModal()} maxHeight="80vh" height="80vh">
       <Wrapper data-testid="fiat-onramp-modal" isDarkMode={isDarkMode}>
         {error ? (
           <>
@@ -176,6 +176,6 @@ export default function FiatOnrampModal() {
           <Trans i18nKey="moonpay.poweredBy" />
         </ThemedText.BodySmall>
       </MoonpayTextWrapper>
-    </AdaptiveWebModalSheet>
+    </Modal>
   )
 }
diff --git a/apps/web/src/components/HoverInlineText/index.tsx b/apps/web/src/components/HoverInlineText/index.tsx
index e2f16dfb7cd..68c28ce37b3 100644
--- a/apps/web/src/components/HoverInlineText/index.tsx
+++ b/apps/web/src/components/HoverInlineText/index.tsx
@@ -1,6 +1,6 @@
 import Tooltip from 'components/Tooltip'
-import styled from 'lib/styled-components'
 import { useState } from 'react'
+import styled from 'styled-components'
 
 const TextWrapper = styled.span<{
   margin: boolean
diff --git a/apps/web/src/components/Icons/AlertTriangleFilled.tsx b/apps/web/src/components/Icons/AlertTriangleFilled.tsx
index edc7259ec03..c9e10d2c622 100644
--- a/apps/web/src/components/Icons/AlertTriangleFilled.tsx
+++ b/apps/web/src/components/Icons/AlertTriangleFilled.tsx
@@ -1,5 +1,5 @@
 import { StyledSVG } from 'components/Icons/shared'
-import { useTheme } from 'lib/styled-components'
+import { useTheme } from 'styled-components'
 
 export default function AlertTriangleFilled({ size = '16px', ...rest }: { size?: string; [k: string]: any }) {
   const theme = useTheme()
diff --git a/apps/web/src/components/Icons/BraveBrowserLogo.tsx b/apps/web/src/components/Icons/BraveBrowserLogo.tsx
new file mode 100644
index 00000000000..1ef92dadfbf
--- /dev/null
+++ b/apps/web/src/components/Icons/BraveBrowserLogo.tsx
@@ -0,0 +1,52 @@
+import { ComponentProps } from 'react'
+
+export function BraveBrowserLogo(props: ComponentProps<'svg'>) {
+  return (
+    <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M57.622 15.321L59.122 11.645C59.122 11.645 57.213 9.602 54.895 7.287C52.578 4.972 47.67 6.334 47.67 6.334L42.081 0H22.45L16.861 6.334C16.861 6.334 11.953 4.972 9.636 7.287C7.318 9.602 5.41 11.645 5.41 11.645L6.91 15.321L5 20.768C5 20.768 10.614 42.004 11.272 44.598C12.567 49.704 13.453 51.678 17.134 54.266C20.814 56.853 27.494 61.346 28.584 62.028C29.675 62.708 31.039 63.868 32.266 63.868C33.493 63.868 34.856 62.708 35.946 62.028C37.037 61.347 43.716 56.853 47.398 54.266C51.078 51.679 51.965 49.704 53.26 44.598C53.917 42.004 59.53 20.768 59.53 20.768L57.622 15.321Z"
+        fill="url(#paint0_linear_11_3292)"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M39.218 11.508C40.036 11.508 46.103 10.351 46.103 10.351C46.103 10.351 53.292 19.031 53.292 20.887C53.292 22.421 52.673 23.021 51.945 23.729C51.793 23.877 51.635 24.029 51.478 24.197L46.088 29.914C46.0301 29.9748 45.9715 30.0348 45.912 30.094C45.374 30.634 44.582 31.43 45.14 32.752L45.255 33.021C45.868 34.453 46.625 36.221 45.662 38.011C44.637 39.917 42.882 41.189 41.757 40.978C40.633 40.768 37.991 39.389 37.02 38.76C36.049 38.13 32.97 35.594 32.97 34.623C32.97 33.814 35.184 32.468 36.26 31.813C36.474 31.683 36.643 31.581 36.74 31.515C36.851 31.44 37.037 31.325 37.266 31.183C38.247 30.573 40.02 29.473 40.065 28.986C40.12 28.384 40.099 28.208 39.307 26.722C39.139 26.406 38.942 26.068 38.739 25.718C37.985 24.423 37.141 22.973 37.329 21.934C37.539 20.761 39.379 20.089 40.937 19.519C41.131 19.449 41.322 19.379 41.504 19.31L43.127 18.701C44.683 18.119 46.411 17.472 46.697 17.341C47.091 17.16 46.989 16.986 45.794 16.873C45.6006 16.854 45.4072 16.834 45.214 16.813C43.734 16.656 41.005 16.367 39.679 16.736C39.418 16.809 39.126 16.888 38.819 16.971C37.329 17.374 35.502 17.868 35.326 18.153C35.296 18.203 35.266 18.246 35.237 18.286C35.069 18.524 34.96 18.68 35.146 19.692C35.201 19.994 35.315 20.587 35.456 21.321C35.866 23.469 36.509 26.819 36.59 27.571C36.601 27.677 36.614 27.778 36.626 27.876C36.729 28.716 36.797 29.275 35.821 29.498L35.566 29.556C34.464 29.808 32.849 30.179 32.266 30.179C31.682 30.179 30.066 29.809 28.964 29.556L28.71 29.498C27.734 29.275 27.803 28.716 27.906 27.876C27.918 27.778 27.93 27.676 27.941 27.571C28.022 26.818 28.666 23.459 29.078 21.312C29.218 20.582 29.331 19.992 29.386 19.692C29.571 18.68 29.462 18.524 29.294 18.286C29.263 18.2423 29.233 18.198 29.204 18.153C29.03 17.868 27.204 17.374 25.713 16.971C25.406 16.888 25.113 16.809 24.853 16.736C23.526 16.366 20.798 16.656 19.318 16.813C19.092 16.837 18.896 16.858 18.738 16.873C17.542 16.986 17.441 17.16 17.835 17.341C18.12 17.472 19.848 18.119 21.403 18.701C22 18.924 22.573 19.138 23.027 19.31C23.21 19.379 23.4 19.448 23.595 19.52C25.153 20.09 26.993 20.761 27.203 21.934C27.39 22.973 26.546 24.423 25.793 25.718C25.589 26.068 25.393 26.406 25.224 26.722C24.433 28.208 24.412 28.384 24.467 28.986C24.511 29.474 26.283 30.573 27.265 31.183C27.494 31.325 27.68 31.44 27.791 31.515C27.889 31.581 28.057 31.683 28.271 31.813C29.347 32.467 31.561 33.813 31.561 34.623C31.561 35.593 28.483 38.13 27.511 38.76C26.541 39.39 23.899 40.768 22.774 40.978C21.65 41.188 19.894 39.917 18.87 38.012C17.907 36.221 18.663 34.453 19.276 33.022L19.391 32.752C19.95 31.43 19.158 30.634 18.619 30.094C18.5599 30.0348 18.5015 29.9748 18.444 29.914L13.054 24.197C12.896 24.03 12.738 23.877 12.586 23.729C11.858 23.022 11.24 22.421 11.24 20.887C11.24 19.032 18.429 10.351 18.429 10.351C18.429 10.351 24.495 11.508 25.313 11.508C25.966 11.508 27.226 11.075 28.54 10.623C28.873 10.509 29.209 10.393 29.54 10.283C31.175 9.73801 32.266 9.73401 32.266 9.73401C32.266 9.73401 33.356 9.73801 34.992 10.283C35.322 10.393 35.659 10.509 35.992 10.623C37.305 11.075 38.566 11.508 39.218 11.508ZM38.177 42.214C39.459 42.874 40.369 43.342 40.713 43.557C41.158 43.835 40.887 44.36 40.481 44.647C40.076 44.932 34.628 49.146 34.1 49.612L33.885 49.803C33.376 50.262 32.726 50.847 32.265 50.847C31.805 50.847 31.155 50.261 30.645 49.803L30.432 49.612C29.902 49.146 24.455 44.932 24.05 44.646C23.645 44.36 23.373 43.836 23.818 43.556C24.162 43.342 25.073 42.873 26.357 42.212L27.577 41.583C29.497 40.591 31.892 39.746 32.266 39.746C32.639 39.746 35.033 40.59 36.955 41.583C37.391 41.809 37.8 42.021 38.177 42.214Z"
+        fill="white"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M47.67 6.334L42.081 0H22.45L16.861 6.334C16.861 6.334 11.953 4.972 9.63605 7.287C9.63605 7.287 16.18 6.697 18.429 10.351C18.429 10.351 24.495 11.508 25.313 11.508C26.131 11.508 27.903 10.828 29.539 10.283C31.175 9.738 32.266 9.734 32.266 9.734C32.266 9.734 33.356 9.738 34.992 10.283C36.628 10.828 38.4 11.508 39.218 11.508C40.036 11.508 46.103 10.351 46.103 10.351C48.352 6.697 54.895 7.287 54.895 7.287C52.578 4.972 47.67 6.334 47.67 6.334Z"
+        fill="url(#paint1_linear_11_3292)"
+      />
+      <defs>
+        <linearGradient
+          id="paint0_linear_11_3292"
+          x1="5.001"
+          y1="64.319"
+          x2="59.53"
+          y2="64.319"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#FF5500" />
+          <stop offset="0.41" stopColor="#FF5500" />
+          <stop offset="0.582" stopColor="#FF2000" />
+          <stop offset="1" stopColor="#FF2000" />
+        </linearGradient>
+        <linearGradient
+          id="paint1_linear_11_3292"
+          x1="10.608"
+          y1="11.466"
+          x2="54.895"
+          y2="11.466"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#FF452A" />
+          <stop offset="1" stopColor="#FF2000" />
+        </linearGradient>
+      </defs>
+    </svg>
+  )
+}
diff --git a/apps/web/src/components/Icons/Collapse.tsx b/apps/web/src/components/Icons/Collapse.tsx
deleted file mode 100644
index 2230ed0d04a..00000000000
--- a/apps/web/src/components/Icons/Collapse.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-type SVGProps = React.SVGProps<SVGSVGElement> & {
-  fill?: string
-  height?: string | number
-  width?: string | number
-}
-
-export const CollapsedIcon = (props: SVGProps) => (
-  <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
-    <path
-      d="M13.9912 5.42773C13.71 5.42773 13.4639 5.55957 13.1738 5.78809L7.24121 10.5869C7.03027 10.7627 6.89844 11.0264 6.89844 11.3516C6.89844 11.9492 7.38184 12.3887 7.93555 12.3887C8.19043 12.3887 8.44531 12.292 8.7002 12.0898L14 7.81836L19.291 12.0898C19.5371 12.292 19.8008 12.3887 20.0557 12.3887C20.6094 12.3887 21.0928 11.9492 21.0928 11.3516C21.0928 11.0264 20.9609 10.7627 20.75 10.5869L14.8086 5.78809C14.5273 5.55957 14.2812 5.42773 13.9912 5.42773ZM13.9912 21.7139C14.2812 21.7139 14.5273 21.5908 14.8086 21.3623L20.75 16.5635C20.9609 16.3789 21.0928 16.1152 21.0928 15.7988C21.0928 15.1924 20.6094 14.7529 20.0557 14.7529C19.8008 14.7529 19.5371 14.8584 19.291 15.0605L14 19.332L8.7002 15.0605C8.44531 14.8584 8.19043 14.7529 7.93555 14.7529C7.38184 14.7529 6.89844 15.1924 6.89844 15.7988C6.89844 16.1152 7.03027 16.3789 7.24121 16.5635L13.1738 21.3535C13.4639 21.5908 13.71 21.7139 13.9912 21.7139Z"
-      fill={props.fill ?? '#70757A'}
-    />
-  </svg>
-)
diff --git a/apps/web/src/components/Icons/Error.tsx b/apps/web/src/components/Icons/Error.tsx
index bd119985401..7762416814e 100644
--- a/apps/web/src/components/Icons/Error.tsx
+++ b/apps/web/src/components/Icons/Error.tsx
@@ -1,5 +1,5 @@
 import { StyledSVG } from 'components/Icons/shared'
-import { useTheme } from 'lib/styled-components'
+import { useTheme } from 'styled-components'
 
 export default function ErrorIcon({ size = '24px', ...rest }: { size?: string; [k: string]: any }) {
   const theme = useTheme()
diff --git a/apps/web/src/components/Icons/Expand.tsx b/apps/web/src/components/Icons/Expand.tsx
deleted file mode 100644
index ab7b5fe8473..00000000000
--- a/apps/web/src/components/Icons/Expand.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-type SVGProps = React.SVGProps<SVGSVGElement> & {
-  fill?: string
-  height?: string | number
-  width?: string | number
-}
-
-export const ExpandIcon = (props: SVGProps) => (
-  <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
-    <path
-      d="M13.9912 11.9609C14.2812 11.9609 14.5273 11.8379 14.8086 11.6094L20.75 6.81055C20.9609 6.62598 21.0928 6.3623 21.0928 6.0459C21.0928 5.43945 20.6094 5 20.0557 5C19.8008 5 19.5371 5.10547 19.291 5.30762L14 9.5791L8.7002 5.30762C8.44531 5.10547 8.19043 5 7.93555 5C7.38184 5 6.89844 5.43945 6.89844 6.0459C6.89844 6.3623 7.03027 6.62598 7.24121 6.81055L13.1738 11.6006C13.4639 11.8379 13.71 11.9609 13.9912 11.9609Z"
-      fill={props.fill ?? '#70757A'}
-    />
-    <path
-      d="M14.0928 15C13.8115 15 13.5654 15.1318 13.2754 15.3604L7.34277 20.1592C7.13184 20.335 7 20.5986 7 20.9238C7 21.5215 7.4834 21.9609 8.03711 21.9609C8.29199 21.9609 8.54688 21.8643 8.80176 21.6621L14.1016 17.3906L19.3926 21.6621C19.6387 21.8643 19.9023 21.9609 20.1572 21.9609C20.7109 21.9609 21.1943 21.5215 21.1943 20.9238C21.1943 20.5986 21.0625 20.335 20.8516 20.1592L14.9102 15.3604C14.6289 15.1318 14.3828 15 14.0928 15Z"
-      fill={props.fill ?? '#70757A'}
-    />
-  </svg>
-)
diff --git a/apps/web/src/components/Icons/LoadingSpinner.tsx b/apps/web/src/components/Icons/LoadingSpinner.tsx
index 3c21b598728..d19b9b311ea 100644
--- a/apps/web/src/components/Icons/LoadingSpinner.tsx
+++ b/apps/web/src/components/Icons/LoadingSpinner.tsx
@@ -1,5 +1,5 @@
 import { StyledRotatingSVG, StyledSVG } from 'components/Icons/shared'
-import { useTheme } from 'lib/styled-components'
+import { useTheme } from 'styled-components'
 
 /**
  * Takes in custom size and stroke for circle color, default to primary color as fill,
diff --git a/apps/web/src/components/Icons/shared.tsx b/apps/web/src/components/Icons/shared.tsx
index b5cf9062ceb..f8df59bc69c 100644
--- a/apps/web/src/components/Icons/shared.tsx
+++ b/apps/web/src/components/Icons/shared.tsx
@@ -1,4 +1,4 @@
-import styled, { css, keyframes } from 'lib/styled-components'
+import styled, { css, keyframes } from 'styled-components'
 
 const rotateAnimation = keyframes`
   from {
diff --git a/apps/web/src/components/Identicon/ENSAvatarIcon.tsx b/apps/web/src/components/Identicon/ENSAvatarIcon.tsx
index 2485c0b5a3f..0425b0a5369 100644
--- a/apps/web/src/components/Identicon/ENSAvatarIcon.tsx
+++ b/apps/web/src/components/Identicon/ENSAvatarIcon.tsx
@@ -1,6 +1,6 @@
 import useENSAvatar from 'hooks/useENSAvatar'
-import styled from 'lib/styled-components'
 import { useCallback, useState } from 'react'
+import styled from 'styled-components'
 
 const StyledAvatarIcon = styled.div<{ iconSize: number }>`
   height: ${({ iconSize }) => `${iconSize}px`};
diff --git a/apps/web/src/components/Identicon/StatusIcon.tsx b/apps/web/src/components/Identicon/StatusIcon.tsx
index 45612be1ffe..16e47c1d803 100644
--- a/apps/web/src/components/Identicon/StatusIcon.tsx
+++ b/apps/web/src/components/Identicon/StatusIcon.tsx
@@ -4,7 +4,7 @@ import { CONNECTOR_ICON_OVERRIDE_MAP } from 'components/Web3Provider/constants'
 import { navSearchInputVisibleSize } from 'hooks/screenSize/useScreenSize'
 import { useAccount } from 'hooks/useAccount'
 import { useHasSocks } from 'hooks/useSocksBalance'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { flexColumnNoWrap } from 'theme/styles'
 
 export const IconWrapper = styled.div<{ size?: number }>`
diff --git a/apps/web/src/components/Identicon/index.tsx b/apps/web/src/components/Identicon/index.tsx
index d92d22dc3d8..df64c79d001 100644
--- a/apps/web/src/components/Identicon/index.tsx
+++ b/apps/web/src/components/Identicon/index.tsx
@@ -2,7 +2,7 @@ import { LoaderV3 } from 'components/Icons/LoadingSpinner'
 import ENSAvatarIcon from 'components/Identicon/ENSAvatarIcon'
 import { UniTagProfilePicture } from 'components/UniTag/UniTagProfilePicture'
 import useENSAvatar from 'hooks/useENSAvatar'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { fadeInAnimation } from 'theme/components/FadePresence'
 import { Unicon } from 'ui/src'
 import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
diff --git a/apps/web/src/components/InputStepCounter/InputStepCounter.tsx b/apps/web/src/components/InputStepCounter/InputStepCounter.tsx
index 8ab6b7d7253..46222d20388 100644
--- a/apps/web/src/components/InputStepCounter/InputStepCounter.tsx
+++ b/apps/web/src/components/InputStepCounter/InputStepCounter.tsx
@@ -5,9 +5,9 @@ import { OutlineCard } from 'components/Card'
 import { AutoColumn } from 'components/Column'
 import { Input as NumericalInput } from 'components/NumericalInput'
 import { Trans } from 'i18n'
-import styled, { keyframes } from 'lib/styled-components'
 import { ReactNode, useCallback, useEffect, useState } from 'react'
 import { Minus, Plus } from 'react-feather'
+import styled, { keyframes } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Area.tsx b/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
index d9555a99e5d..46667b9034f 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
@@ -1,7 +1,7 @@
 import { ChartEntry } from 'components/LiquidityChartRangeInput/types'
 import { area, curveStepAfter, ScaleLinear } from 'd3'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 
 const Path = styled.path<{ fill?: string }>`
   opacity: 0.5;
diff --git a/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx b/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
index e5bb3c3dc4a..7584d400e7c 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
@@ -1,6 +1,6 @@
 import { NumberValue, ScaleLinear, axisBottom, Axis as d3Axis, select } from 'd3'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 
 const StyledGroup = styled.g`
   line {
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx b/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
index c10475d95ef..a70c425d11e 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
@@ -1,8 +1,8 @@
 import { brushHandleAccentPath, brushHandlePath, OffScreenHandle } from 'components/LiquidityChartRangeInput/svg'
 import { BrushBehavior, brushX, D3BrushEvent, ScaleLinear, select } from 'd3'
 import usePrevious from 'hooks/usePrevious'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import styled from 'styled-components'
 
 const Handle = styled.path<{ color: string }>`
   cursor: ew-resize;
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Line.tsx b/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
index a1c616b5914..3543f412cb7 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
@@ -1,6 +1,6 @@
 import { ScaleLinear } from 'd3'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 
 const StyledLine = styled.line`
   opacity: 0.5;
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx b/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
index 9bde6af2a93..3d70d29a1e5 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
@@ -1,9 +1,9 @@
 import { ButtonGray } from 'components/Button'
 import { ZoomLevels } from 'components/LiquidityChartRangeInput/types'
 import { ScaleLinear, select, zoom, ZoomBehavior, zoomIdentity, ZoomTransform } from 'd3'
-import styled from 'lib/styled-components'
 import { useEffect, useMemo, useRef } from 'react'
 import { RefreshCcw, ZoomIn, ZoomOut } from 'react-feather'
+import styled from 'styled-components'
 
 const Wrapper = styled.div<{ count: number }>`
   display: grid;
diff --git a/apps/web/src/components/LiquidityChartRangeInput/index.tsx b/apps/web/src/components/LiquidityChartRangeInput/index.tsx
index 035fbed8570..6fb0c9fab64 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/index.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/index.tsx
@@ -7,12 +7,12 @@ import { useDensityChartData } from 'components/LiquidityChartRangeInput/hooks'
 import { ZoomLevels } from 'components/LiquidityChartRangeInput/types'
 import { useColor } from 'hooks/useColor'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { saturate } from 'polished'
 import { ReactNode, useCallback, useMemo } from 'react'
 import { BarChart2, CloudOff, Inbox } from 'react-feather'
 import { batch } from 'react-redux'
 import { Bound } from 'state/mint/v3/actions'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/Loader/styled.tsx b/apps/web/src/components/Loader/styled.tsx
index 99e5eccee66..fee899aa4af 100644
--- a/apps/web/src/components/Loader/styled.tsx
+++ b/apps/web/src/components/Loader/styled.tsx
@@ -1,4 +1,4 @@
-import styled, { css, keyframes } from 'lib/styled-components'
+import styled, { css, keyframes } from 'styled-components'
 
 export const loadingAnimation = keyframes`
   0% {
diff --git a/apps/web/src/components/Logo/AssetLogo.tsx b/apps/web/src/components/Logo/AssetLogo.tsx
index a1eb5c8a415..8fda1061dcf 100644
--- a/apps/web/src/components/Logo/AssetLogo.tsx
+++ b/apps/web/src/components/Logo/AssetLogo.tsx
@@ -1,7 +1,7 @@
 import { Currency } from '@uniswap/sdk-core'
 import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
-import styled from 'lib/styled-components'
 import React from 'react'
+import styled from 'styled-components'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 
 export const MissingImageLogo = styled.div<{ $size?: string; $textColor: string; $backgroundColor: string }>`
diff --git a/apps/web/src/components/Logo/NavIcon.tsx b/apps/web/src/components/Logo/NavIcon.tsx
index 6c8bf240a57..61dc9d52b8b 100644
--- a/apps/web/src/components/Logo/NavIcon.tsx
+++ b/apps/web/src/components/Logo/NavIcon.tsx
@@ -1,6 +1,6 @@
 import HolidayUniIcon from 'components/Logo/HolidayUniIcon'
 import { SVGProps } from 'components/Logo/UniIcon'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 function Logo({ onClick }: { onClick?: () => void }) {
   return (
diff --git a/apps/web/src/components/Menu/index.tsx b/apps/web/src/components/Menu/index.tsx
index 7aeba089143..380087a9d3f 100644
--- a/apps/web/src/components/Menu/index.tsx
+++ b/apps/web/src/components/Menu/index.tsx
@@ -1,10 +1,10 @@
 import { ReactComponent as MenuIcon } from 'assets/images/menu.svg'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled, { css } from 'lib/styled-components'
 import { FunctionComponent, PropsWithChildren, useRef } from 'react'
 import { Link } from 'react-router-dom'
 import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { css } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
 export enum FlyoutAlignment {
diff --git a/apps/web/src/components/Modal/GetHelpHeader.tsx b/apps/web/src/components/Modal/GetHelpHeader.tsx
deleted file mode 100644
index e03dbab04de..00000000000
--- a/apps/web/src/components/Modal/GetHelpHeader.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import GetHelpButton from 'components/Button/GetHelp'
-import styled from 'lib/styled-components'
-import { ReactNode } from 'react'
-import { ArrowLeft } from 'react-feather'
-import { ClickableStyle, CloseIcon } from 'theme/components'
-import { Flex } from 'ui/src'
-import { Text } from 'ui/src/components/text/Text'
-import { iconSizes } from 'ui/src/theme'
-
-const BackButton = styled(ArrowLeft)`
-  color: ${({ theme }) => theme.neutral1};
-  ${ClickableStyle};
-`
-
-interface GetHelpHeaderProps {
-  closeModal: () => void
-  link?: string
-  title?: ReactNode
-  goBack?: () => void
-  closeDataTestId?: string
-  className?: string
-}
-
-export function GetHelpHeader({ title, goBack, link, closeModal, closeDataTestId, className }: GetHelpHeaderProps) {
-  return (
-    <Flex row justifyContent="space-between" alignItems="center" gap="$spacing4" width="100%" className={className}>
-      {goBack && <BackButton size={iconSizes.icon24} onClick={goBack} />}
-      {title && (
-        <Flex>
-          <Text variant="body2">{title}</Text>
-        </Flex>
-      )}
-      <Flex row fill justifyContent="flex-end" alignItems="center" gap="10px">
-        <GetHelpButton url={link} />
-        <CloseIcon data-testid={closeDataTestId} onClick={closeModal} />
-      </Flex>
-    </Flex>
-  )
-}
diff --git a/apps/web/src/components/Modal/index.tsx b/apps/web/src/components/Modal/index.tsx
index 589584f9231..cf531338c79 100644
--- a/apps/web/src/components/Modal/index.tsx
+++ b/apps/web/src/components/Modal/index.tsx
@@ -1,9 +1,9 @@
 import { DialogContent, DialogOverlay } from '@reach/dialog'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled from 'lib/styled-components'
 import React, { KeyboardEvent, useCallback, useRef } from 'react'
 import { animated, easings, useSpring, useTransition } from 'react-spring'
 import { useGesture } from 'react-use-gesture'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 import { isMobile } from 'utilities/src/platform'
 
diff --git a/apps/web/src/components/ModalViews/index.tsx b/apps/web/src/components/ModalViews/index.tsx
index 1778a07ceb7..1ad98a2832d 100644
--- a/apps/web/src/components/ModalViews/index.tsx
+++ b/apps/web/src/components/ModalViews/index.tsx
@@ -3,8 +3,8 @@ import { AutoColumn, ColumnCenter } from 'components/Column'
 import { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ArrowUpCircle } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { CloseIcon, CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
diff --git a/apps/web/src/components/NavBar/Bag.tsx b/apps/web/src/components/NavBar/Bag.tsx
index 7a616d332ea..6e02209a85f 100644
--- a/apps/web/src/components/NavBar/Bag.tsx
+++ b/apps/web/src/components/NavBar/Bag.tsx
@@ -1,9 +1,9 @@
 import { NavIcon } from 'components/NavBar/NavIcon'
 import { useIsNftProfilePage } from 'hooks/useIsNftPage'
-import styled from 'lib/styled-components'
 import { BagIcon, HundredsOverflowIcon, TagIcon } from 'nft/components/icons'
 import { useBag, useSellAsset } from 'nft/hooks'
 import { useCallback } from 'react'
+import styled from 'styled-components'
 
 const CounterDot = styled.div`
   background-color: ${({ theme }) => theme.accent1};
diff --git a/apps/web/src/components/NavBar/ChainSelector/ChainSelectorRow.tsx b/apps/web/src/components/NavBar/ChainSelector/ChainSelectorRow.tsx
index cc54add5f0b..0686f1da3e0 100644
--- a/apps/web/src/components/NavBar/ChainSelector/ChainSelectorRow.tsx
+++ b/apps/web/src/components/NavBar/ChainSelector/ChainSelectorRow.tsx
@@ -2,9 +2,9 @@ import Loader from 'components/Icons/LoadingSpinner'
 import { ChainLogo } from 'components/Logo/ChainLogo'
 import { getChain, useSupportedChainId } from 'constants/chains'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Check } from 'react-feather'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled, { useTheme } from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { SectionName } from 'uniswap/src/features/telemetry/constants'
 import { InterfaceChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/NavBar/ChainSelector/index.tsx b/apps/web/src/components/NavBar/ChainSelector/index.tsx
index c86376516b9..93528bf06cf 100644
--- a/apps/web/src/components/NavBar/ChainSelector/index.tsx
+++ b/apps/web/src/components/NavBar/ChainSelector/index.tsx
@@ -6,8 +6,9 @@ import ChainSelectorRow from 'components/NavBar/ChainSelector/ChainSelectorRow'
 import { NavDropdown } from 'components/NavBar/NavDropdown/NavDropdown'
 import { CONNECTION } from 'components/Web3Provider/constants'
 import {
-  ALL_CHAIN_IDS,
   CHAIN_IDS_TO_NAMES,
+  L1_CHAIN_IDS,
+  L2_CHAIN_IDS,
   TESTNET_CHAIN_IDS,
   getChainPriority,
   useIsSupportedChainIdCallback,
@@ -16,11 +17,11 @@ import { useAccount } from 'hooks/useAccount'
 import useSelectChain from 'hooks/useSelectChain'
 import { t } from 'i18n'
 import { useAtomValue } from 'jotai/utils'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { useCallback, useMemo, useRef, useState } from 'react'
 import { AlertTriangle } from 'react-feather'
 import { useSearchParams } from 'react-router-dom'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled, { css, useTheme } from 'styled-components'
 import { Flex, Popover } from 'ui/src'
 import { NetworkFilter } from 'uniswap/src/components/network/NetworkFilter'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
@@ -28,6 +29,8 @@ import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { InterfaceChainId, UniverseChainId } from 'uniswap/src/types/chains'
 import { Connector } from 'wagmi'
 
+const NETWORK_SELECTOR_CHAINS = [...L1_CHAIN_IDS, ...L2_CHAIN_IDS]
+
 const StyledDropdownButton = css`
   display: flex;
   flex-direction: row;
@@ -68,9 +71,9 @@ function useWalletSupportedChains(): InterfaceChainId[] {
       // Wagmi currently offers no way to discriminate a Connector as a WalletConnect connector providing access to getNamespaceChainsIds.
       return (connector as WalletConnectConnector).getNamespaceChainsIds?.().length
         ? (connector as WalletConnectConnector).getNamespaceChainsIds?.()
-        : ALL_CHAIN_IDS
+        : NETWORK_SELECTOR_CHAINS
     default:
-      return ALL_CHAIN_IDS
+      return NETWORK_SELECTOR_CHAINS
   }
 }
 
@@ -91,7 +94,7 @@ export const ChainSelector = ({ leftAlign }: { leftAlign?: boolean }) => {
   const [searchParams, setSearchParams] = useSearchParams()
 
   const [supportedChains, unsupportedChains] = useMemo(() => {
-    const { supported, unsupported } = ALL_CHAIN_IDS.filter((chain: number) => {
+    const { supported, unsupported } = NETWORK_SELECTOR_CHAINS.filter((chain: number) => {
       return isSupportedChain(chain) && (showTestnets || !TESTNET_CHAIN_IDS.includes(chain))
     })
       .sort((a, b) => getChainPriority(a) - getChainPriority(b))
diff --git a/apps/web/src/components/NavBar/CompanyMenu/DownloadAppCTA.tsx b/apps/web/src/components/NavBar/CompanyMenu/DownloadAppCTA.tsx
index 3030475bc03..286cfc882ac 100644
--- a/apps/web/src/components/NavBar/CompanyMenu/DownloadAppCTA.tsx
+++ b/apps/web/src/components/NavBar/CompanyMenu/DownloadAppCTA.tsx
@@ -5,10 +5,10 @@ import { MobileAppLogo } from 'components/Icons/MobileAppLogo'
 import { NAV_BREAKPOINT, useIsMobileDrawer } from 'components/NavBar/ScreenSizes'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { Text } from 'rebass'
 import { useOpenModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { css } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { isWebAndroid, isWebIOS } from 'utilities/src/platform'
 import { APP_DOWNLOAD_LINKS, openDownloadApp } from 'utils/openDownloadApp'
diff --git a/apps/web/src/components/NavBar/CompanyMenu/MenuDropdown.tsx b/apps/web/src/components/NavBar/CompanyMenu/MenuDropdown.tsx
index 734a612d75c..61422661853 100644
--- a/apps/web/src/components/NavBar/CompanyMenu/MenuDropdown.tsx
+++ b/apps/web/src/components/NavBar/CompanyMenu/MenuDropdown.tsx
@@ -5,10 +5,10 @@ import { NavDropdown } from 'components/NavBar/NavDropdown'
 import { useTabsVisible } from 'components/NavBar/ScreenSizes'
 import { useTabsContent } from 'components/NavBar/Tabs/TabsContent'
 import { t } from 'i18next'
-import styled, { css } from 'lib/styled-components'
 import { Socials } from 'pages/Landing/sections/Footer'
 import { useMemo } from 'react'
 import { Link } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { ExternalLink, Separator, ThemedText } from 'theme/components'
 
 const Container = styled.div`
diff --git a/apps/web/src/components/NavBar/CompanyMenu/MobileMenuDrawer.tsx b/apps/web/src/components/NavBar/CompanyMenu/MobileMenuDrawer.tsx
index a0ed6ca7f34..2884875f850 100644
--- a/apps/web/src/components/NavBar/CompanyMenu/MobileMenuDrawer.tsx
+++ b/apps/web/src/components/NavBar/CompanyMenu/MobileMenuDrawer.tsx
@@ -10,11 +10,11 @@ import { LanguageSettings } from 'components/NavBar/PreferencesMenu/Language'
 import { PreferenceSettings } from 'components/NavBar/PreferencesMenu/Preferences'
 import { PreferencesView } from 'components/NavBar/PreferencesMenu/shared'
 import { useTabsContent } from 'components/NavBar/Tabs/TabsContent'
-import styled, { useTheme } from 'lib/styled-components'
 import { Socials } from 'pages/Landing/sections/Footer'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { ChevronDown } from 'react-feather'
 import { useTranslation } from 'react-i18next'
+import styled, { useTheme } from 'styled-components'
 import { Accordion, Square, Text } from 'ui/src'
 
 const StyledMenuLink = styled(MenuLink)`
diff --git a/apps/web/src/components/NavBar/CompanyMenu/index.tsx b/apps/web/src/components/NavBar/CompanyMenu/index.tsx
index f903940fc18..e31523d0fb1 100644
--- a/apps/web/src/components/NavBar/CompanyMenu/index.tsx
+++ b/apps/web/src/components/NavBar/CompanyMenu/index.tsx
@@ -5,9 +5,9 @@ import { MenuDropdown } from 'components/NavBar/CompanyMenu/MenuDropdown'
 import { MobileMenuDrawer } from 'components/NavBar/CompanyMenu/MobileMenuDrawer'
 import { useIsMobileDrawer } from 'components/NavBar/ScreenSizes'
 import { useScreenSize } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { Popover, Text } from 'ui/src'
 import { Hamburger } from 'ui/src/components/icons'
 
diff --git a/apps/web/src/components/NavBar/DownloadApp/GetTheAppButton.tsx b/apps/web/src/components/NavBar/DownloadApp/GetTheAppButton.tsx
index cb3f6cd68eb..c1b93fae4fe 100644
--- a/apps/web/src/components/NavBar/DownloadApp/GetTheAppButton.tsx
+++ b/apps/web/src/components/NavBar/DownloadApp/GetTheAppButton.tsx
@@ -2,10 +2,10 @@ import { AppleLogo } from 'components/Icons/AppleLogo'
 import { GooglePlayStoreLogo } from 'components/Icons/GooglePlayStoreLogo'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Wiggle } from 'pages/Landing/components/animations'
 import { useOpenModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { useTheme } from 'styled-components'
 import { Text } from 'ui/src'
 
 const StyledButton = styled.button`
diff --git a/apps/web/src/components/NavBar/DownloadApp/Modal/Content.tsx b/apps/web/src/components/NavBar/DownloadApp/Modal/Content.tsx
index 475a38b9596..160792b3fb8 100644
--- a/apps/web/src/components/NavBar/DownloadApp/Modal/Content.tsx
+++ b/apps/web/src/components/NavBar/DownloadApp/Modal/Content.tsx
@@ -1,15 +1,13 @@
 import { ColumnCenter } from 'components/Column'
+import { MobileAppLogo } from 'components/Icons/MobileAppLogo'
 import { PropsWithChildren } from 'react'
 import { ThemedText } from 'theme/components'
-import { Image } from 'ui/src'
-import { UNISWAP_LOGO } from 'ui/src/assets'
-import { iconSizes } from 'ui/src/theme'
 
 export function ModalContent({ title, subtext, children }: PropsWithChildren<{ title: string; subtext: string }>) {
   return (
     <ColumnCenter gap="xl">
       <ColumnCenter gap="md">
-        <Image height={iconSizes.icon64} source={UNISWAP_LOGO} width={iconSizes.icon64} />
+        <MobileAppLogo width={64} height={64} />
         <ColumnCenter gap="sm">
           <ThemedText.H1Medium textAlign="center">{title}</ThemedText.H1Medium>
           <ThemedText.BodySecondary textAlign="center" maxWidth="400px">
diff --git a/apps/web/src/components/NavBar/DownloadApp/Modal/GetStarted.tsx b/apps/web/src/components/NavBar/DownloadApp/Modal/GetStarted.tsx
index 9003d5d07fa..4ef5bdb6f57 100644
--- a/apps/web/src/components/NavBar/DownloadApp/Modal/GetStarted.tsx
+++ b/apps/web/src/components/NavBar/DownloadApp/Modal/GetStarted.tsx
@@ -1,19 +1,18 @@
-import { InterfaceElementName } from '@uniswap/analytics-events'
-import ExtensionIllustration from 'assets/images/extensionIllustration.png'
-import WalletIllustration from 'assets/images/walletIllustration.png'
+import ExtensionIllustration from 'assets/images/extensionIllustration.jpg'
+import WalletIllustration from 'assets/images/walletIllustration.jpg'
 import Column from 'components/Column'
 import { AppleLogo } from 'components/Icons/AppleLogo'
+import { BraveBrowserLogo } from 'components/Icons/BraveBrowserLogo'
 import { GoogleChromeLogo } from 'components/Icons/GoogleChromeLogo'
 import { GooglePlayStoreLogo } from 'components/Icons/GooglePlayStoreLogo'
 import { WiggleIcon } from 'components/NavBar/DownloadApp/GetTheAppButton'
 import { ModalContent } from 'components/NavBar/DownloadApp/Modal/Content'
 import Row from 'components/Row'
-import styled, { useTheme } from 'lib/styled-components'
 import { PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
+import styled, { useTheme } from 'styled-components'
 import { Text } from 'ui/src'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
-import Trace from 'uniswap/src/features/telemetry/Trace'
 
 const IllustrationContainer = styled.div`
   display: flex;
@@ -64,7 +63,7 @@ export function GetStarted({ toAppDownload }: { toAppDownload: () => void }) {
           <IllustrationContainer>
             <Illustration src={WalletIllustration} alt="Wallet example page" />
           </IllustrationContainer>
-          <CardInfo title={t('common.uniswapMobile')} details={t('common.iOSAndroid')}>
+          <CardInfo title={t('common.mobileWallet')} details={t('common.iOSAndroid')}>
             <Row gap="8px" width="auto">
               <WiggleIcon>
                 <AppleLogo fill={theme.neutral1} />
@@ -75,20 +74,21 @@ export function GetStarted({ toAppDownload }: { toAppDownload: () => void }) {
             </Row>
           </CardInfo>
         </Card>
-        <Trace logPress element={InterfaceElementName.EXTENSION_DOWNLOAD_BUTTON}>
-          <Card onClick={() => window.open(uniswapUrls.chromeExtension)}>
-            <IllustrationContainer>
-              <Illustration src={ExtensionIllustration} alt="Extension example page" />
-            </IllustrationContainer>
-            <CardInfo title={t('common.chromeExtension')} details={t('common.googleChrome')}>
-              <Row gap="8px" width="auto">
-                <WiggleIcon>
-                  <GoogleChromeLogo width="16px" height="16px" />
-                </WiggleIcon>
-              </Row>
-            </CardInfo>
-          </Card>
-        </Trace>
+        <Card onClick={() => window.open(uniswapUrls.chromeExtension)}>
+          <IllustrationContainer>
+            <Illustration src={ExtensionIllustration} alt="Extension example page" />
+          </IllustrationContainer>
+          <CardInfo title={t('common.chromeExtension')} details={t('common.googleChrome')}>
+            <Row gap="8px" width="auto">
+              <WiggleIcon>
+                <BraveBrowserLogo width="16px" height="16px" />
+              </WiggleIcon>
+              <WiggleIcon>
+                <GoogleChromeLogo width="16px" height="16px" />
+              </WiggleIcon>
+            </Row>
+          </CardInfo>
+        </Card>
       </Row>
     </ModalContent>
   )
diff --git a/apps/web/src/components/NavBar/DownloadApp/Modal/GetTheApp.tsx b/apps/web/src/components/NavBar/DownloadApp/Modal/GetTheApp.tsx
index 5fd2d0f33e3..d500a7712a6 100644
--- a/apps/web/src/components/NavBar/DownloadApp/Modal/GetTheApp.tsx
+++ b/apps/web/src/components/NavBar/DownloadApp/Modal/GetTheApp.tsx
@@ -3,8 +3,8 @@ import { ReactComponent as PlayStoreBadge } from 'assets/svg/play-store-badge.sv
 import { ModalContent } from 'components/NavBar/DownloadApp/Modal/Content'
 import Row from 'components/Row'
 import { WalletOneLinkQR } from 'components/WalletOneLinkQR'
-import styled from 'lib/styled-components'
 import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
 const BadgeLink = styled(ExternalLink)`
diff --git a/apps/web/src/components/NavBar/DownloadApp/Modal/index.tsx b/apps/web/src/components/NavBar/DownloadApp/Modal/index.tsx
index 40865279929..f184d07bd22 100644
--- a/apps/web/src/components/NavBar/DownloadApp/Modal/index.tsx
+++ b/apps/web/src/components/NavBar/DownloadApp/Modal/index.tsx
@@ -1,39 +1,54 @@
-import { InterfaceModalName } from '@uniswap/analytics-events'
 import { AnimatedSlider } from 'components/AnimatedSlider'
 import Modal from 'components/Modal'
 import { GetStarted } from 'components/NavBar/DownloadApp/Modal/GetStarted'
 import { GetTheApp } from 'components/NavBar/DownloadApp/Modal/GetTheApp'
 import Row from 'components/Row'
-import styled, { css } from 'lib/styled-components'
 import { useCallback, useState } from 'react'
 import { ArrowLeft, X } from 'react-feather'
 import { useCloseModal, useModalIsOpen } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
-import { ClickableStyle } from 'theme/components'
-import { iconSizes } from 'ui/src/theme'
+import styled from 'styled-components'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-import Trace from 'uniswap/src/features/telemetry/Trace'
 
 const StyledModal = styled(Modal)`
   display: block;
 `
 const Wrapper = styled.div`
   position: relative;
-  padding: 24px;
+  padding: 32px;
   width: 100%;
   user-select: none;
 `
-const HeaderActionIcon = css`
-  margin: 4px;
-  color: ${({ theme }) => theme.neutral1};
-  ${ClickableStyle};
+const CloseIcon = styled(X)`
+  width: 25px;
+  height: 25px;
+  stroke: ${({ theme }) => theme.neutral2};
 `
-const CloseButton = styled(X)`
-  ${HeaderActionIcon}
+const CloseButton = styled.div`
+  width: 32px;
+  height: 32px;
+  padding: 4px;
+  cursor: pointer;
+  :hover {
+    ${CloseIcon} {
+      stroke: ${({ theme }) => theme.neutral1};
+    }
+  }
 `
-const BackButton = styled(ArrowLeft)`
-  ${HeaderActionIcon}
+const BackIcon = styled(ArrowLeft)`
+  stroke: ${({ theme }) => theme.neutral2};
+`
+const BackButton = styled.div`
+  width: 32px;
+  height: 32px;
+  padding: 4px;
+  cursor: pointer;
+  :hover {
+    ${BackIcon} {
+      stroke: ${({ theme }) => theme.neutral1};
+    }
+  }
 `
 
 enum Page {
@@ -53,26 +68,30 @@ export function GetTheAppModal() {
   const showBackButton = !isLegacyNav && page !== Page.GetStarted
 
   return (
-    <Trace modal={InterfaceModalName.GETTING_STARTED_MODAL}>
-      <StyledModal isOpen={isOpen} maxWidth={620} slideIn onDismiss={closeModal}>
-        <Wrapper>
-          <Row justify={showBackButton ? 'space-between' : 'end'}>
-            {showBackButton && <BackButton onClick={() => setPage(Page.GetStarted)} size={iconSizes.icon24} />}
-            <CloseButton onClick={close} size={iconSizes.icon24} data-testid="get-the-app-close-button" />
-          </Row>
-          {isLegacyNav ? (
-            <GetTheApp />
-          ) : (
-            <AnimatedSlider
-              currentIndex={page === Page.GetStarted ? 0 : 1}
-              slideDirection={page === Page.GetStarted ? 'forward' : 'backward'}
-            >
-              <GetStarted toAppDownload={() => setPage(Page.GetApp)} />
-              <GetTheApp />
-            </AnimatedSlider>
+    <StyledModal isOpen={isOpen} maxWidth={620} slideIn onDismiss={closeModal}>
+      <Wrapper>
+        <Row justify={showBackButton ? 'space-between' : 'end'}>
+          {showBackButton && (
+            <BackButton onClick={() => setPage(Page.GetStarted)}>
+              <BackIcon />
+            </BackButton>
           )}
-        </Wrapper>
-      </StyledModal>
-    </Trace>
+          <CloseButton onClick={close} data-testid="get-the-app-close-button">
+            <CloseIcon />
+          </CloseButton>
+        </Row>
+        {isLegacyNav ? (
+          <GetTheApp />
+        ) : (
+          <AnimatedSlider
+            currentIndex={page === Page.GetStarted ? 0 : 1}
+            slideDirection={page === Page.GetStarted ? 'forward' : 'backward'}
+          >
+            <GetStarted toAppDownload={() => setPage(Page.GetApp)} />
+            <GetTheApp />
+          </AnimatedSlider>
+        )}
+      </Wrapper>
+    </StyledModal>
   )
 }
diff --git a/apps/web/src/components/NavBar/LEGACY/Blur.tsx b/apps/web/src/components/NavBar/LEGACY/Blur.tsx
index 214f7c5de6d..dce0452a777 100644
--- a/apps/web/src/components/NavBar/LEGACY/Blur.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/Blur.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 const MAX_STRENGTH = 5
 const BLUR_STEPS = 20
diff --git a/apps/web/src/components/NavBar/LEGACY/Menu.tsx b/apps/web/src/components/NavBar/LEGACY/Menu.tsx
index d69a0c0b24e..d71b440dae4 100644
--- a/apps/web/src/components/NavBar/LEGACY/Menu.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/Menu.tsx
@@ -1,10 +1,10 @@
 import { ColumnCenter } from 'components/Column'
 import { MenuContent } from 'components/NavBar/LEGACY/MenuContent'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled from 'lib/styled-components'
 import { vars } from 'nft/css/sprinkles.css'
 import { useRef, useState } from 'react'
 import { ChevronDown } from 'react-feather'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 
 const Wrapper = styled.div`
diff --git a/apps/web/src/components/NavBar/LEGACY/MenuContent.tsx b/apps/web/src/components/NavBar/LEGACY/MenuContent.tsx
index 77df1b7accb..4a56e3f2162 100644
--- a/apps/web/src/components/NavBar/LEGACY/MenuContent.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/MenuContent.tsx
@@ -4,12 +4,12 @@ import { MobileAppLogo } from 'components/Icons/MobileAppLogo'
 import { MenuItem, MenuSection, useMenuContent } from 'components/NavBar/CompanyMenu/Content'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { Socials } from 'pages/Landing/sections/Footer'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import { useOpenModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { css } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ExternalLink, ThemedText } from 'theme/components'
 
diff --git a/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBar.tsx b/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBar.tsx
index 508b84ef76f..6bd28cea433 100644
--- a/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBar.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBar.tsx
@@ -14,7 +14,6 @@ import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { useTranslation } from 'i18n/useTranslation'
-import styled from 'lib/styled-components'
 import { organizeSearchResults } from 'lib/utils/searchBar'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
@@ -23,6 +22,7 @@ import { magicalGradientOnHover } from 'nft/css/common.css'
 import { useIsNavSearchInputVisible } from 'nft/hooks/useIsNavSearchInputVisible'
 import { ChangeEvent, useCallback, useEffect, useReducer, useRef, useState } from 'react'
 import { useLocation } from 'react-router-dom'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
diff --git a/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBarDropdown.tsx b/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBarDropdown.tsx
index e768bc42423..dfb78621702 100644
--- a/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBarDropdown.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/SearchBar/SearchBarDropdown.tsx
@@ -15,7 +15,6 @@ import { useAccount } from 'hooks/useAccount'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import { ClockIcon, TrendingArrow } from 'nft/components/icons'
@@ -23,6 +22,7 @@ import { subheadSmall } from 'nft/css/common.css'
 import { GenieCollection } from 'nft/types'
 import { useEffect, useMemo, useState } from 'react'
 import { useLocation } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { HistoryDuration, SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { InterfaceSearchResultSelectionProperties } from 'uniswap/src/features/telemetry/types'
diff --git a/apps/web/src/components/NavBar/LEGACY/SearchBar/SuggestionRow.tsx b/apps/web/src/components/NavBar/LEGACY/SearchBar/SuggestionRow.tsx
index f7fa4890eec..89837cc055b 100644
--- a/apps/web/src/components/NavBar/LEGACY/SearchBar/SuggestionRow.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/SearchBar/SuggestionRow.tsx
@@ -11,11 +11,11 @@ import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { SearchToken } from 'graphql/data/SearchTokens'
 import { getTokenDetailsURL, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { VerifiedIcon } from 'nft/components/icons'
 import { GenieCollection } from 'nft/types'
 import { useCallback, useEffect, useState } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { Chain, TokenStandard } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/components/NavBar/LEGACY/index.tsx b/apps/web/src/components/NavBar/LEGACY/index.tsx
index 83c56f2d009..0e947837372 100644
--- a/apps/web/src/components/NavBar/LEGACY/index.tsx
+++ b/apps/web/src/components/NavBar/LEGACY/index.tsx
@@ -18,7 +18,6 @@ import { useIsPoolsPage } from 'hooks/useIsPoolsPage'
 import { useIsSendPage } from 'hooks/useIsSendPage'
 import { useIsSwapPage } from 'hooks/useIsSwapPage'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Row } from 'nft/components/Flex'
 import { useProfilePageState } from 'nft/hooks'
@@ -26,6 +25,7 @@ import { useIsNavSearchInputVisible } from 'nft/hooks/useIsNavSearchInputVisible
 import { ProfilePageStateType } from 'nft/types'
 import { ReactNode, useCallback } from 'react'
 import { NavLink, NavLinkProps, useLocation, useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
diff --git a/apps/web/src/components/NavBar/MobileBottomBar/MobileBottomBar.tsx b/apps/web/src/components/NavBar/MobileBottomBar/MobileBottomBar.tsx
index 16ed9411bd0..12b49d4cb6a 100644
--- a/apps/web/src/components/NavBar/MobileBottomBar/MobileBottomBar.tsx
+++ b/apps/web/src/components/NavBar/MobileBottomBar/MobileBottomBar.tsx
@@ -1,5 +1,5 @@
 import { NAV_BREAKPOINT } from 'components/NavBar/ScreenSizes'
-import styled, { css } from 'lib/styled-components'
+import styled, { css } from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 const MOBILE_BAR_MAX_HEIGHT = 100 // ensure that it's translated out of view on scroll
@@ -12,7 +12,7 @@ const MobileBottomBarBase = css`
   right: 0;
   left: 0;
   justify-content: space-between;
-  gap: 8px;
+
   @media screen and (min-width: ${NAV_BREAKPOINT.showMobileBar}px) {
     display: none;
   }
diff --git a/apps/web/src/components/NavBar/MobileBottomBar/TDPActionTabs.tsx b/apps/web/src/components/NavBar/MobileBottomBar/TDPActionTabs.tsx
index 01f431489e6..8048d466e71 100644
--- a/apps/web/src/components/NavBar/MobileBottomBar/TDPActionTabs.tsx
+++ b/apps/web/src/components/NavBar/MobileBottomBar/TDPActionTabs.tsx
@@ -6,34 +6,27 @@ import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { useAccount } from 'hooks/useAccount'
 import { useSwitchChain } from 'hooks/useSwitchChain'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ClickableStyle } from 'theme/components'
 
 const TDPActionPill = styled.button<{ $color?: string }>`
   display: flex;
   align-items: center;
-  justify-content: center;
-  text-align: center;
-  gap: 8px;
+  gap: 4px;
   border: none;
   border-radius: 50px;
   transition: color 0.2s;
   background-color: ${({ $color, theme }) => $color || theme.neutral2};
   color: ${({ theme }) => theme.neutralContrast};
-  padding: 12px 20px 12px 16px;
+  padding: 12px 20px;
   font-size: 18px;
   font-weight: 535;
-  flex-grow: 1;
   ${ClickableStyle}
-
-  @media (max-width: 360px) {
-    padding-left: 20px;
-    > svg {
-      display: none;
-    }
+  > svg {
+    stroke: transparent;
   }
 `
 
@@ -79,7 +72,7 @@ export function TDPActionTabs() {
     },
   ]
   return (
-    <Row justify="center" gap="8px">
+    <Row justify="space-between">
       {tabs.map((tab) => (
         <TDPActionPill key={tab.label} onClick={() => toActionLink(tab.href)} $color={tokenColor}>
           {tab.icon}
diff --git a/apps/web/src/components/NavBar/NavBar.tsx b/apps/web/src/components/NavBar/NavBar.tsx
index 4c9771f139d..bd200182597 100644
--- a/apps/web/src/components/NavBar/NavBar.tsx
+++ b/apps/web/src/components/NavBar/NavBar.tsx
@@ -15,9 +15,9 @@ import { useIsLimitPage } from 'hooks/useIsLimitPage'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { useIsSendPage } from 'hooks/useIsSendPage'
 import { useIsSwapPage } from 'hooks/useIsSwapPage'
-import styled, { css } from 'lib/styled-components'
 import { useProfilePageState } from 'nft/hooks'
 import { ProfilePageStateType } from 'nft/types'
+import styled, { css } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { Z_INDEX } from 'theme/zIndex'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
@@ -33,6 +33,7 @@ const Nav = styled.nav`
   justify-content: center;
 `
 const NavContents = styled.div`
+  max-width: ${({ theme }) => `${theme.breakpoint.xxxl}px`};
   width: 100%;
   display: flex;
   flex-direction: row;
diff --git a/apps/web/src/components/NavBar/NavDropdown/NavDropdown.tsx b/apps/web/src/components/NavBar/NavDropdown/NavDropdown.tsx
index 5f0836fbf41..4a5e2d34035 100644
--- a/apps/web/src/components/NavBar/NavDropdown/NavDropdown.tsx
+++ b/apps/web/src/components/NavBar/NavDropdown/NavDropdown.tsx
@@ -2,8 +2,8 @@ import { RemoveScroll } from '@tamagui/remove-scroll'
 import { ScrollBarStyles } from 'components/Common'
 import { NAV_BREAKPOINT, useIsMobileDrawer } from 'components/NavBar/ScreenSizes'
 import Row from 'components/Row'
-import styled from 'lib/styled-components'
 import { ReactNode, RefObject } from 'react'
+import styled from 'styled-components'
 import { Popover } from 'ui/src'
 
 const NavDropdownContent = styled.div<{ $width?: number }>`
diff --git a/apps/web/src/components/NavBar/NavDropdown/shared.tsx b/apps/web/src/components/NavBar/NavDropdown/shared.tsx
index 86a37895d4e..b5211b3cccf 100644
--- a/apps/web/src/components/NavBar/NavDropdown/shared.tsx
+++ b/apps/web/src/components/NavBar/NavDropdown/shared.tsx
@@ -1,6 +1,6 @@
 import Column from 'components/Column'
 import { NAV_BREAKPOINT } from 'components/NavBar/ScreenSizes'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const NavDropdownDefaultWrapper = styled(Column)`
   width: 100%;
diff --git a/apps/web/src/components/NavBar/NavIcon.tsx b/apps/web/src/components/NavBar/NavIcon.tsx
index 853d786c016..15c92e219e2 100644
--- a/apps/web/src/components/NavBar/NavIcon.tsx
+++ b/apps/web/src/components/NavBar/NavIcon.tsx
@@ -1,6 +1,6 @@
 import { t } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { ReactNode } from 'react'
+import styled, { css } from 'styled-components'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 
diff --git a/apps/web/src/components/NavBar/PreferencesMenu/Header.tsx b/apps/web/src/components/NavBar/PreferencesMenu/Header.tsx
index d62dc6b234d..692f4e52752 100644
--- a/apps/web/src/components/NavBar/PreferencesMenu/Header.tsx
+++ b/apps/web/src/components/NavBar/PreferencesMenu/Header.tsx
@@ -1,6 +1,6 @@
-import styled, { css } from 'lib/styled-components'
 import { ReactNode, useCallback } from 'react'
 import { ChevronLeft } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { Text } from 'ui/src'
 
 const StyledChevron = styled(ChevronLeft)`
diff --git a/apps/web/src/components/NavBar/PreferencesMenu/Preferences.tsx b/apps/web/src/components/NavBar/PreferencesMenu/Preferences.tsx
index b8a8573c36e..175d929830c 100644
--- a/apps/web/src/components/NavBar/PreferencesMenu/Preferences.tsx
+++ b/apps/web/src/components/NavBar/PreferencesMenu/Preferences.tsx
@@ -4,8 +4,8 @@ import { LOCALE_LABEL } from 'constants/locales'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { useActiveLocale } from 'hooks/useActiveLocale'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ChevronRight } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ThemeSelector } from 'theme/components/ThemeToggle'
 import { Text } from 'ui/src'
 
diff --git a/apps/web/src/components/NavBar/PreferencesMenu/shared.tsx b/apps/web/src/components/NavBar/PreferencesMenu/shared.tsx
index 14df50ec4f7..44d4017c73a 100644
--- a/apps/web/src/components/NavBar/PreferencesMenu/shared.tsx
+++ b/apps/web/src/components/NavBar/PreferencesMenu/shared.tsx
@@ -1,5 +1,5 @@
 import Column from 'components/Column'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export enum PreferencesView {
   SETTINGS = 'Settings',
diff --git a/apps/web/src/components/NavBar/ScreenSizes.tsx b/apps/web/src/components/NavBar/ScreenSizes.tsx
index d39ecca937f..3dacd5e8406 100644
--- a/apps/web/src/components/NavBar/ScreenSizes.tsx
+++ b/apps/web/src/components/NavBar/ScreenSizes.tsx
@@ -4,7 +4,7 @@ import { BREAKPOINTS } from 'theme'
 export const NAV_BREAKPOINT = {
   isMobileDrawer: 450,
   areTabsVisible: BREAKPOINTS.sm,
-  showMobileBar: BREAKPOINTS.lg + 1,
+  showMobileBar: BREAKPOINTS.md,
   collapseSearchBar: BREAKPOINTS.md,
 }
 
diff --git a/apps/web/src/components/NavBar/SearchBar/SearchBarDropdown.tsx b/apps/web/src/components/NavBar/SearchBar/SearchBarDropdown.tsx
index 3d1fa3e87cf..b8e67220cee 100644
--- a/apps/web/src/components/NavBar/SearchBar/SearchBarDropdown.tsx
+++ b/apps/web/src/components/NavBar/SearchBar/SearchBarDropdown.tsx
@@ -15,11 +15,11 @@ import { useAccount } from 'hooks/useAccount'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { GenieCollection } from 'nft/types'
 import { useEffect, useMemo, useState } from 'react'
 import { Clock, TrendingUp } from 'react-feather'
 import { useLocation } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { HistoryDuration, SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { InterfaceSearchResultSelectionProperties } from 'uniswap/src/features/telemetry/types'
diff --git a/apps/web/src/components/NavBar/SearchBar/SuggestionRow.tsx b/apps/web/src/components/NavBar/SearchBar/SuggestionRow.tsx
index 50bff51c4aa..1405d5a9870 100644
--- a/apps/web/src/components/NavBar/SearchBar/SuggestionRow.tsx
+++ b/apps/web/src/components/NavBar/SearchBar/SuggestionRow.tsx
@@ -11,10 +11,10 @@ import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { SearchToken } from 'graphql/data/SearchTokens'
 import { getTokenDetailsURL, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { GenieCollection } from 'nft/types'
 import { useCallback, useEffect, useState } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { Verified } from 'ui/src/components/icons'
 import { Chain, TokenStandard } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/NavBar/SearchBar/index.tsx b/apps/web/src/components/NavBar/SearchBar/index.tsx
index e7531f4a26a..b5c63a9cacd 100644
--- a/apps/web/src/components/NavBar/SearchBar/index.tsx
+++ b/apps/web/src/components/NavBar/SearchBar/index.tsx
@@ -14,11 +14,11 @@ import { useIsNftPage } from 'hooks/useIsNftPage'
 import { KeyAction, useKeyPress } from 'hooks/useKeyPress'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { useTranslation } from 'i18n/useTranslation'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { organizeSearchResults } from 'lib/utils/searchBar'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { Search, X } from 'react-feather'
 import { useLocation } from 'react-router-dom'
+import styled, { css, useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { Z_INDEX } from 'theme/zIndex'
 import { Input } from 'ui/src'
diff --git a/apps/web/src/components/NavBar/Tabs/QuickKey.test.tsx b/apps/web/src/components/NavBar/Tabs/QuickKey.test.tsx
deleted file mode 100644
index b84c47df354..00000000000
--- a/apps/web/src/components/NavBar/Tabs/QuickKey.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import sourceTranslations from 'i18n/locales/source/en-US.json'
-
-describe('navigation quick keys', () => {
-  const keys = Object.keys(sourceTranslations).filter((key) => key.startsWith('quickKey'))
-
-  it('should be one character in length', () => {
-    keys.forEach((key) => {
-      const translation = (sourceTranslations as { [key: string]: string })[key]
-      expect(translation).toBeTruthy()
-      expect(translation.length).toEqual(1)
-    })
-  })
-
-  it('should all be unique', () => {
-    const hotKeyValues = keys.map((key) => (sourceTranslations as { [key: string]: string })[key])
-    const hasDuplicateKeys = hotKeyValues.some((item, index) => hotKeyValues.includes(item, index + 1))
-    expect(hasDuplicateKeys).toEqual(false)
-  })
-})
diff --git a/apps/web/src/components/NavBar/Tabs/Tabs.tsx b/apps/web/src/components/NavBar/Tabs/Tabs.tsx
index 36320904875..2122f3437bf 100644
--- a/apps/web/src/components/NavBar/Tabs/Tabs.tsx
+++ b/apps/web/src/components/NavBar/Tabs/Tabs.tsx
@@ -1,9 +1,9 @@
 import { NavDropdown, NavDropdownTabWrapper } from 'components/NavBar/NavDropdown/index'
 import { TabsItem, TabsSection, useTabsContent } from 'components/NavBar/Tabs/TabsContent'
 import { useKeyPress } from 'hooks/useKeyPress'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { NavLink, useLocation, useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { Popover, Text } from 'ui/src'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
diff --git a/apps/web/src/components/NavBar/Tabs/TabsContent.tsx b/apps/web/src/components/NavBar/Tabs/TabsContent.tsx
index 37453f85940..6b711445c49 100644
--- a/apps/web/src/components/NavBar/Tabs/TabsContent.tsx
+++ b/apps/web/src/components/NavBar/Tabs/TabsContent.tsx
@@ -1,12 +1,11 @@
-import { CreditCardIcon } from 'components/Icons/CreditCard'
 import { Limit } from 'components/Icons/Limit'
 import { Send } from 'components/Icons/Send'
 import { SwapV2 } from 'components/Icons/SwapV2'
 import { MenuItem } from 'components/NavBar/CompanyMenu/Content'
 import { useTabsVisible } from 'components/NavBar/ScreenSizes'
-import { useTheme } from 'lib/styled-components'
 import { useTranslation } from 'react-i18next'
 import { useLocation } from 'react-router-dom'
+import { useTheme } from 'styled-components'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 
@@ -26,7 +25,6 @@ export type TabsItem = MenuItem & {
 export const useTabsContent = (): TabsSection[] => {
   const { t } = useTranslation()
   const isLegacyNav = !useFeatureFlag(FeatureFlags.NavRefresh)
-  const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregatorWeb)
   const { pathname } = useLocation()
   const theme = useTheme()
   const areTabsVisible = useTabsVisible()
@@ -55,35 +53,24 @@ export const useTabsContent = (): TabsSection[] => {
             {
               label: t('common.swap'),
               icon: <SwapV2 fill={theme.neutral2} />,
-              quickKey: t(`quickKey.swap`),
+              quickKey: t`U`,
               href: '/swap',
               internal: true,
             },
             {
               label: t('swap.limit'),
               icon: <Limit fill={theme.neutral2} />,
-              quickKey: t(`quickKey.limit`),
+              quickKey: t`L`,
               href: '/limit',
               internal: true,
             },
             {
               label: t('common.send.button'),
               icon: <Send fill={theme.neutral2} />,
-              quickKey: t(`quickKey.send`),
+              quickKey: t`E`,
               href: '/send',
               internal: true,
             },
-            ...(forAggregatorEnabled
-              ? [
-                  {
-                    label: t('common.buy.label'),
-                    icon: <CreditCardIcon fill={theme.neutral2} />,
-                    quickKey: t(`quickKey.buy`),
-                    href: '/buy',
-                    internal: true,
-                  },
-                ]
-              : []),
           ],
         },
         {
@@ -91,15 +78,10 @@ export const useTabsContent = (): TabsSection[] => {
           href: '/explore',
           isActive: pathname.startsWith('/explore') || pathname.startsWith('/nfts'),
           items: [
-            { label: t('common.tokens'), quickKey: t(`quickKey.tokens`), href: '/explore/tokens', internal: true },
-            { label: t('common.pools'), quickKey: t(`quickKey.pools`), href: '/explore/pools', internal: true },
-            {
-              label: t('common.transactions'),
-              quickKey: t(`quickKey.transactions`),
-              href: '/explore/transactions',
-              internal: true,
-            },
-            { label: t('common.nfts'), quickKey: t(`quickKey.nfts`), href: '/nfts', internal: true },
+            { label: t('common.tokens'), quickKey: t`T`, href: '/explore/tokens', internal: true },
+            { label: t('common.pools'), quickKey: t`P`, href: '/explore/pools', internal: true },
+            { label: t('common.transactions'), quickKey: t`X`, href: '/explore/transactions', internal: true },
+            { label: t('common.nfts'), quickKey: t`N`, href: '/nfts', internal: true },
           ],
         },
         {
diff --git a/apps/web/src/components/NavigationTabs/index.tsx b/apps/web/src/components/NavigationTabs/index.tsx
index 66571ad6540..e6b2fc6e0b1 100644
--- a/apps/web/src/components/NavigationTabs/index.tsx
+++ b/apps/web/src/components/NavigationTabs/index.tsx
@@ -3,7 +3,6 @@ import { RowBetween } from 'components/Row'
 import SettingsTab from 'components/Settings'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { ArrowLeft } from 'react-feather'
 import { Link, useLocation } from 'react-router-dom'
@@ -11,6 +10,7 @@ import { Box } from 'rebass'
 import { useAppDispatch } from 'state/hooks'
 import { resetMintState } from 'state/mint/actions'
 import { resetMintState as resetMintV3State } from 'state/mint/v3/actions'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { flexRowNoWrap } from 'theme/styles'
 
diff --git a/apps/web/src/components/NetworkAlert/NetworkAlert.tsx b/apps/web/src/components/NetworkAlert/NetworkAlert.tsx
index 2361f42d32c..0a09049df15 100644
--- a/apps/web/src/components/NetworkAlert/NetworkAlert.tsx
+++ b/apps/web/src/components/NetworkAlert/NetworkAlert.tsx
@@ -5,9 +5,9 @@ import { getChain, useIsSupportedChainId } from 'constants/chains'
 import { useIsSendPage } from 'hooks/useIsSendPage'
 import { useIsSwapPage } from 'hooks/useIsSwapPage'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ArrowUpRight } from 'react-feather'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled from 'styled-components'
 import { ExternalLink, HideSmall, ThemedText } from 'theme/components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 
diff --git a/apps/web/src/components/NumericalInput/index.tsx b/apps/web/src/components/NumericalInput/index.tsx
index e13685d2bcf..459df85b150 100644
--- a/apps/web/src/components/NumericalInput/index.tsx
+++ b/apps/web/src/components/NumericalInput/index.tsx
@@ -1,7 +1,7 @@
 import { loadingOpacityMixin } from 'components/Loader/styled'
 import { SupportedLocale } from 'constants/locales'
-import styled from 'lib/styled-components'
 import React, { forwardRef } from 'react'
+import styled from 'styled-components'
 import { escapeRegExp } from 'utils'
 import { useFormatterLocales } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/Polling/ChainConnectivityWarning.tsx b/apps/web/src/components/Polling/ChainConnectivityWarning.tsx
index 1c65a4014b1..f9cc4e2d68f 100644
--- a/apps/web/src/components/Polling/ChainConnectivityWarning.tsx
+++ b/apps/web/src/components/Polling/ChainConnectivityWarning.tsx
@@ -1,8 +1,8 @@
 import { getChain, useSupportedChainId } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { AlertTriangle } from 'react-feather'
+import styled from 'styled-components'
 import { MEDIA_WIDTHS } from 'theme'
 import { ExternalLink } from 'theme/components'
 import { UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/Polling/index.tsx b/apps/web/src/components/Polling/index.tsx
index 9b6c3c3969f..f15b968b550 100644
--- a/apps/web/src/components/Polling/index.tsx
+++ b/apps/web/src/components/Polling/index.tsx
@@ -10,8 +10,8 @@ import { useIsNftPage } from 'hooks/useIsNftPage'
 import useMachineTimeMs from 'hooks/useMachineTime'
 import { Trans } from 'i18n'
 import useBlockNumber from 'lib/hooks/useBlockNumber'
-import styled, { keyframes } from 'lib/styled-components'
 import { useEffect, useMemo, useState } from 'react'
+import styled, { keyframes } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { Text } from 'ui/src'
 import { DEFAULT_MS_BEFORE_WARNING, UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
diff --git a/apps/web/src/components/Pools/PoolDetails/ChartSection/hooks.ts b/apps/web/src/components/Pools/PoolDetails/ChartSection/hooks.ts
index e99a6445f1b..402735a6701 100644
--- a/apps/web/src/components/Pools/PoolDetails/ChartSection/hooks.ts
+++ b/apps/web/src/components/Pools/PoolDetails/ChartSection/hooks.ts
@@ -53,7 +53,7 @@ export function usePDPPriceChartData(
 
     // TODO(WEB-3769): Append current price based on active tick to entries
     /* const dataQuality = checkDataQuality(entries, ChartType.PRICE, variables.duration) */
-    const dataQuality = loading || !priceHistory || !priceHistory.length ? DataQuality.INVALID : DataQuality.VALID
+    const dataQuality = loading || !priceHistory ? DataQuality.INVALID : DataQuality.VALID
 
     return { chartType: ChartType.PRICE, entries, loading, dataQuality }
   }, [data?.v2Pair, data?.v3Pool, isReversed, loading, poolData?.token0.address, tokenA, tokenB])
diff --git a/apps/web/src/components/Pools/PoolDetails/ChartSection/index.tsx b/apps/web/src/components/Pools/PoolDetails/ChartSection/index.tsx
index 25142e2286f..bd48c8eb0ba 100644
--- a/apps/web/src/components/Pools/PoolDetails/ChartSection/index.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/ChartSection/index.tsx
@@ -22,8 +22,8 @@ import { TimePeriod, gqlToCurrency, supportedChainIdFromGQLChain, toHistoryDurat
 import useStablecoinPrice from 'hooks/useStablecoinPrice'
 import { Trans, t } from 'i18n'
 import { useAtomValue } from 'jotai/utils'
-import styled, { useTheme } from 'lib/styled-components'
 import { useMemo, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 import { Chain, ProtocolVersion } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
@@ -271,7 +271,7 @@ function PriceChart({
 
   const params = useMemo(() => ({ data, stale, type: PriceChartType.LINE }), [data, stale])
 
-  const { price: stablecoinPrice } = useStablecoinPrice(primaryToken)
+  const stablecoinPrice = useStablecoinPrice(primaryToken)
 
   const lastPrice = data[data.length - 1]
   return (
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
index 40391e35b02..56a5bf6488e 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
@@ -20,10 +20,10 @@ import { getTokenDetailsURL, gqlToCurrency } from 'graphql/data/util'
 import { useScreenSize } from 'hooks/screenSize'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans, t } from 'i18n'
-import styled, { css, useTheme } from 'lib/styled-components'
 import React, { useMemo, useReducer, useRef } from 'react'
 import { ChevronRight, ExternalLink as ExternalLinkIcon } from 'react-feather'
 import { Link } from 'react-router-dom'
+import styled, { css, useTheme } from 'styled-components'
 import { ClickableStyle, EllipsisStyle, ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 import { ProtocolVersion, Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsLink.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsLink.tsx
index ec0d3e0190b..f58cdd80a1e 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsLink.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsLink.tsx
@@ -10,10 +10,10 @@ import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { getTokenDetailsURL, gqlToCurrency } from 'graphql/data/util'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useCallback, useState } from 'react'
 import { ChevronRight, Copy } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, EllipsisStyle, ExternalLink, ThemedText } from 'theme/components'
 import { Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsPositionsTable.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsPositionsTable.tsx
index 9d699f0ad74..82af42351aa 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsPositionsTable.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsPositionsTable.tsx
@@ -8,11 +8,11 @@ import { useCurrency } from 'hooks/Tokens'
 import { useAccount } from 'hooks/useAccount'
 import { useSwitchChain } from 'hooks/useSwitchChain'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useCallback } from 'react'
 import { AlertTriangle } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
 import { Bound } from 'state/mint/v3/actions'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
index 60448142bd4..9b26060e0aa 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
@@ -12,10 +12,10 @@ import { getTokenDetailsURL, unwrapToken } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
 import { useScreenSize } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { ReactNode, useMemo } from 'react'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
+import styled, { css, useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
index e70af1d4a8f..da05ba18009 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
@@ -16,11 +16,11 @@ import { useScreenSize } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
 import { useSwitchChain } from 'hooks/useSwitchChain'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Swap } from 'pages/Swap'
 import { useMemo, useReducer } from 'react'
 import { Plus, X } from 'react-feather'
 import { useLocation, useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTable.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTable.tsx
index f4bcbefb02a..51ce5a98e09 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTable.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTable.tsx
@@ -8,8 +8,8 @@ import { useChainFromUrlParam } from 'constants/chains'
 import { getSupportedGraphQlChain } from 'graphql/data/util'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { ProtocolVersion, Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
index 197f1cd73a0..0baec47cbe4 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
@@ -14,8 +14,8 @@ import {
 import { OrderDirection, getSupportedGraphQlChain, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo, useReducer, useState } from 'react'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { ProtocolVersion, Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/components/Pools/PoolDetails/shared.ts b/apps/web/src/components/Pools/PoolDetails/shared.ts
index d6d25c1faf9..a787f33a96a 100644
--- a/apps/web/src/components/Pools/PoolDetails/shared.ts
+++ b/apps/web/src/components/Pools/PoolDetails/shared.ts
@@ -1,5 +1,5 @@
 import { LoadingBubble } from 'components/Tokens/loading'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const DetailBubble = styled(LoadingBubble)<{ $height?: number; $width?: number }>`
   height: ${({ $height }) => ($height ? `${$height}px` : '16px')};
diff --git a/apps/web/src/components/Pools/PoolTable/PoolTable.tsx b/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
index 03ec044a015..8622d18cb5f 100644
--- a/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
+++ b/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
@@ -19,8 +19,8 @@ import { OrderDirection, getSupportedGraphQlChain, gqlToCurrency, unwrapToken }
 import { Trans } from 'i18n'
 import { useAtom } from 'jotai'
 import { atomWithReset, useAtomValue, useResetAtom, useUpdateAtom } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { ReactElement, ReactNode, useCallback, useEffect, useMemo } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { ProtocolVersion, Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { InterfaceChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/Popover/index.tsx b/apps/web/src/components/Popover/index.tsx
index 9841a2230d8..90e29fd3228 100644
--- a/apps/web/src/components/Popover/index.tsx
+++ b/apps/web/src/components/Popover/index.tsx
@@ -1,9 +1,9 @@
 import { Options, Placement } from '@popperjs/core'
 import Portal from '@reach/portal'
 import useInterval from 'lib/hooks/useInterval'
-import styled from 'lib/styled-components'
 import React, { CSSProperties, useCallback, useMemo, useState } from 'react'
 import { usePopper } from 'react-popper'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 const PopoverContainer = styled.div<{ show: boolean }>`
diff --git a/apps/web/src/components/Popups/ClaimPopup.tsx b/apps/web/src/components/Popups/ClaimPopup.tsx
index a9f79f1ff91..52d0295e5e1 100644
--- a/apps/web/src/components/Popups/ClaimPopup.tsx
+++ b/apps/web/src/components/Popups/ClaimPopup.tsx
@@ -5,7 +5,6 @@ import { AutoColumn } from 'components/Column'
 import { CardBGImage, CardNoise } from 'components/earn/styled'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { keyframes } from 'lib/styled-components'
 import { useCallback, useEffect } from 'react'
 import { Heart, X } from 'react-feather'
 import {
@@ -16,6 +15,7 @@ import {
 } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import { useUserHasAvailableClaim, useUserUnclaimedAmount } from 'state/claim/hooks'
+import styled, { keyframes } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const StyledClaimPopup = styled(AutoColumn)`
diff --git a/apps/web/src/components/Popups/PopupContent.tsx b/apps/web/src/components/Popups/PopupContent.tsx
index 906917f25a2..9ab34767710 100644
--- a/apps/web/src/components/Popups/PopupContent.tsx
+++ b/apps/web/src/components/Popups/PopupContent.tsx
@@ -13,10 +13,10 @@ import { AutoRow } from 'components/Row'
 import { SupportedInterfaceChainId, useIsSupportedChainId } from 'constants/chains'
 import useENSName from 'hooks/useENSName'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { X } from 'react-feather'
 import { useOrder } from 'state/signatures/hooks'
 import { useTransaction } from 'state/transactions/hooks'
+import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/Popups/index.tsx b/apps/web/src/components/Popups/index.tsx
index 562a3f07bc5..63432e25d97 100644
--- a/apps/web/src/components/Popups/index.tsx
+++ b/apps/web/src/components/Popups/index.tsx
@@ -2,8 +2,8 @@ import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { AutoColumn } from 'components/Column'
 import ClaimPopup from 'components/Popups/ClaimPopup'
 import PopupItem from 'components/Popups/PopupItem'
-import styled from 'lib/styled-components'
 import { useActivePopups } from 'state/application/hooks'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 const StickyContainer = styled.div`
diff --git a/apps/web/src/components/PositionCard/Sushi.tsx b/apps/web/src/components/PositionCard/Sushi.tsx
index 453831979cf..d03e9ab6fd8 100644
--- a/apps/web/src/components/PositionCard/Sushi.tsx
+++ b/apps/web/src/components/PositionCard/Sushi.tsx
@@ -9,10 +9,10 @@ import { CardNoise } from 'components/earn/styled'
 import { Dots } from 'components/swap/styled'
 import { useColor } from 'hooks/useColor'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { transparentize } from 'polished'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { unwrappedToken } from 'utils/unwrappedToken'
 import { FixedHeightRow } from '.'
 
diff --git a/apps/web/src/components/PositionCard/V2.tsx b/apps/web/src/components/PositionCard/V2.tsx
index 857192c5636..30d5ae3d049 100644
--- a/apps/web/src/components/PositionCard/V2.tsx
+++ b/apps/web/src/components/PositionCard/V2.tsx
@@ -14,13 +14,13 @@ import { useColor } from 'hooks/useColor'
 import { useTotalSupply } from 'hooks/useTotalSupply'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
-import styled from 'lib/styled-components'
 import { transparentize } from 'polished'
 import { useState } from 'react'
 import { ChevronDown, ChevronUp } from 'react-feather'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import { useTokenBalance } from 'state/connection/hooks'
+import styled from 'styled-components'
 import { currencyId } from 'utils/currencyId'
 import { unwrappedToken } from 'utils/unwrappedToken'
 import { FixedHeightRow } from '.'
diff --git a/apps/web/src/components/PositionCard/index.tsx b/apps/web/src/components/PositionCard/index.tsx
index aa970b3e39a..d631f1ca4a1 100644
--- a/apps/web/src/components/PositionCard/index.tsx
+++ b/apps/web/src/components/PositionCard/index.tsx
@@ -14,13 +14,13 @@ import { useColor } from 'hooks/useColor'
 import { useTotalSupply } from 'hooks/useTotalSupply'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
-import styled from 'lib/styled-components'
 import { transparentize } from 'polished'
 import { useState } from 'react'
 import { ChevronDown, ChevronUp } from 'react-feather'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import { useTokenBalance } from 'state/connection/hooks'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { currencyId } from 'utils/currencyId'
 import { unwrappedToken } from 'utils/unwrappedToken'
diff --git a/apps/web/src/components/PositionList/index.tsx b/apps/web/src/components/PositionList/index.tsx
index 46d1a7bd61f..70e2fd416e4 100644
--- a/apps/web/src/components/PositionList/index.tsx
+++ b/apps/web/src/components/PositionList/index.tsx
@@ -1,7 +1,7 @@
 import PositionListItem from 'components/PositionListItem'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import React from 'react'
+import styled from 'styled-components'
 import { MEDIA_WIDTHS } from 'theme'
 import { PositionDetails } from 'types/position'
 
diff --git a/apps/web/src/components/PositionListItem/index.tsx b/apps/web/src/components/PositionListItem/index.tsx
index f53f2ea601d..183b3ef3ee1 100644
--- a/apps/web/src/components/PositionListItem/index.tsx
+++ b/apps/web/src/components/PositionListItem/index.tsx
@@ -11,10 +11,10 @@ import { useToken } from 'hooks/Tokens'
 import useIsTickAtLimit from 'hooks/useIsTickAtLimit'
 import { usePool } from 'hooks/usePools'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo } from 'react'
 import { Link } from 'react-router-dom'
 import { Bound } from 'state/mint/v3/actions'
+import styled from 'styled-components'
 import { MEDIA_WIDTHS } from 'theme'
 import { HideSmall, SmallOnly, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/PrivacyPolicy/index.tsx b/apps/web/src/components/PrivacyPolicy/index.tsx
index 2000b6747bb..a6617e5804d 100644
--- a/apps/web/src/components/PrivacyPolicy/index.tsx
+++ b/apps/web/src/components/PrivacyPolicy/index.tsx
@@ -4,11 +4,11 @@ import { AutoColumn } from 'components/Column'
 import Modal from 'components/Modal'
 import Row, { AutoRow, RowBetween } from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useEffect, useRef } from 'react'
 import { ArrowDown, Info, X } from 'react-feather'
 import { useModalIsOpen, useTogglePrivacyPolicy } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/components/QuestionHelper/index.tsx b/apps/web/src/components/QuestionHelper/index.tsx
index 20146b60a60..1480c070479 100644
--- a/apps/web/src/components/QuestionHelper/index.tsx
+++ b/apps/web/src/components/QuestionHelper/index.tsx
@@ -1,7 +1,7 @@
 import { Placement } from '@popperjs/core'
 import { MouseoverTooltip } from 'components/Tooltip'
-import styled from 'lib/styled-components'
 import { ReactNode, useCallback, useState } from 'react'
+import styled from 'styled-components'
 import { InfoCircleFilled } from 'ui/src/components/icons'
 
 const QuestionWrapper = styled.div`
diff --git a/apps/web/src/components/RangeSelector/PresetsButtons.tsx b/apps/web/src/components/RangeSelector/PresetsButtons.tsx
index 7658bd87ce2..f0c0da299b8 100644
--- a/apps/web/src/components/RangeSelector/PresetsButtons.tsx
+++ b/apps/web/src/components/RangeSelector/PresetsButtons.tsx
@@ -1,7 +1,7 @@
 import { ButtonOutlined } from 'components/Button'
 import { AutoRow } from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const Button = styled(ButtonOutlined).attrs(() => ({
diff --git a/apps/web/src/components/ReceiveCryptoModal/ChooseProvider.tsx b/apps/web/src/components/ReceiveCryptoModal/ChooseProvider.tsx
deleted file mode 100644
index be77f7809ab..00000000000
--- a/apps/web/src/components/ReceiveCryptoModal/ChooseProvider.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Status } from 'components/AccountDrawer/Status'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
-import { ProviderOption } from 'components/ReceiveCryptoModal/ProviderOption'
-import { useAccount } from 'hooks/useAccount'
-import useENSName from 'hooks/useENSName'
-import { useTheme } from 'lib/styled-components'
-import { useTranslation } from 'react-i18next'
-import { useOpenModal, useToggleModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
-import { CopyToClipboard } from 'theme/components'
-import { Button, Flex, GeneratedIcon, ImpactFeedbackStyle, Separator, Text, TouchableArea } from 'ui/src'
-import { CopySheets, QrCode } from 'ui/src/components/icons'
-import { iconSizes } from 'ui/src/theme'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
-import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
-import { useCexTransferProviders } from 'uniswap/src/features/fiatOnRamp/useCexTransferProviders'
-import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
-
-const ICON_SIZE = 32
-const ICON_BORDER_RADIUS = 100
-
-function ActionIcon({ Icon }: { Icon: GeneratedIcon }) {
-  const theme = useTheme()
-  const activeStyle = { backgroundColor: theme.surface3 }
-  return (
-    <Button
-      backgroundColor="$surface3"
-      hoverStyle={activeStyle}
-      pressStyle={activeStyle}
-      borderRadius={ICON_BORDER_RADIUS}
-      height={ICON_SIZE}
-      width={ICON_SIZE}
-      p={0}
-    >
-      <Icon color="$neutral2" size={iconSizes.icon16} />
-    </Button>
-  )
-}
-
-function AccountCardItem({ onClose }: { onClose: () => void }): JSX.Element {
-  const account = useAccount()
-  const { unitag } = useUnitagByAddress(account.address)
-  const { ENSName } = useENSName(account.address)
-  const openAddressQRModal = useOpenModal(ApplicationModal.RECEIVE_CRYPTO_QR)
-
-  const onPressShowWalletQr = (): void => {
-    onClose()
-    openAddressQRModal()
-  }
-
-  return (
-    <Flex row alignItems="flex-start" gap="$spacing12">
-      <Flex
-        fill
-        row
-        borderColor="$surface3"
-        borderRadius="$rounded20"
-        borderWidth="$spacing1"
-        gap="$spacing12"
-        p="$spacing12"
-      >
-        <Flex fill>
-          <Status
-            account={account.address!}
-            ensUsername={ENSName}
-            uniswapUsername={unitag?.username}
-            showAddressCopy={false}
-          />
-        </Flex>
-        <Flex centered row gap="$spacing12" px="$spacing8">
-          <CopyToClipboard toCopy={account.address!}>
-            <ActionIcon Icon={CopySheets} />
-          </CopyToClipboard>
-          <TouchableArea hapticFeedback hapticStyle={ImpactFeedbackStyle.Light} onPress={onPressShowWalletQr}>
-            <ActionIcon Icon={QrCode} />
-          </TouchableArea>
-        </Flex>
-      </Flex>
-    </Flex>
-  )
-}
-
-type ChooseProviderProps = {
-  setConnectedProvider: (provider: FORServiceProvider) => void
-  setErrorProvider: (provider: FORServiceProvider) => void
-}
-
-export function ChooseProvider({ setConnectedProvider, setErrorProvider }: ChooseProviderProps): JSX.Element {
-  const { t } = useTranslation()
-  const account = useAccount()
-  const toggleModal = useToggleModal(ApplicationModal.RECEIVE_CRYPTO)
-  const providers = useCexTransferProviders(true)
-
-  return (
-    <Flex grow gap="$spacing24" mb="$spacing16">
-      <GetHelpHeader link={uniswapUrls.helpArticleUrls.transferCryptoHelp} closeModal={toggleModal} />
-      <Flex gap="$spacing4" p="$spacing8">
-        <Text color="$neutral1" mt="$spacing2" textAlign="center" variant="subheading1">
-          {t('fiatOnRamp.receiveCrypto.title')}
-        </Text>
-        <Text color="$neutral2" mt="$spacing2" textAlign="center" variant="body3">
-          {t('fiatOnRamp.receiveCrypto.transferFunds')}
-        </Text>
-      </Flex>
-      <Flex gap="$spacing12">
-        <AccountCardItem onClose={toggleModal} />
-        {providers.length > 0 && (
-          <Flex centered row shrink gap="$spacing12">
-            <Separator />
-            <Text color="$neutral2" textAlign="center" variant="body3">
-              {t('fiatOnRamp.receiveCrypto.modal.sectionTitle.fromAccount')}
-            </Text>
-            <Separator />
-          </Flex>
-        )}
-        {account.address && (
-          <Flex grow gap="$spacing12">
-            {providers.map((serviceProvider) => (
-              <ProviderOption
-                key={serviceProvider.name}
-                serviceProvider={serviceProvider}
-                walletAddress={account.address!}
-                setConnectedProvider={setConnectedProvider}
-                setErrorProvider={setErrorProvider}
-              />
-            ))}
-          </Flex>
-        )}
-      </Flex>
-    </Flex>
-  )
-}
diff --git a/apps/web/src/components/ReceiveCryptoModal/ProviderOption.tsx b/apps/web/src/components/ReceiveCryptoModal/ProviderOption.tsx
deleted file mode 100644
index 75b98b553ff..00000000000
--- a/apps/web/src/components/ReceiveCryptoModal/ProviderOption.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useMemo } from 'react'
-import { FiatOnRampTransactionStatus, FiatOnRampTransactionType } from 'state/fiatOnRampTransactions/types'
-import { ExternalLink } from 'ui/src/components/icons'
-import { UNISWAP_WEB_URL } from 'uniswap/src/constants/urls'
-import { FORQuoteItem } from 'uniswap/src/features/fiatOnRamp/FORQuoteItem'
-import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
-import { v4 as uuid } from 'uuid'
-
-import { useAddFiatOnRampTransaction } from 'state/fiatOnRampTransactions/hooks'
-import { useFiatOnRampAggregatorTransferWidgetQuery } from 'uniswap/src/features/fiatOnRamp/api'
-
-interface ProviderOptionProps {
-  serviceProvider: FORServiceProvider
-  walletAddress: string
-  setConnectedProvider: (provider: FORServiceProvider) => void
-  setErrorProvider: (provider: FORServiceProvider) => void
-}
-
-export function ProviderOption({
-  walletAddress,
-  serviceProvider,
-  setConnectedProvider,
-  setErrorProvider,
-}: ProviderOptionProps) {
-  const addFiatOnRampTransaction = useAddFiatOnRampTransaction()
-  const externalTransactionId = useMemo(() => uuid(), [])
-
-  const widgetQueryParams = useMemo(() => {
-    return {
-      serviceProvider: serviceProvider.serviceProvider,
-      walletAddress,
-      externalSessionId: externalTransactionId,
-      redirectUrl: `${UNISWAP_WEB_URL}/buy`,
-    }
-  }, [walletAddress, serviceProvider, externalTransactionId])
-
-  // TODO(WEB-4417): use the widgetUrl from the /transfer-service-providers response instead of prefetching for every provider.
-  const { data, error, isLoading } = useFiatOnRampAggregatorTransferWidgetQuery(widgetQueryParams)
-
-  return (
-    <FORQuoteItem
-      key={serviceProvider.name}
-      serviceProvider={serviceProvider}
-      hoverIcon={<ExternalLink position="absolute" right="$spacing12" size={20} />}
-      isLoading={isLoading}
-      onPress={async () => {
-        if (data) {
-          window.open(data.widgetUrl, '_blank')
-          setConnectedProvider(serviceProvider)
-          addFiatOnRampTransaction({
-            externalSessionId: externalTransactionId,
-            account: walletAddress,
-            status: FiatOnRampTransactionStatus.INITIATED,
-            forceFetched: false,
-            addedAt: Date.now(),
-            type: FiatOnRampTransactionType.TRANSFER,
-            syncedWithBackend: false,
-            provider: serviceProvider.serviceProvider,
-          })
-        } else if (error) {
-          setErrorProvider(serviceProvider)
-        }
-      }}
-    />
-  )
-}
diff --git a/apps/web/src/components/ReceiveCryptoModal/index.tsx b/apps/web/src/components/ReceiveCryptoModal/index.tsx
deleted file mode 100644
index 4f07bb92529..00000000000
--- a/apps/web/src/components/ReceiveCryptoModal/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ChooseProvider } from 'components/ReceiveCryptoModal/ChooseProvider'
-import { useAccount } from 'hooks/useAccount'
-import ms from 'ms'
-import { ProviderConnectedView } from 'pages/Swap/Buy/ProviderConnectedView'
-import { ProviderConnectionError } from 'pages/Swap/Buy/ProviderConnectionError'
-import { ContentWrapper } from 'pages/Swap/Buy/shared'
-import { useCallback, useState } from 'react'
-import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
-import { AdaptiveWebModalSheet } from 'ui/src'
-import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
-import { logger } from 'utilities/src/logger/logger'
-
-export function ReceiveCryptoModal() {
-  const account = useAccount()
-  const toggleModal = useToggleModal(ApplicationModal.RECEIVE_CRYPTO)
-  const isOpen = useModalIsOpen(ApplicationModal.RECEIVE_CRYPTO)
-
-  const [errorProvider, setErrorProvider] = useState<FORServiceProvider>()
-  const [connectedProvider, setConnectedProvider] = useState<FORServiceProvider>()
-
-  const onClose = useCallback(() => {
-    toggleModal()
-    // Delay the state reset until the modal finishes animating away:
-    setTimeout(() => {
-      setErrorProvider(undefined)
-      setConnectedProvider(undefined)
-    }, ms('500ms'))
-  }, [toggleModal, setErrorProvider, setConnectedProvider])
-
-  if (!account.address) {
-    logger.debug('ReceiveCryptoModal', 'ReceiveCryptoModal', 'Modal opened with invalid state. Closing modal.')
-    onClose()
-    return null
-  }
-  return (
-    <AdaptiveWebModalSheet isOpen={isOpen} onClose={onClose} width={420}>
-      <ContentWrapper>
-        {errorProvider ? (
-          <ProviderConnectionError
-            onBack={() => setErrorProvider(undefined)}
-            closeModal={onClose}
-            selectedServiceProvider={errorProvider}
-          />
-        ) : connectedProvider ? (
-          <ProviderConnectedView closeModal={onClose} selectedServiceProvider={connectedProvider} />
-        ) : (
-          <ChooseProvider setErrorProvider={setErrorProvider} setConnectedProvider={setConnectedProvider} />
-        )}
-      </ContentWrapper>
-    </AdaptiveWebModalSheet>
-  )
-}
diff --git a/apps/web/src/components/RouterLabel/UniswapXRouterLabel.tsx b/apps/web/src/components/RouterLabel/UniswapXRouterLabel.tsx
index f53d4e0f617..2c1968d1d14 100644
--- a/apps/web/src/components/RouterLabel/UniswapXRouterLabel.tsx
+++ b/apps/web/src/components/RouterLabel/UniswapXRouterLabel.tsx
@@ -1,7 +1,7 @@
 import Row from 'components/Row'
-import styled from 'lib/styled-components'
 import { BoxProps } from 'nft/components/Box'
 import { useRef } from 'react'
+import styled from 'styled-components'
 import { v4 as uuid } from 'uuid'
 
 // Gradient with a fallback to solid color.
diff --git a/apps/web/src/components/RouterLabel/index.tsx b/apps/web/src/components/RouterLabel/index.tsx
index abb3b8e5589..aebabc94529 100644
--- a/apps/web/src/components/RouterLabel/index.tsx
+++ b/apps/web/src/components/RouterLabel/index.tsx
@@ -1,7 +1,7 @@
 import UniswapXRouterLabel from 'components/RouterLabel/UniswapXRouterLabel'
-import { DefaultTheme } from 'lib/styled-components'
 import { QuoteMethod, SubmittableTrade } from 'state/routing/types'
 import { isUniswapXTrade } from 'state/routing/utils'
+import { DefaultTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 export default function RouterLabel({ trade, color }: { trade: SubmittableTrade; color?: keyof DefaultTheme }) {
diff --git a/apps/web/src/components/RoutingDiagram/RoutingDiagram.tsx b/apps/web/src/components/RoutingDiagram/RoutingDiagram.tsx
index 4fc8cdda263..375ac72b4b7 100644
--- a/apps/web/src/components/RoutingDiagram/RoutingDiagram.tsx
+++ b/apps/web/src/components/RoutingDiagram/RoutingDiagram.tsx
@@ -9,8 +9,8 @@ import Row, { AutoRow } from 'components/Row'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import { BIPS_BASE } from 'constants/misc'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'rebass'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 import { RoutingDiagramEntry } from 'utils/getRoutingDiagramEntries'
diff --git a/apps/web/src/components/Row/index.tsx b/apps/web/src/components/Row/index.tsx
index b8204ef8176..abd83e7b101 100644
--- a/apps/web/src/components/Row/index.tsx
+++ b/apps/web/src/components/Row/index.tsx
@@ -1,12 +1,11 @@
-import styled from 'lib/styled-components'
 import { Box } from 'rebass/styled-components'
+import styled from 'styled-components'
 import { Gap } from 'theme'
 
 // TODO(WEB-1983):
 // Setting `width: 100%` by default prevents composability in complex flex layouts.
 // Same applies to `RowFixed` and its negative margins. This component needs to be
 // further investigated and improved to make UI work easier.
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 const Row = styled(Box)<{
   width?: string
   align?: string
@@ -27,18 +26,15 @@ const Row = styled(Box)<{
   gap: ${({ gap, theme }) => gap && (theme.grids[gap as Gap] || gap)};
 `
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const RowBetween = styled(Row)`
   justify-content: space-between;
 `
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const RowFlat = styled.div`
   display: flex;
   align-items: flex-end;
 `
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const AutoRow = styled(Row)<{ gap?: string; justify?: string }>`
   flex-wrap: wrap;
   margin: ${({ gap }) => gap && `-${gap}`};
@@ -49,7 +45,6 @@ export const AutoRow = styled(Row)<{ gap?: string; justify?: string }>`
   }
 `
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const RowFixed = styled(Row)<{ gap?: string; justify?: string }>`
   width: fit-content;
   margin: ${({ gap }) => gap && `-${gap}`};
diff --git a/apps/web/src/components/SearchModal/CommonBases.tsx b/apps/web/src/components/SearchModal/CommonBases.tsx
index 762b03b315b..d06eef10a15 100644
--- a/apps/web/src/components/SearchModal/CommonBases.tsx
+++ b/apps/web/src/components/SearchModal/CommonBases.tsx
@@ -4,9 +4,9 @@ import CurrencyLogo from 'components/Logo/CurrencyLogo'
 import { AutoRow } from 'components/Row'
 import { COMMON_BASES } from 'constants/routing'
 import { useTotalBalancesUsdForAnalytics } from 'graphql/data/apollo/TokenBalancesProvider'
-import styled from 'lib/styled-components'
 import { getTokenAddress } from 'lib/utils/analytics'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
diff --git a/apps/web/src/components/SearchModal/CurrencyList/index.tsx b/apps/web/src/components/SearchModal/CurrencyList/index.tsx
index 9bafd99672b..4321ba12d8f 100644
--- a/apps/web/src/components/SearchModal/CurrencyList/index.tsx
+++ b/apps/web/src/components/SearchModal/CurrencyList/index.tsx
@@ -13,12 +13,12 @@ import { useTotalBalancesUsdForAnalytics } from 'graphql/data/apollo/TokenBalanc
 import { useIsUserAddedToken } from 'hooks/Tokens'
 import { useAccount } from 'hooks/useAccount'
 import { TokenBalances } from 'lib/hooks/useTokenList/sorting'
-import styled from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { CSSProperties, MutableRefObject, useCallback } from 'react'
 import { FixedSizeList } from 'react-window'
 import { Text } from 'rebass'
 import { TokenFromList } from 'state/lists/tokenFromList'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
@@ -126,13 +126,6 @@ function TokenTags({ currency }: { currency: Currency }) {
   )
 }
 
-const getDisplayName = (name: string | undefined) => {
-  if (name === 'USD//C') {
-    return 'USD Coin'
-  }
-  return name
-}
-
 const RowWrapper = styled(Row)`
   height: 60px;
 `
@@ -171,7 +164,6 @@ export function CurrencyRow({
   const portfolioBalanceUsd = useTotalBalancesUsdForAnalytics()
 
   const Wrapper = tooltip ? MouseoverTooltip : RowWrapper
-  const currencyName = getDisplayName(currency.name)
 
   // only show add or remove buttons if not on selected list
   return (
@@ -205,7 +197,7 @@ export function CurrencyRow({
           </Column>
           <AutoColumn style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }} gap="xs">
             <Row>
-              <CurrencyName title={currencyName}>{currencyName}</CurrencyName>
+              <CurrencyName title={currency.name}>{currency.name}</CurrencyName>
               <WarningContainer>
                 <TokenSafetyIcon warning={warning} />
               </WarningContainer>
diff --git a/apps/web/src/components/SearchModal/CurrencySearch.tsx b/apps/web/src/components/SearchModal/CurrencySearch.tsx
index 3e23250d8bc..e62484cd628 100644
--- a/apps/web/src/components/SearchModal/CurrencySearch.tsx
+++ b/apps/web/src/components/SearchModal/CurrencySearch.tsx
@@ -14,13 +14,13 @@ import useToggle from 'hooks/useToggle'
 import { useTokenBalances } from 'hooks/useTokenBalances'
 import { Trans, t } from 'i18n'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled, { useTheme } from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useRef, useState } from 'react'
 import AutoSizer from 'react-virtualized-auto-sizer'
 import { FixedSizeList } from 'react-window'
 import { Text } from 'rebass'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled, { useTheme } from 'styled-components'
 import { CloseIcon, ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { isAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/components/SearchModal/styled.tsx b/apps/web/src/components/SearchModal/styled.tsx
index e6ea0b391b6..27e1e219382 100644
--- a/apps/web/src/components/SearchModal/styled.tsx
+++ b/apps/web/src/components/SearchModal/styled.tsx
@@ -2,7 +2,7 @@ import searchIcon from 'assets/svg/search.svg'
 import { AutoColumn } from 'components/Column'
 import { LoadingRows as BaseLoadingRows } from 'components/Loader/styled'
 import { RowBetween } from 'components/Row'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const PaddedColumn = styled(AutoColumn)`
   position: relative;
diff --git a/apps/web/src/components/Settings/Input/index.tsx b/apps/web/src/components/Settings/Input/index.tsx
index 5796c5b9f6b..c0eec892501 100644
--- a/apps/web/src/components/Settings/Input/index.tsx
+++ b/apps/web/src/components/Settings/Input/index.tsx
@@ -1,5 +1,5 @@
 import Row from 'components/Row'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const Input = styled.input`
   width: 100%;
diff --git a/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx b/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
index 4b7571cf62c..0f695d30b4b 100644
--- a/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
+++ b/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
@@ -4,10 +4,10 @@ import QuestionHelper from 'components/QuestionHelper'
 import Row, { RowBetween } from 'components/Row'
 import { Input, InputContainer } from 'components/Settings/Input'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useState } from 'react'
 import { useUserSlippageTolerance } from 'state/user/hooks'
 import { SlippageTolerance } from 'state/user/types'
+import styled from 'styled-components'
 import { CautionTriangle, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/Settings/MenuButton/index.tsx b/apps/web/src/components/Settings/MenuButton/index.tsx
index 9958126e738..5b2db7124fa 100644
--- a/apps/web/src/components/Settings/MenuButton/index.tsx
+++ b/apps/web/src/components/Settings/MenuButton/index.tsx
@@ -1,11 +1,11 @@
 import { Settings } from 'components/Icons/Settings'
 import Row from 'components/Row'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { InterfaceTrade } from 'state/routing/types'
 import { isUniswapXTrade } from 'state/routing/utils'
 import { useUserSlippageTolerance } from 'state/user/hooks'
 import { SlippageTolerance } from 'state/user/types'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 import validateUserSlippageTolerance, { SlippageValidationResult } from 'utils/validateUserSlippageTolerance'
diff --git a/apps/web/src/components/Settings/MultipleRoutingOptions.tsx b/apps/web/src/components/Settings/MultipleRoutingOptions.tsx
index b255eedddad..10e12f3e667 100644
--- a/apps/web/src/components/Settings/MultipleRoutingOptions.tsx
+++ b/apps/web/src/components/Settings/MultipleRoutingOptions.tsx
@@ -7,9 +7,9 @@ import Toggle from 'components/Toggle'
 import { isUniswapXSupportedChain } from 'constants/chains'
 import { Trans, t } from 'i18n'
 import { atom, useAtom } from 'jotai'
-import styled from 'lib/styled-components'
 import { ReactNode, useCallback } from 'react'
 import { RouterPreference } from 'state/routing/types'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 
diff --git a/apps/web/src/components/Settings/RouterPreferenceSettings/index.tsx b/apps/web/src/components/Settings/RouterPreferenceSettings/index.tsx
index 639804181ce..7b15493cfca 100644
--- a/apps/web/src/components/Settings/RouterPreferenceSettings/index.tsx
+++ b/apps/web/src/components/Settings/RouterPreferenceSettings/index.tsx
@@ -3,9 +3,9 @@ import UniswapXBrandMark from 'components/Logo/UniswapXBrandMark'
 import { RowBetween, RowFixed } from 'components/Row'
 import Toggle from 'components/Toggle'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { RouterPreference } from 'state/routing/types'
 import { useRouterPreference } from 'state/user/hooks'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 
 const InlineLink = styled(ThemedText.BodySmall)`
diff --git a/apps/web/src/components/Settings/index.tsx b/apps/web/src/components/Settings/index.tsx
index c4ef22688c5..b14082772b5 100644
--- a/apps/web/src/components/Settings/index.tsx
+++ b/apps/web/src/components/Settings/index.tsx
@@ -8,12 +8,11 @@ import MenuButton from 'components/Settings/MenuButton'
 import MultipleRoutingOptions from 'components/Settings/MultipleRoutingOptions'
 import RouterPreferenceSettings from 'components/Settings/RouterPreferenceSettings'
 import TransactionDeadlineSettings from 'components/Settings/TransactionDeadlineSettings'
-import { isUniswapXSupportedChain, useIsSupportedChainId } from 'constants/chains'
+import { isUniswapXSupportedChain, L2_CHAIN_IDS, useIsSupportedChainId } from 'constants/chains'
 import { useIsMobile } from 'hooks/screenSize'
 import useDisableScrolling from 'hooks/useDisableScrolling'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Portal } from 'nft/components/common/Portal'
 import { useCallback, useMemo, useRef } from 'react'
 import { X } from 'react-feather'
@@ -21,9 +20,9 @@ import { useCloseModal, useModalIsOpen, useToggleSettingsMenu } from 'state/appl
 import { ApplicationModal } from 'state/application/reducer'
 import { InterfaceTrade } from 'state/routing/types'
 import { isUniswapXTrade } from 'state/routing/utils'
+import styled from 'styled-components'
 import { Divider, ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 
@@ -119,7 +118,7 @@ export default function SettingsTab({
   compact?: boolean
   hideRoutingSettings?: boolean
 }) {
-  const showDeadlineSettings = !isL2ChainId(chainId)
+  const showDeadlineSettings = Boolean(chainId && !L2_CHAIN_IDS.includes(chainId))
   const toggleButtonNode = useRef<HTMLDivElement | null>(null)
   const menuNode = useRef<HTMLDivElement | null>(null)
   const isOpen = useModalIsOpen(ApplicationModal.SETTINGS)
diff --git a/apps/web/src/components/Slider/index.tsx b/apps/web/src/components/Slider/index.tsx
index e0c70c090ad..56817a0a380 100644
--- a/apps/web/src/components/Slider/index.tsx
+++ b/apps/web/src/components/Slider/index.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { ChangeEvent, useCallback } from 'react'
+import styled from 'styled-components'
 
 const StyledRangeInput = styled.input<{ size: number }>`
   -webkit-appearance: none; /* Hides the slider so that custom slider can be made */
diff --git a/apps/web/src/components/Table/Cell.tsx b/apps/web/src/components/Table/Cell.tsx
index 5d73c2fc913..432adcd6810 100644
--- a/apps/web/src/components/Table/Cell.tsx
+++ b/apps/web/src/components/Table/Cell.tsx
@@ -1,6 +1,6 @@
 import { LoadingBubble } from 'components/Tokens/loading'
-import styled from 'lib/styled-components'
 import { PropsWithChildren } from 'react'
+import styled from 'styled-components'
 
 const Container = styled.div<{
   $width?: number
diff --git a/apps/web/src/components/Table/ErrorBox.tsx b/apps/web/src/components/Table/ErrorBox.tsx
index 5b234888d24..06747ed3eb1 100644
--- a/apps/web/src/components/Table/ErrorBox.tsx
+++ b/apps/web/src/components/Table/ErrorBox.tsx
@@ -1,6 +1,6 @@
 import Column from 'components/Column'
 import { MissingDataIcon } from 'components/Table/icons'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const ErrorModalContainer = styled.div`
diff --git a/apps/web/src/components/Table/Filter.tsx b/apps/web/src/components/Table/Filter.tsx
index 470a7e34844..801234ba45d 100644
--- a/apps/web/src/components/Table/Filter.tsx
+++ b/apps/web/src/components/Table/Filter.tsx
@@ -3,10 +3,10 @@ import Row from 'components/Row'
 import { DropdownIcon } from 'components/Table/icons'
 import { useScreenSize } from 'hooks/screenSize'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled from 'lib/styled-components'
 import { Portal } from 'nft/components/common/Portal'
 import { Checkbox } from 'nft/components/layout/Checkbox'
 import { Fragment, useCallback, useRef, useState } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/components/Table/index.tsx b/apps/web/src/components/Table/index.tsx
index 6d06e4f8bfd..473594902c3 100644
--- a/apps/web/src/components/Table/index.tsx
+++ b/apps/web/src/components/Table/index.tsx
@@ -29,9 +29,9 @@ import {
 } from 'components/Table/styled'
 import useDebounce from 'hooks/useDebounce'
 import { Trans } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { ScrollSync, ScrollSyncPane } from 'react-scroll-sync'
+import { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { FadePresence } from 'theme/components/FadePresence'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/components/Table/styled.tsx b/apps/web/src/components/Table/styled.tsx
index 262bd10aec7..f050fdda98e 100644
--- a/apps/web/src/components/Table/styled.tsx
+++ b/apps/web/src/components/Table/styled.tsx
@@ -10,9 +10,9 @@ import { OrderDirection, getTokenDetailsURL, supportedChainIdFromGQLChain, unwra
 import { useCurrency } from 'hooks/Tokens'
 import { useActiveLocale } from 'hooks/useActiveLocale'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { ArrowDown, CornerLeftUp, ExternalLink as ExternalLinkIcon } from 'react-feather'
 import { Link } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { ClickableStyle, EllipsisStyle, ExternalLink, ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 import { Token } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/components/TextInput/index.tsx b/apps/web/src/components/TextInput/index.tsx
index 8abca0dad04..7abb4590cb4 100644
--- a/apps/web/src/components/TextInput/index.tsx
+++ b/apps/web/src/components/TextInput/index.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { ChangeEvent, memo, useCallback, useRef } from 'react'
+import styled from 'styled-components'
 
 const Input = styled.input<{ error?: boolean; fontSize?: string }>`
   font-size: ${({ fontSize }) => fontSize || '1.25rem'};
diff --git a/apps/web/src/components/Toggle/MultiToggle.tsx b/apps/web/src/components/Toggle/MultiToggle.tsx
index 9c042ec04f0..30985af7fdb 100644
--- a/apps/web/src/components/Toggle/MultiToggle.tsx
+++ b/apps/web/src/components/Toggle/MultiToggle.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const ToggleWrapper = styled.button<{ width?: string }>`
   display: flex;
diff --git a/apps/web/src/components/Toggle/PillMultiToggle.tsx b/apps/web/src/components/Toggle/PillMultiToggle.tsx
index 9c7fd4073f4..6b6579fc666 100644
--- a/apps/web/src/components/Toggle/PillMultiToggle.tsx
+++ b/apps/web/src/components/Toggle/PillMultiToggle.tsx
@@ -1,6 +1,6 @@
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { createRef, useCallback, useEffect, useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 const togglePadding = 4
diff --git a/apps/web/src/components/Toggle/index.tsx b/apps/web/src/components/Toggle/index.tsx
index 527c8e55261..78a330f47df 100644
--- a/apps/web/src/components/Toggle/index.tsx
+++ b/apps/web/src/components/Toggle/index.tsx
@@ -1,6 +1,6 @@
-import styled, { keyframes } from 'lib/styled-components'
 import { darken } from 'polished'
 import { useState } from 'react'
+import styled, { keyframes } from 'styled-components'
 
 const Wrapper = styled.button<{ isActive?: boolean; activeElement?: boolean; $disabled?: boolean }>`
   align-items: center;
diff --git a/apps/web/src/components/TokenSafety/TokenSafetyIcon.tsx b/apps/web/src/components/TokenSafety/TokenSafetyIcon.tsx
index a68101408b6..3bca5e31846 100644
--- a/apps/web/src/components/TokenSafety/TokenSafetyIcon.tsx
+++ b/apps/web/src/components/TokenSafety/TokenSafetyIcon.tsx
@@ -1,6 +1,6 @@
 import { Warning } from 'constants/tokenSafety'
-import styled, { css } from 'lib/styled-components'
 import { AlertTriangle, Slash } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 const WarningContainer = styled.div`
diff --git a/apps/web/src/components/TokenSafety/TokenSafetyLabel.tsx b/apps/web/src/components/TokenSafety/TokenSafetyLabel.tsx
index 3c952001562..92e5aba2ef7 100644
--- a/apps/web/src/components/TokenSafety/TokenSafetyLabel.tsx
+++ b/apps/web/src/components/TokenSafety/TokenSafetyLabel.tsx
@@ -1,8 +1,8 @@
 import { useTokenWarningColor, useTokenWarningTextColor } from 'hooks/useTokenWarningColor'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { AlertTriangle, Slash } from 'react-feather'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 const Label = styled.div<{ color: string; backgroundColor: string }>`
diff --git a/apps/web/src/components/TokenSafety/TokenSafetyMessage.tsx b/apps/web/src/components/TokenSafety/TokenSafetyMessage.tsx
index 7d328f4fdf4..a527be12361 100644
--- a/apps/web/src/components/TokenSafety/TokenSafetyMessage.tsx
+++ b/apps/web/src/components/TokenSafety/TokenSafetyMessage.tsx
@@ -1,9 +1,9 @@
 import { displayWarningLabel, getWarningCopy, TOKEN_SAFETY_ARTICLE, Warning } from 'constants/tokenSafety'
 import { useTokenWarningColor, useTokenWarningTextColor } from 'hooks/useTokenWarningColor'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { AlertTriangle, Slash } from 'react-feather'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
 const Label = styled.div<{ color: string; backgroundColor: string }>`
diff --git a/apps/web/src/components/TokenSafety/index.tsx b/apps/web/src/components/TokenSafety/index.tsx
index a7d9d280c80..1f37dd151b5 100644
--- a/apps/web/src/components/TokenSafety/index.tsx
+++ b/apps/web/src/components/TokenSafety/index.tsx
@@ -12,10 +12,10 @@ import {
   Warning,
 } from 'constants/tokenSafety'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ExternalLink as LinkIconFeather } from 'react-feather'
 import { Text } from 'rebass'
 import { useAddUserToken } from 'state/user/hooks'
+import styled from 'styled-components'
 import { ButtonText, CopyLinkIcon, ExternalLink } from 'theme/components'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
diff --git a/apps/web/src/components/Tokens/TokenDetails/About.tsx b/apps/web/src/components/Tokens/TokenDetails/About.tsx
index 3588eca287a..8f9aec4e88a 100644
--- a/apps/web/src/components/Tokens/TokenDetails/About.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/About.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 
diff --git a/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx b/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
index c3fa2e3ff1b..b9031e90b1f 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
@@ -2,9 +2,9 @@ import Row from 'components/Row'
 import { TokenDetailsPoolsTable } from 'components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable'
 import { TransactionsTable } from 'components/Tokens/TokenDetails/tables/TransactionsTable'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useState } from 'react'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 
 const Container = styled.div`
diff --git a/apps/web/src/components/Tokens/TokenDetails/BalanceSummary.tsx b/apps/web/src/components/Tokens/TokenDetails/BalanceSummary.tsx
index 14b29f1c84b..c7a988b1698 100644
--- a/apps/web/src/components/Tokens/TokenDetails/BalanceSummary.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/BalanceSummary.tsx
@@ -3,10 +3,10 @@ import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioL
 import { getTokenDetailsURL, gqlToCurrency, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import {
   Chain,
diff --git a/apps/web/src/components/Tokens/TokenDetails/ChartSection/AdvancedPriceChartToggle.tsx b/apps/web/src/components/Tokens/TokenDetails/ChartSection/AdvancedPriceChartToggle.tsx
index d0a10456bf0..cfd4ac11e39 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ChartSection/AdvancedPriceChartToggle.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ChartSection/AdvancedPriceChartToggle.tsx
@@ -5,7 +5,7 @@ import Row from 'components/Row'
 import { ChartTypeDropdown } from 'components/Tokens/TokenDetails/ChartSection/ChartTypeSelector'
 import { useScreenSize } from 'hooks/screenSize'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { EllipsisStyle } from 'theme/components'
 
 const ChartTypeRow = styled(Row)`
diff --git a/apps/web/src/components/Tokens/TokenDetails/ChartSection/ChartTypeSelector.tsx b/apps/web/src/components/Tokens/TokenDetails/ChartSection/ChartTypeSelector.tsx
index 0b3dc5a16f4..72b2f1df74e 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ChartSection/ChartTypeSelector.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ChartSection/ChartTypeSelector.tsx
@@ -2,9 +2,9 @@ import { CHART_TYPE_LABELS, ChartType, PriceChartType } from 'components/Charts/
 import { DropdownSelector, InternalMenuItem } from 'components/DropdownSelector'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import { css, useTheme } from 'lib/styled-components'
 import { useReducer } from 'react'
 import { Check, Info } from 'react-feather'
+import { css, useTheme } from 'styled-components'
 import { isMobile } from 'utilities/src/platform'
 
 const StyledDropdownButton = css`
diff --git a/apps/web/src/components/Tokens/TokenDetails/ChartSection/index.tsx b/apps/web/src/components/Tokens/TokenDetails/ChartSection/index.tsx
index 981c5053a54..bff1d3ae82e 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ChartSection/index.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ChartSection/index.tsx
@@ -23,9 +23,9 @@ import {
 import { TimePeriod, toHistoryDuration } from 'graphql/data/util'
 import { Trans } from 'i18n'
 import { useAtomValue } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 export const TDP_CHART_HEIGHT_PX = 356
diff --git a/apps/web/src/components/Tokens/TokenDetails/Delta.tsx b/apps/web/src/components/Tokens/TokenDetails/Delta.tsx
index 69ff92cb201..a07f1aa87cf 100644
--- a/apps/web/src/components/Tokens/TokenDetails/Delta.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/Delta.tsx
@@ -1,6 +1,6 @@
 import { ArrowChangeDown } from 'components/Icons/ArrowChangeDown'
 import { ArrowChangeUp } from 'components/Icons/ArrowChangeUp'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 const StyledUpArrow = styled(ArrowChangeUp)<{ $noColor?: boolean }>`
   color: ${({ theme, $noColor }) => ($noColor ? theme.neutral2 : theme.success)};
diff --git a/apps/web/src/components/Tokens/TokenDetails/InvalidTokenDetails.tsx b/apps/web/src/components/Tokens/TokenDetails/InvalidTokenDetails.tsx
index b068c0ceda3..7e97750e655 100644
--- a/apps/web/src/components/Tokens/TokenDetails/InvalidTokenDetails.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/InvalidTokenDetails.tsx
@@ -4,8 +4,8 @@ import { useIsSupportedChainId } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import useSelectChain from 'hooks/useSelectChain'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { InterfaceChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/components/Tokens/TokenDetails/MobileBalanceSummaryFooter.tsx b/apps/web/src/components/Tokens/TokenDetails/MobileBalanceSummaryFooter.tsx
index 242f37045ea..6eab343d588 100644
--- a/apps/web/src/components/Tokens/TokenDetails/MobileBalanceSummaryFooter.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/MobileBalanceSummaryFooter.tsx
@@ -2,8 +2,8 @@ import { chainIdToBackendChain, useSupportedChainId } from 'constants/chains'
 import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
+import styled from 'styled-components'
 import { StyledInternalLink, ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/Tokens/TokenDetails/Resource.tsx b/apps/web/src/components/Tokens/TokenDetails/Resource.tsx
index 69665111d42..cbeb1141d41 100644
--- a/apps/web/src/components/Tokens/TokenDetails/Resource.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/Resource.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { darken } from 'polished'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
 const ResourceLink = styled(ExternalLink)`
diff --git a/apps/web/src/components/Tokens/TokenDetails/ShareButton.tsx b/apps/web/src/components/Tokens/TokenDetails/ShareButton.tsx
index 8bd53eee42f..311b40a1ce5 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ShareButton.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ShareButton.tsx
@@ -7,12 +7,12 @@ import useCopyClipboard from 'hooks/useCopyClipboard'
 import useDisableScrolling from 'hooks/useDisableScrolling'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useRef } from 'react'
 import { Link } from 'react-feather'
 import { useSearchParams } from 'react-router-dom'
 import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { useTheme } from 'styled-components'
 import { colors } from 'theme/colors'
 import { ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
diff --git a/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx b/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
index fa8a952474e..c90380487ca 100644
--- a/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
@@ -14,10 +14,10 @@ import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { getSupportedGraphQlChain } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { ChevronRight } from 'react-feather'
 import { useParams } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ClickableStyle } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
diff --git a/apps/web/src/components/Tokens/TokenDetails/StatsSection.tsx b/apps/web/src/components/Tokens/TokenDetails/StatsSection.tsx
index 970480dac51..af974b7fcc1 100644
--- a/apps/web/src/components/Tokens/TokenDetails/StatsSection.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/StatsSection.tsx
@@ -5,8 +5,8 @@ import { MouseoverTooltip } from 'components/Tooltip'
 import { useIsSupportedChainId } from 'constants/chains'
 import { TokenQueryData } from 'graphql/data/Token'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
diff --git a/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx b/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
index 809ccdcd760..9f5ea8b923b 100644
--- a/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
@@ -9,10 +9,10 @@ import Tooltip, { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { useSwapTaxes } from 'hooks/useSwapTaxes'
 import { t, Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useCallback, useReducer } from 'react'
 import { Copy } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ClickableStyle, EllipsisStyle, ExternalLink, ThemedText } from 'theme/components'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/components/Tokens/TokenDetails/TokenDetailsHeader.tsx b/apps/web/src/components/Tokens/TokenDetails/TokenDetailsHeader.tsx
index 36f4896009c..f2e1c9b64f4 100644
--- a/apps/web/src/components/Tokens/TokenDetails/TokenDetailsHeader.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/TokenDetailsHeader.tsx
@@ -15,11 +15,11 @@ import { useScreenSize } from 'hooks/screenSize'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { useReducer, useRef } from 'react'
 import { Link } from 'react-feather'
 import { useSearchParams } from 'react-router-dom'
+import styled, { useTheme } from 'styled-components'
 import { ClickableStyle, EllipsisStyle, ExternalLink, ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/components/Tokens/TokenDetails/index.tsx b/apps/web/src/components/Tokens/TokenDetails/index.tsx
index 448a550a48c..4a91cc3038a 100644
--- a/apps/web/src/components/Tokens/TokenDetails/index.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/index.tsx
@@ -22,13 +22,13 @@ import { useAccount } from 'hooks/useAccount'
 import useParsedQueryString from 'hooks/useParsedQueryString'
 import { ScrollDirection, useScroll } from 'hooks/useScroll'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Swap } from 'pages/Swap'
 import { useTDPContext } from 'pages/TokenDetails/TDPContext'
 import { PropsWithChildren, useCallback, useMemo, useState } from 'react'
 import { ChevronRight } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
 import { CurrencyState } from 'state/swap/types'
+import styled from 'styled-components'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/components/Tokens/TokenDetails/shared.ts b/apps/web/src/components/Tokens/TokenDetails/shared.ts
index e20ae317078..86f799bb4f8 100644
--- a/apps/web/src/components/Tokens/TokenDetails/shared.ts
+++ b/apps/web/src/components/Tokens/TokenDetails/shared.ts
@@ -1,5 +1,5 @@
-import styled, { css } from 'lib/styled-components'
 import { darken } from 'polished'
+import styled, { css } from 'styled-components'
 import { ClickableStyle } from 'theme/components'
 import { opacify } from 'theme/utils'
 
diff --git a/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx b/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
index 9f1446057dd..e8495715755 100644
--- a/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
@@ -19,8 +19,8 @@ import { TokenTransactionType, useTokenTransactions } from 'graphql/data/useToke
 import { OrderDirection, unwrapToken } from 'graphql/data/util'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useMemo, useReducer, useState } from 'react'
+import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { Token as GQLToken } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/components/Tokens/TokenTable/NetworkFilter.tsx b/apps/web/src/components/Tokens/TokenTable/NetworkFilter.tsx
index 05c04ef4fef..7627c7998ea 100644
--- a/apps/web/src/components/Tokens/TokenTable/NetworkFilter.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/NetworkFilter.tsx
@@ -10,12 +10,12 @@ import {
 } from 'constants/chains'
 import { getSupportedGraphQlChain, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { Trans } from 'i18n'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { ExploreTab } from 'pages/Explore'
 import { useExploreParams } from 'pages/Explore/redirects'
 import { useReducer } from 'react'
 import { Check } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
+import styled, { css, useTheme } from 'styled-components'
 import { EllipsisStyle } from 'theme/components'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
diff --git a/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx b/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
index af11921877c..9a77e6601ed 100644
--- a/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
@@ -6,8 +6,8 @@ import { exploreSearchStringAtom } from 'components/Tokens/state'
 import useDebounce from 'hooks/useDebounce'
 import { t } from 'i18n'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { useEffect, useState } from 'react'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 const ICON_SIZE = '20px'
 
diff --git a/apps/web/src/components/Tokens/TokenTable/TimeSelector.tsx b/apps/web/src/components/Tokens/TokenTable/TimeSelector.tsx
index 1252dda96f8..5d1fa4dc275 100644
--- a/apps/web/src/components/Tokens/TokenTable/TimeSelector.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/TimeSelector.tsx
@@ -4,9 +4,9 @@ import { TimePeriod } from 'graphql/data/util'
 import { useScreenSize } from 'hooks/screenSize'
 import { Trans } from 'i18n'
 import { useAtom } from 'jotai'
-import { css, useTheme } from 'lib/styled-components'
 import { useReducer } from 'react'
 import { Check } from 'react-feather'
+import { css, useTheme } from 'styled-components'
 
 export enum TimePeriodDisplay {
   HOUR = '1H',
diff --git a/apps/web/src/components/Tokens/TokenTable/index.tsx b/apps/web/src/components/Tokens/TokenTable/index.tsx
index 0b7f0908732..14c545a6614 100644
--- a/apps/web/src/components/Tokens/TokenTable/index.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/index.tsx
@@ -25,8 +25,8 @@ import { SparklineMap, TopToken, useTopTokens } from 'graphql/data/TopTokens'
 import { OrderDirection, getSupportedGraphQlChain, getTokenDetailsURL } from 'graphql/data/util'
 import { Trans } from 'i18n'
 import { useAtomValue } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { ReactElement, ReactNode, useMemo } from 'react'
+import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/Tokens/loading.tsx b/apps/web/src/components/Tokens/loading.tsx
index bfcc25cc316..a2f3765d24b 100644
--- a/apps/web/src/components/Tokens/loading.tsx
+++ b/apps/web/src/components/Tokens/loading.tsx
@@ -1,6 +1,6 @@
 import { loadingAnimation } from 'components/Loader/styled'
-import styled from 'lib/styled-components'
 import { lighten } from 'polished'
+import styled from 'styled-components'
 
 /* Loading state bubbles (animation style from: src/components/Loader/styled.tsx) */
 export const LoadingBubble = styled.div<{
diff --git a/apps/web/src/components/Tooltip/index.tsx b/apps/web/src/components/Tooltip/index.tsx
index e4bf223d746..3d74e9766e2 100644
--- a/apps/web/src/components/Tooltip/index.tsx
+++ b/apps/web/src/components/Tooltip/index.tsx
@@ -1,8 +1,8 @@
 import { Placement } from '@popperjs/core'
 import Popover, { PopoverProps } from 'components/Popover'
-import styled from 'lib/styled-components'
 import { transparentize } from 'polished'
 import { PropsWithChildren, ReactNode, useCallback, useEffect, useState } from 'react'
+import styled from 'styled-components'
 import noop from 'utilities/src/react/noop'
 
 export enum TooltipSize {
diff --git a/apps/web/src/components/TopLevelBanners/MobileAppPromoBanner.tsx b/apps/web/src/components/TopLevelBanners/MobileAppPromoBanner.tsx
index 728c9c67437..f9b7d6df387 100644
--- a/apps/web/src/components/TopLevelBanners/MobileAppPromoBanner.tsx
+++ b/apps/web/src/components/TopLevelBanners/MobileAppPromoBanner.tsx
@@ -4,11 +4,11 @@ import Row from 'components/Row'
 import { useEthersWeb3Provider } from 'hooks/useEthersProvider'
 import { useAtom } from 'jotai'
 import { useAtomValue } from 'jotai/utils'
-import styled, { useTheme } from 'lib/styled-components'
 import { useState } from 'react'
 import { X } from 'react-feather'
 import { Trans } from 'react-i18next'
 import { hideMobileAppPromoBannerAtom } from 'state/application/atoms'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/components/TopLevelBanners/UkBanner.tsx b/apps/web/src/components/TopLevelBanners/UkBanner.tsx
index 2afbb61986c..4c27985c91d 100644
--- a/apps/web/src/components/TopLevelBanners/UkBanner.tsx
+++ b/apps/web/src/components/TopLevelBanners/UkBanner.tsx
@@ -1,9 +1,9 @@
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useOpenModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import { useAppSelector } from 'state/hooks'
 import { AppState } from 'state/reducer'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ButtonText, ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/components/TopLevelModals/ExtensionLaunchModal.tsx b/apps/web/src/components/TopLevelModals/ExtensionLaunchModal.tsx
deleted file mode 100644
index 580dce05d1c..00000000000
--- a/apps/web/src/components/TopLevelModals/ExtensionLaunchModal.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { InterfaceElementName, InterfaceModalName } from '@uniswap/analytics-events'
-import UNIWALLET_ICON from 'assets/wallets/uniswap-wallet-icon.png'
-import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
-import Column from 'components/Column'
-import Modal from 'components/Modal'
-import Row from 'components/Row'
-import { AppIcon } from 'components/WalletModal/UniswapWalletOptions'
-import { useIsMobile } from 'hooks/screenSize'
-import useParsedQueryString from 'hooks/useParsedQueryString'
-import { Trans } from 'i18n'
-import { useAtom } from 'jotai'
-import { atomWithStorage } from 'jotai/utils'
-import styled from 'lib/styled-components'
-import { X } from 'react-feather'
-import { BREAKPOINTS } from 'theme'
-import { ClickableStyle, ExternalLink, ThemedText } from 'theme/components'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
-import Trace from 'uniswap/src/features/telemetry/Trace'
-
-const ModalWrapper = styled.div`
-  display: flex;
-  flex-direction: row;
-  height: 100%;
-  width: 100%;
-
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    flex-direction: column;
-  }
-  * {
-    outline: none;
-  }
-`
-
-const PromoImage = styled.img`
-  display: flex;
-  width: 240px;
-  height: 100%;
-  border-radius: 20px 0px 0px 20px;
-  background: url('/images/extension_promo/announcement_modal_desktop.png');
-  background-repeat: no-repeat;
-  background-size: cover;
-  flex: 1;
-
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    background: url('/images/extension_promo/announcement_modal_mobile.png');
-    background-size: cover;
-    background-position: 50%;
-    height: 392px;
-    width: 100%;
-    flex: unset;
-  }
-`
-
-const CloseIcon = styled(X)`
-  height: 20px;
-  width: 20px;
-  ${ClickableStyle}
-  color: ${({ theme }) => theme.neutral2};
-`
-
-const TextWrapper = styled(Column)`
-  padding: 20px 24px;
-  gap: 16px;
-  height: 100%;
-  flex: 1;
-
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    gap: 12px;
-    text-align: center;
-  }
-`
-
-const HeaderRow = styled(Row)`
-  justify-content: space-between;
-  align-items: flex-start;
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    display: none;
-  }
-`
-
-const StyledExternalLink = styled(ExternalLink)`
-  width: 100%;
-`
-
-const StyledThemeButton = styled(ThemeButton)`
-  padding: 8px 0px;
-  width: 100%;
-  border-radius: 12px;
-  ${ClickableStyle}
-
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    padding: 12px 20px;
-    border-radius: 16px;
-    font-size: 18px;
-    line-height: 24px;
-  }
-`
-
-// Once a user closes the modal, do not reopen for duration of session
-const showExtensionLaunchAtom = atomWithStorage('showUniswapExtensionLaunchAtom', true)
-
-export function ExtensionLaunchModal() {
-  const [showExtensionLaunch, setShowExtensionLaunch] = useAtom(showExtensionLaunchAtom)
-  const isOnLandingPage = useParsedQueryString().intro === 'true'
-  const isMobile = useIsMobile()
-
-  return (
-    <Trace modal={InterfaceModalName.EXTENSION_LAUNCH_PROMOTIONAL_MODAL}>
-      <Modal
-        maxWidth={isMobile ? undefined : 520}
-        height={isMobile ? 564 : 320}
-        isOpen={showExtensionLaunch && !isOnLandingPage}
-        hideBorder
-        onDismiss={() => setShowExtensionLaunch(false)}
-      >
-        <ModalWrapper>
-          <PromoImage />
-          <TextWrapper>
-            <HeaderRow>
-              <AppIcon src={UNIWALLET_ICON} alt="uniswap-app-icon" />
-              <Trace logPress element={InterfaceElementName.CLOSE_BUTTON}>
-                <CloseIcon onClick={() => setShowExtensionLaunch(false)} />
-              </Trace>
-            </HeaderRow>
-            <Column gap="xs">
-              <ThemedText.SubHeader>
-                <Trans i18nKey="extension.introduction" />
-              </ThemedText.SubHeader>
-              <ThemedText.SubHeaderSmall lineHeight="20px">
-                <Trans i18nKey="extension.announcement" />
-              </ThemedText.SubHeaderSmall>
-            </Column>
-            <Row gap="8px" marginTop="auto">
-              {isMobile && (
-                <Trace logPress element={InterfaceElementName.CLOSE_BUTTON}>
-                  <StyledThemeButton
-                    size={ButtonSize.small}
-                    emphasis={ButtonEmphasis.medium}
-                    onClick={() => setShowExtensionLaunch(false)}
-                  >
-                    <Trans i18nKey="common.dismiss" />
-                  </StyledThemeButton>
-                </Trace>
-              )}
-              <Trace logPress element={InterfaceElementName.LEARN_MORE_LINK}>
-                <StyledExternalLink href="https://wallet.uniswap.org//?utm_medium=promo-dialogue&utm_source=web-app&utm_campaign=ext-launch&utm_creative=learn-more">
-                  <StyledThemeButton
-                    size={ButtonSize.small}
-                    emphasis={isMobile ? ButtonEmphasis.high : ButtonEmphasis.medium}
-                    onClick={() => setShowExtensionLaunch(false)}
-                  >
-                    <Trans i18nKey="common.learnMore.link" />
-                  </StyledThemeButton>
-                </StyledExternalLink>
-              </Trace>
-              {!isMobile && (
-                <Trace logPress element={InterfaceElementName.EXTENSION_DOWNLOAD_BUTTON}>
-                  <StyledExternalLink href={uniswapUrls.chromeExtension}>
-                    <StyledThemeButton
-                      size={ButtonSize.small}
-                      emphasis={ButtonEmphasis.high}
-                      onClick={() => setShowExtensionLaunch(false)}
-                    >
-                      <Trans i18nKey="common.download" />
-                    </StyledThemeButton>
-                  </StyledExternalLink>
-                </Trace>
-              )}
-            </Row>
-          </TextWrapper>
-        </ModalWrapper>
-      </Modal>
-    </Trace>
-  )
-}
diff --git a/apps/web/src/components/TopLevelModals/UkDisclaimerModal.tsx b/apps/web/src/components/TopLevelModals/UkDisclaimerModal.tsx
index 37684ab755b..ef6a6c5a623 100644
--- a/apps/web/src/components/TopLevelModals/UkDisclaimerModal.tsx
+++ b/apps/web/src/components/TopLevelModals/UkDisclaimerModal.tsx
@@ -3,10 +3,10 @@ import Column from 'components/Column'
 import Modal from 'components/Modal'
 import { bannerText } from 'components/TopLevelBanners/UkBanner'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { X } from 'react-feather'
 import { useCloseModal, useModalIsOpen } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled from 'styled-components'
 import { ButtonText, ThemedText } from 'theme/components'
 
 const Wrapper = styled(Column)`
diff --git a/apps/web/src/components/TopLevelModals/index.tsx b/apps/web/src/components/TopLevelModals/index.tsx
index 59f16ea4118..db269f03ca2 100644
--- a/apps/web/src/components/TopLevelModals/index.tsx
+++ b/apps/web/src/components/TopLevelModals/index.tsx
@@ -1,14 +1,11 @@
 import { OffchainActivityModal } from 'components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal'
 import UniwalletModal from 'components/AccountDrawer/UniwalletModal'
-import { AddressQRModal } from 'components/AddressQRModal'
 import { Banners } from 'components/Banner/shared/Banners'
 import ConnectedAccountBlocked from 'components/ConnectedAccountBlocked'
 import FeatureFlagModal from 'components/FeatureFlagModal/FeatureFlagModal'
 import FiatOnrampModal from 'components/FiatOnrampModal'
 import { GetTheAppModal } from 'components/NavBar/DownloadApp/Modal'
 import { PrivacyPolicyModal } from 'components/PrivacyPolicy'
-import { ReceiveCryptoModal } from 'components/ReceiveCryptoModal'
-import { ExtensionLaunchModal } from 'components/TopLevelModals/ExtensionLaunchModal'
 import { UkDisclaimerModal } from 'components/TopLevelModals/UkDisclaimerModal'
 import AddressClaimModal from 'components/claim/AddressClaimModal'
 import DevFlagsBox from 'dev/DevFlagsBox'
@@ -18,8 +15,6 @@ import Bag from 'nft/components/bag/Bag'
 import TransactionCompleteModal from 'nft/components/collection/TransactionCompleteModal'
 import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
-import { FeatureFlags } from 'uniswap/src/features/gating/flags'
-import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { isBetaEnv, isDevEnv } from 'utilities/src/environment'
 
 export default function TopLevelModals() {
@@ -30,7 +25,6 @@ export default function TopLevelModals() {
   useAccountRiskCheck(account.address)
   const accountBlocked = Boolean(blockedAccountModalOpen && account.isConnected)
   const shouldShowDevFlags = isDevEnv() || isBetaEnv()
-  const extensionIsLaunched = useFeatureFlag(FeatureFlags.ExtensionLaunch)
 
   return (
     <>
@@ -44,14 +38,11 @@ export default function TopLevelModals() {
       <OffchainActivityModal />
       <TransactionCompleteModal />
       <FiatOnrampModal />
-      {account.address && <ReceiveCryptoModal />}
-      {account.address && <AddressQRModal accountAddress={account.address} />}
       <UkDisclaimerModal />
       <GetTheAppModal />
       <PrivacyPolicyModal />
       <FeatureFlagModal />
       {shouldShowDevFlags && <DevFlagsBox />}
-      {extensionIsLaunched && <ExtensionLaunchModal />}
     </>
   )
 }
diff --git a/apps/web/src/components/TransactionConfirmationModal/AnimatedConfirmation.tsx b/apps/web/src/components/TransactionConfirmationModal/AnimatedConfirmation.tsx
index 83958173293..84e074386f9 100644
--- a/apps/web/src/components/TransactionConfirmationModal/AnimatedConfirmation.tsx
+++ b/apps/web/src/components/TransactionConfirmationModal/AnimatedConfirmation.tsx
@@ -1,4 +1,4 @@
-import styled, { keyframes, useTheme } from 'lib/styled-components'
+import styled, { keyframes, useTheme } from 'styled-components'
 
 const Wrapper = styled.div<{ size?: string }>`
   height: 90px;
diff --git a/apps/web/src/components/TransactionConfirmationModal/index.tsx b/apps/web/src/components/TransactionConfirmationModal/index.tsx
index f5305dc4941..0b90a167184 100644
--- a/apps/web/src/components/TransactionConfirmationModal/index.tsx
+++ b/apps/web/src/components/TransactionConfirmationModal/index.tsx
@@ -13,15 +13,15 @@ import { useIsSupportedChainId } from 'constants/chains'
 import { useCurrencyInfo } from 'hooks/Tokens'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode, useCallback, useState } from 'react'
 import { AlertCircle, ArrowUpCircle, CheckCircle } from 'react-feather'
 import { isConfirmedTx, useTransaction } from 'state/transactions/hooks'
+import styled, { useTheme } from 'styled-components'
 import { CloseIcon, CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
-import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { L2ChainId, UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { isL2ChainId } from 'utils/chains'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
 const Wrapper = styled.div`
@@ -220,7 +220,7 @@ function L2Content({
 }: {
   onDismiss: () => void
   hash?: string
-  chainId: UniverseChainId
+  chainId: L2ChainId
   currencyToAdd?: Currency
   pendingText: ReactNode
   inline?: boolean // not in modal
diff --git a/apps/web/src/components/UniTag/UniTagProfilePicture.tsx b/apps/web/src/components/UniTag/UniTagProfilePicture.tsx
index 6b47ac1039b..d39cf322405 100644
--- a/apps/web/src/components/UniTag/UniTagProfilePicture.tsx
+++ b/apps/web/src/components/UniTag/UniTagProfilePicture.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
 
 const Container = styled.div<{ $iconSize: number }>`
diff --git a/apps/web/src/components/V2Unsupported/index.tsx b/apps/web/src/components/V2Unsupported/index.tsx
index b0446d0553f..8bdcc511c8f 100644
--- a/apps/web/src/components/V2Unsupported/index.tsx
+++ b/apps/web/src/components/V2Unsupported/index.tsx
@@ -1,6 +1,6 @@
 import { AutoColumn } from 'components/Column'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const TextWrapper = styled.div`
diff --git a/apps/web/src/components/WalletModal/ConnectionErrorView.tsx b/apps/web/src/components/WalletModal/ConnectionErrorView.tsx
index 9e1340a2a9e..44acc9fc41f 100644
--- a/apps/web/src/components/WalletModal/ConnectionErrorView.tsx
+++ b/apps/web/src/components/WalletModal/ConnectionErrorView.tsx
@@ -2,9 +2,9 @@ import { ButtonEmpty, ButtonPrimary } from 'components/Button'
 import Modal from 'components/Modal'
 import { useConnect } from 'hooks/useConnect'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useCallback } from 'react'
 import { AlertTriangle } from 'react-feather'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap } from 'theme/styles'
 
diff --git a/apps/web/src/components/WalletModal/DownloadWalletOption.tsx b/apps/web/src/components/WalletModal/DownloadWalletOption.tsx
deleted file mode 100644
index 65c35b13e74..00000000000
--- a/apps/web/src/components/WalletModal/DownloadWalletOption.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { InterfaceElementName } from '@uniswap/analytics-events'
-import UNIWALLET_ICON from 'assets/wallets/uniswap-wallet-icon.png'
-import Column from 'components/Column'
-import Row from 'components/Row'
-import { AppIcon, OptionContainer } from 'components/WalletModal/UniswapWalletOptions'
-import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
-import { useState } from 'react'
-import { useOpenModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
-import { colors } from 'theme/colors'
-import { Z_INDEX } from 'theme/zIndex'
-import { Text } from 'ui/src'
-import Trace from 'uniswap/src/features/telemetry/Trace'
-
-// The light background is needed so that when hovered the background image always becomes lighter even when the app is in dark mode
-const LightBackground = styled.div`
-  max-height: 72px;
-  width: 100%;
-  background: ${colors.surface1_light};
-  border-radius: 16px;
-  position: relative;
-`
-
-const BackgroundImage = styled.div<{ backgroundImage?: string; isHovered?: boolean }>`
-  background: url(${({ backgroundImage }) => backgroundImage});
-  background-repeat: no-repeat;
-  background-size: cover;
-  opacity: ${({ isHovered }) => (isHovered ? 0.54 : 1)};
-  max-height: 72px;
-  width: 100%;
-  height: 100%;
-  border-radius: 16px;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: ${Z_INDEX.deprecated_zero};
-  transition: opacity ${({ theme }) => theme.transition.duration.fast} ${({ theme }) => theme.transition.timing.inOut};
-`
-
-export const DownloadWalletOption = () => {
-  const openGetTheAppModal = useOpenModal(ApplicationModal.GET_THE_APP)
-  // Hovered state is passed from the background component to the background image which is layered underneath the option container
-  const [optionHovered, setOptionHovered] = useState(false)
-  return (
-    <Trace logPress element={InterfaceElementName.EXTENSION_DOWNLOAD_CONNECTOR}>
-      <LightBackground
-        onMouseEnter={() => setOptionHovered(true)}
-        onMouseLeave={() => setOptionHovered(false)}
-        data-testid="download-uniswap-wallet"
-      >
-        <BackgroundImage backgroundImage="/images/extension_promo/background_connector.png" isHovered={optionHovered} />
-        <OptionContainer onClick={openGetTheAppModal}>
-          <AppIcon src={UNIWALLET_ICON} alt="uniswap-app-icon" />
-          <Row gap="xs">
-            <Column>
-              <Text variant="buttonLabel3" color="$white" whiteSpace="nowrap">
-                <Trans i18nKey="common.getUniswapWallet" />
-              </Text>
-              <Text variant="body4" color="$white" whiteSpace="nowrap">
-                <Trans i18nKey="common.availableOnIOSAndroidChrome" />
-              </Text>
-            </Column>
-          </Row>
-        </OptionContainer>
-      </LightBackground>
-    </Trace>
-  )
-}
diff --git a/apps/web/src/components/WalletModal/Option.tsx b/apps/web/src/components/WalletModal/Option.tsx
index f2216fb8278..a90d3e51275 100644
--- a/apps/web/src/components/WalletModal/Option.tsx
+++ b/apps/web/src/components/WalletModal/Option.tsx
@@ -4,7 +4,7 @@ import Loader from 'components/Icons/LoadingSpinner'
 import { CONNECTOR_ICON_OVERRIDE_MAP, useRecentConnectorId } from 'components/Web3Provider/constants'
 import { useConnect } from 'hooks/useConnect'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap, flexRowNoWrap } from 'theme/styles'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/components/WalletModal/PrivacyPolicyNotice.tsx b/apps/web/src/components/WalletModal/PrivacyPolicyNotice.tsx
index 6507b3bd7c3..1e492c6801c 100644
--- a/apps/web/src/components/WalletModal/PrivacyPolicyNotice.tsx
+++ b/apps/web/src/components/WalletModal/PrivacyPolicyNotice.tsx
@@ -1,5 +1,5 @@
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 
 const StyledLink = styled(ExternalLink)`
@@ -10,7 +10,7 @@ const StyledLink = styled(ExternalLink)`
 export default function PrivacyPolicyNotice() {
   return (
     <ThemedText.BodySmall color="neutral2">
-      <Trans i18nKey="wallet.connectingAgreement" />{' '}
+      <Trans i18nKey="wallet.connectingAgreement" />
       <StyledLink href="https://uniswap.org/terms-of-service/">
         <Trans i18nKey="common.termsOfService" />{' '}
       </StyledLink>
diff --git a/apps/web/src/components/WalletModal/UniswapWalletOptions.test.tsx b/apps/web/src/components/WalletModal/UniswapWalletOptions.test.tsx
deleted file mode 100644
index c79da6a7080..00000000000
--- a/apps/web/src/components/WalletModal/UniswapWalletOptions.test.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { UniswapWalletOptions } from 'components/WalletModal/UniswapWalletOptions'
-import { useConnectorWithId } from 'components/WalletModal/useOrderedConnections'
-import { CONNECTION } from 'components/Web3Provider/constants'
-import { mocked } from 'test-utils/mocked'
-import { render, screen } from 'test-utils/render'
-import { UNISWAP_EXTENSION_CONNECTOR, WALLET_CONNECT_CONNECTOR } from 'test-utils/wagmi/fixtures'
-import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-
-jest.mock('components/WalletModal/useOrderedConnections', () => ({
-  useConnectorWithId: jest.fn(),
-}))
-
-jest.mock('uniswap/src/features/gating/hooks', () => ({
-  useFeatureFlag: jest.fn(),
-}))
-
-describe('UniswapWalletOptions Test', () => {
-  beforeEach(() => {
-    mocked(useConnectorWithId).mockImplementation((id) =>
-      id === CONNECTION.WALLET_CONNECT_CONNECTOR_ID ? WALLET_CONNECT_CONNECTOR : undefined,
-    )
-  })
-  it('Download wallet option should be visible if extension is not detected and launch flag is true', () => {
-    mocked(useConnectorWithId).mockImplementation((id) =>
-      id === CONNECTION.UNISWAP_EXTENSION_RDNS ? undefined : WALLET_CONNECT_CONNECTOR,
-    )
-    mocked(useFeatureFlag).mockReturnValue(true)
-    const { asFragment } = render(<UniswapWalletOptions />)
-    expect(asFragment()).toMatchSnapshot()
-    const downloadOption = screen.getByTestId('download-uniswap-wallet')
-    expect(downloadOption).toBeInTheDocument()
-  })
-  it('Download wallet option should not be visible if extension is not detected and launch flag is false', () => {
-    mocked(useConnectorWithId).mockImplementation((id) =>
-      id === CONNECTION.UNISWAP_EXTENSION_RDNS ? undefined : WALLET_CONNECT_CONNECTOR,
-    )
-    mocked(useFeatureFlag).mockReturnValue(false)
-    const { asFragment } = render(<UniswapWalletOptions />)
-    expect(asFragment()).toMatchSnapshot()
-    const downloadOption = screen.queryByTestId('download-uniswap-wallet')
-    expect(downloadOption).not.toBeInTheDocument()
-  })
-  it('Extension connecter should be shown if detected', () => {
-    mocked(useConnectorWithId).mockImplementation((id) =>
-      id === CONNECTION.UNISWAP_EXTENSION_RDNS ? UNISWAP_EXTENSION_CONNECTOR : WALLET_CONNECT_CONNECTOR,
-    )
-    mocked(useFeatureFlag).mockReturnValue(false)
-    const { asFragment } = render(<UniswapWalletOptions />)
-    expect(asFragment()).toMatchSnapshot()
-    const connectWallet = screen.getByTestId('connect-uniswap-extension')
-    expect(connectWallet).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/WalletModal/UniswapWalletOptions.tsx b/apps/web/src/components/WalletModal/UniswapWalletOptions.tsx
index e9a1d2e6102..e82a82f0e74 100644
--- a/apps/web/src/components/WalletModal/UniswapWalletOptions.tsx
+++ b/apps/web/src/components/WalletModal/UniswapWalletOptions.tsx
@@ -1,20 +1,15 @@
 import UNIWALLET_ICON from 'assets/wallets/uniswap-wallet-icon.png'
 import Column from 'components/Column'
 import Row from 'components/Row'
-import { DownloadWalletOption } from 'components/WalletModal/DownloadWalletOption'
 import { useConnectorWithId } from 'components/WalletModal/useOrderedConnections'
 import { CONNECTION } from 'components/Web3Provider/constants'
 import { useConnect } from 'hooks/useConnect'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
-import { BREAKPOINTS } from 'theme'
-import { Z_INDEX } from 'theme/zIndex'
+import styled from 'styled-components'
 import { Text } from 'ui/src'
-import { ScanQr } from 'ui/src/components/icons'
-import { FeatureFlags } from 'uniswap/src/features/gating/flags'
-import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
+import { Mobile, QrCode } from 'ui/src/components/icons'
 
-export const OptionContainer = styled(Row)`
+const OptionContainer = styled(Row)`
   padding: 16px;
   gap: 12px;
   border-radius: 16px;
@@ -23,45 +18,36 @@ export const OptionContainer = styled(Row)`
   max-height: 72px;
   justify-content: space-between;
   cursor: pointer;
-  position: relative;
-  z-index: ${Z_INDEX.default};
   :hover {
     background: ${({ theme }) => theme.surface3};
   }
 `
-
-export const AppIcon = styled.img`
+const AppIcon = styled.img`
   height: 40px;
   width: 40px;
   border-radius: 10px;
   fill: linear-gradient(0deg, #fff1ff 0%, rgba(255, 255, 255, 0) 100%), #fffbff;
   filter: drop-shadow(0px 1.179px 3.537px rgba(255, 117, 249, 0.24));
 `
-
 const TagContainer = styled.div`
-  @media screen and (max-width: ${BREAKPOINTS.xs}px) {
+  @media screen and (max-width: 300px) {
     display: none;
   }
 `
-
 export function UniswapWalletOptions() {
   const uniswapExtensionConnector = useConnectorWithId(CONNECTION.UNISWAP_EXTENSION_RDNS)
   const uniswapWalletConnectConnector = useConnectorWithId(CONNECTION.UNISWAP_WALLET_CONNECT_CONNECTOR_ID, {
     shouldThrow: true,
   })
-  const extensionIsLaunched = useFeatureFlag(FeatureFlags.ExtensionLaunch)
 
   const { connect } = useConnect()
 
   return (
     <Column gap="16px">
       <Column gap="md">
-        {uniswapExtensionConnector ? (
-          // If the extension is detected, show the option to connect
-          <OptionContainer
-            onClick={() => connect({ connector: uniswapExtensionConnector })}
-            data-testid="connect-uniswap-extension"
-          >
+        {/* TODO(WEB-3931): If extension is not installed, show onboarding option instead */}
+        {uniswapExtensionConnector && (
+          <OptionContainer onClick={() => connect({ connector: uniswapExtensionConnector })}>
             <AppIcon src={UNIWALLET_ICON} alt="uniswap-app-icon" />
             <Row gap="xs">
               <Text variant="buttonLabel3" color="$neutral1" whiteSpace="nowrap">
@@ -74,22 +60,22 @@ export function UniswapWalletOptions() {
               </Text>
             </TagContainer>
           </OptionContainer>
-        ) : // If the extension is not detected, show the option to download the app
-        extensionIsLaunched ? (
-          <DownloadWalletOption />
-        ) : null}
+        )}
         <OptionContainer gap="md" onClick={() => connect({ connector: uniswapWalletConnectConnector })}>
-          <ScanQr size="$icon.40" minWidth={40} color="$accent1" backgroundColor="$accent2" borderRadius={8} p={7} />
+          <Mobile size="$icon.40" minWidth={40} color="$accent1" backgroundColor="$accent2" borderRadius={8} p={7} />
           <Row gap="xs">
             <Column>
               <Text variant="buttonLabel3" color="$neutral1" whiteSpace="nowrap">
-                <Trans i18nKey="common.uniswapMobile" />
+                <Trans i18nKey="common.mobileWallet" />
               </Text>
               <Text variant="body4" color="$neutral2" whiteSpace="nowrap">
                 <Trans i18nKey="wallet.scanToConnect" />
               </Text>
             </Column>
           </Row>
+          <TagContainer>
+            <QrCode size={20} color="$neutral2" />
+          </TagContainer>
         </OptionContainer>
       </Column>
     </Column>
diff --git a/apps/web/src/components/WalletModal/__snapshots__/UniswapWalletOptions.test.tsx.snap b/apps/web/src/components/WalletModal/__snapshots__/UniswapWalletOptions.test.tsx.snap
deleted file mode 100644
index 58a58bdbcf3..00000000000
--- a/apps/web/src/components/WalletModal/__snapshots__/UniswapWalletOptions.test.tsx.snap
+++ /dev/null
@@ -1,646 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`UniswapWalletOptions Test Download wallet option should be visible if extension is not detected and launch flag is true 1`] = `
-<DocumentFragment>
-  .c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
-}
-
-.c1 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c9 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c4 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c5 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c8 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c10 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c2 {
-  max-height: 72px;
-  width: 100%;
-  background: #FFFFFF;
-  border-radius: 16px;
-  position: relative;
-}
-
-.c3 {
-  background: url(/images/extension_promo/background_connector.png);
-  background-repeat: no-repeat;
-  background-size: cover;
-  opacity: 1;
-  max-height: 72px;
-  width: 100%;
-  height: 100%;
-  border-radius: 16px;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 0;
-  -webkit-transition: opacity 125ms ease-in-out;
-  transition: opacity 125ms ease-in-out;
-}
-
-.c6 {
-  padding: 16px;
-  gap: 12px;
-  border-radius: 16px;
-  border: 1px solid #22222212;
-  overflow: hidden;
-  max-height: 72px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-}
-
-.c6:hover {
-  background: #22222212;
-}
-
-.c7 {
-  height: 40px;
-  width: 40px;
-  border-radius: 10px;
-  fill: linear-gradient(0deg,#fff1ff 0%,rgba(255,255,255,0) 100%),#fffbff;
-  -webkit-filter: drop-shadow(0px 1.179px 3.537px rgba(255,117,249,0.24));
-  filter: drop-shadow(0px 1.179px 3.537px rgba(255,117,249,0.24));
-}
-
-<span
-    class="t_light is_inversed _dsp_contents"
-  >
-    <span
-      class=" t_light _dsp_contents is_Theme"
-    >
-      <div
-        class="c0"
-      >
-        <div
-          class="c1"
-        >
-          <div
-            class="c2"
-            data-testid="download-uniswap-wallet"
-          >
-            <div
-              class="c3"
-            />
-            <div
-              class="c4 c5 c6"
-            >
-              <img
-                alt="uniswap-app-icon"
-                class="c7"
-                src="uniswap-wallet-icon.png"
-              />
-              <div
-                class="c4 c8"
-              >
-                <div
-                  class="c9"
-                >
-                  <span
-                    class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-137133827 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                    data-disable-theme="true"
-                  >
-                    Get Uniswap Wallet
-                  </span>
-                  <span
-                    class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-137133827 _fontSize-12px _lineHeight-16px _fontWeight-400 _whiteSpace-nowrap"
-                    data-disable-theme="true"
-                  >
-                    Available on iOS, Android, and Chrome
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="c4 c10 c6"
-          >
-            <svg
-              fill="none"
-              stroke-width="8"
-              style="color: rgb(252, 114, 255); width: 40px; height: 40px; min-width: 40px; background-color: rgb(255, 239, 255); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px; padding: 7px 7px 7px 7px;"
-              viewBox="0 0 22 22"
-            >
-              <path
-                d="M6.92609 1.83331H3.87053C3.33028 1.83331 2.81215 2.04793 2.43013 2.42995C2.04811 2.81197 1.8335 3.33009 1.8335 3.87035V6.92591M20.1668 6.92591V3.87035C20.1668 3.33009 19.9522 2.81197 19.5702 2.42995C19.1882 2.04793 18.67 1.83331 18.1298 1.83331H15.0742M15.0742 20.1666H18.1298C18.67 20.1666 19.1882 19.952 19.5702 19.57C19.9522 19.188 20.1668 18.6699 20.1668 18.1296V15.0741M1.8335 15.0741V18.1296C1.8335 18.6699 2.04811 19.188 2.43013 19.57C2.81215 19.952 3.33028 20.1666 3.87053 20.1666H6.92609M12.1829 12.1827V14.5483M12.1829 16.9139H14.5484V12.1827M14.5482 13.3654H16.9138M16.914 15.7311V16.9139M5.67739 5.08581H9.22578C9.5524 5.08581 9.81717 5.35059 9.81717 5.67721V9.22559C9.81717 9.55221 9.5524 9.81699 9.22578 9.81699H5.67739C5.35077 9.81699 5.08599 9.55221 5.08599 9.22559V5.67721C5.08599 5.35059 5.35077 5.08581 5.67739 5.08581ZM5.67739 12.1827H9.22578C9.5524 12.1827 9.81717 12.4475 9.81717 12.7741V16.3225C9.81717 16.6491 9.5524 16.9139 9.22578 16.9139H5.67739C5.35077 16.9139 5.08599 16.6491 5.08599 16.3225V12.7741C5.08599 12.4475 5.35077 12.1827 5.67739 12.1827ZM12.7743 5.08581H16.3226C16.6493 5.08581 16.914 5.35059 16.914 5.67721V9.22559C16.914 9.55221 16.6493 9.81699 16.3226 9.81699H12.7743C12.4476 9.81699 12.1829 9.55221 12.1829 9.22559V5.67721C12.1829 5.35059 12.4476 5.08581 12.7743 5.08581Z"
-                stroke="currentColor"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="1.75"
-              />
-            </svg>
-            <div
-              class="c4 c8"
-            >
-              <div
-                class="c9"
-              >
-                <span
-                  class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Uniswap Mobile
-                </span>
-                <span
-                  class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Scan QR code to connect
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </span>
-  </span>
-</DocumentFragment>
-`;
-
-exports[`UniswapWalletOptions Test Download wallet option should not be visible if extension is not detected and launch flag is false 1`] = `
-<DocumentFragment>
-  .c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
-}
-
-.c1 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c6 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c2 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c3 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c5 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c4 {
-  padding: 16px;
-  gap: 12px;
-  border-radius: 16px;
-  border: 1px solid #22222212;
-  overflow: hidden;
-  max-height: 72px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-}
-
-.c4:hover {
-  background: #22222212;
-}
-
-<span
-    class=" _dsp_contents"
-  >
-    <span
-      class=" t_light _dsp_contents is_Theme"
-    >
-      <div
-        class="c0"
-      >
-        <div
-          class="c1"
-        >
-          <div
-            class="c2 c3 c4"
-          >
-            <svg
-              fill="none"
-              stroke-width="8"
-              style="color: rgb(252, 114, 255); width: 40px; height: 40px; min-width: 40px; background-color: rgb(255, 239, 255); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px; padding: 7px 7px 7px 7px;"
-              viewBox="0 0 22 22"
-            >
-              <path
-                d="M6.92609 1.83331H3.87053C3.33028 1.83331 2.81215 2.04793 2.43013 2.42995C2.04811 2.81197 1.8335 3.33009 1.8335 3.87035V6.92591M20.1668 6.92591V3.87035C20.1668 3.33009 19.9522 2.81197 19.5702 2.42995C19.1882 2.04793 18.67 1.83331 18.1298 1.83331H15.0742M15.0742 20.1666H18.1298C18.67 20.1666 19.1882 19.952 19.5702 19.57C19.9522 19.188 20.1668 18.6699 20.1668 18.1296V15.0741M1.8335 15.0741V18.1296C1.8335 18.6699 2.04811 19.188 2.43013 19.57C2.81215 19.952 3.33028 20.1666 3.87053 20.1666H6.92609M12.1829 12.1827V14.5483M12.1829 16.9139H14.5484V12.1827M14.5482 13.3654H16.9138M16.914 15.7311V16.9139M5.67739 5.08581H9.22578C9.5524 5.08581 9.81717 5.35059 9.81717 5.67721V9.22559C9.81717 9.55221 9.5524 9.81699 9.22578 9.81699H5.67739C5.35077 9.81699 5.08599 9.55221 5.08599 9.22559V5.67721C5.08599 5.35059 5.35077 5.08581 5.67739 5.08581ZM5.67739 12.1827H9.22578C9.5524 12.1827 9.81717 12.4475 9.81717 12.7741V16.3225C9.81717 16.6491 9.5524 16.9139 9.22578 16.9139H5.67739C5.35077 16.9139 5.08599 16.6491 5.08599 16.3225V12.7741C5.08599 12.4475 5.35077 12.1827 5.67739 12.1827ZM12.7743 5.08581H16.3226C16.6493 5.08581 16.914 5.35059 16.914 5.67721V9.22559C16.914 9.55221 16.6493 9.81699 16.3226 9.81699H12.7743C12.4476 9.81699 12.1829 9.55221 12.1829 9.22559V5.67721C12.1829 5.35059 12.4476 5.08581 12.7743 5.08581Z"
-                stroke="currentColor"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="1.75"
-              />
-            </svg>
-            <div
-              class="c2 c5"
-            >
-              <div
-                class="c6"
-              >
-                <span
-                  class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Uniswap Mobile
-                </span>
-                <span
-                  class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Scan QR code to connect
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </span>
-  </span>
-</DocumentFragment>
-`;
-
-exports[`UniswapWalletOptions Test Extension connecter should be shown if detected 1`] = `
-<DocumentFragment>
-  .c0 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 16px;
-}
-
-.c1 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c9 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c2 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c3 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.c6 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 4px;
-}
-
-.c8 {
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  padding: 0;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  gap: 12px;
-}
-
-.c4 {
-  padding: 16px;
-  gap: 12px;
-  border-radius: 16px;
-  border: 1px solid #22222212;
-  overflow: hidden;
-  max-height: 72px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-}
-
-.c4:hover {
-  background: #22222212;
-}
-
-.c5 {
-  height: 40px;
-  width: 40px;
-  border-radius: 10px;
-  fill: linear-gradient(0deg,#fff1ff 0%,rgba(255,255,255,0) 100%),#fffbff;
-  -webkit-filter: drop-shadow(0px 1.179px 3.537px rgba(255,117,249,0.24));
-  filter: drop-shadow(0px 1.179px 3.537px rgba(255,117,249,0.24));
-}
-
-@media screen and (max-width:396px) {
-  .c7 {
-    display: none;
-  }
-}
-
-<span
-    class=" _dsp_contents"
-  >
-    <span
-      class=" t_light _dsp_contents is_Theme"
-    >
-      <div
-        class="c0"
-      >
-        <div
-          class="c1"
-        >
-          <div
-            class="c2 c3 c4"
-            data-testid="connect-uniswap-extension"
-          >
-            <img
-              alt="uniswap-app-icon"
-              class="c5"
-              src="uniswap-wallet-icon.png"
-            />
-            <div
-              class="c2 c6"
-            >
-              <span
-                class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                data-disable-theme="true"
-              >
-                Uniswap Extension
-              </span>
-            </div>
-            <div
-              class="c7"
-            >
-              <span
-                class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400"
-                data-disable-theme="true"
-              >
-                Detected
-              </span>
-            </div>
-          </div>
-          <div
-            class="c2 c8 c4"
-          >
-            <svg
-              fill="none"
-              stroke-width="8"
-              style="color: rgb(252, 114, 255); width: 40px; height: 40px; min-width: 40px; background-color: rgb(255, 239, 255); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px; padding: 7px 7px 7px 7px;"
-              viewBox="0 0 22 22"
-            >
-              <path
-                d="M6.92609 1.83331H3.87053C3.33028 1.83331 2.81215 2.04793 2.43013 2.42995C2.04811 2.81197 1.8335 3.33009 1.8335 3.87035V6.92591M20.1668 6.92591V3.87035C20.1668 3.33009 19.9522 2.81197 19.5702 2.42995C19.1882 2.04793 18.67 1.83331 18.1298 1.83331H15.0742M15.0742 20.1666H18.1298C18.67 20.1666 19.1882 19.952 19.5702 19.57C19.9522 19.188 20.1668 18.6699 20.1668 18.1296V15.0741M1.8335 15.0741V18.1296C1.8335 18.6699 2.04811 19.188 2.43013 19.57C2.81215 19.952 3.33028 20.1666 3.87053 20.1666H6.92609M12.1829 12.1827V14.5483M12.1829 16.9139H14.5484V12.1827M14.5482 13.3654H16.9138M16.914 15.7311V16.9139M5.67739 5.08581H9.22578C9.5524 5.08581 9.81717 5.35059 9.81717 5.67721V9.22559C9.81717 9.55221 9.5524 9.81699 9.22578 9.81699H5.67739C5.35077 9.81699 5.08599 9.55221 5.08599 9.22559V5.67721C5.08599 5.35059 5.35077 5.08581 5.67739 5.08581ZM5.67739 12.1827H9.22578C9.5524 12.1827 9.81717 12.4475 9.81717 12.7741V16.3225C9.81717 16.6491 9.5524 16.9139 9.22578 16.9139H5.67739C5.35077 16.9139 5.08599 16.6491 5.08599 16.3225V12.7741C5.08599 12.4475 5.35077 12.1827 5.67739 12.1827ZM12.7743 5.08581H16.3226C16.6493 5.08581 16.914 5.35059 16.914 5.67721V9.22559C16.914 9.55221 16.6493 9.81699 16.3226 9.81699H12.7743C12.4476 9.81699 12.1829 9.55221 12.1829 9.22559V5.67721C12.1829 5.35059 12.4476 5.08581 12.7743 5.08581Z"
-                stroke="currentColor"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="1.75"
-              />
-            </svg>
-            <div
-              class="c2 c6"
-            >
-              <div
-                class="c9"
-              >
-                <span
-                  class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Uniswap Mobile
-                </span>
-                <span
-                  class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-12px _lineHeight-16px _fontWeight-400 _whiteSpace-nowrap"
-                  data-disable-theme="true"
-                >
-                  Scan QR code to connect
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </span>
-  </span>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/WalletModal/index.tsx b/apps/web/src/components/WalletModal/index.tsx
index c12ee406145..b742045e4b0 100644
--- a/apps/web/src/components/WalletModal/index.tsx
+++ b/apps/web/src/components/WalletModal/index.tsx
@@ -1,8 +1,6 @@
 import IconButton from 'components/AccountDrawer/IconButton'
 import { useShowMoonpayText } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import Column from 'components/Column'
-import { CollapsedIcon } from 'components/Icons/Collapse'
-import { ExpandIcon } from 'components/Icons/Expand'
 import { Settings } from 'components/Icons/Settings'
 import Row, { AutoRow } from 'components/Row'
 import ConnectionErrorView from 'components/WalletModal/ConnectionErrorView'
@@ -10,24 +8,23 @@ import { Option } from 'components/WalletModal/Option'
 import PrivacyPolicyNotice from 'components/WalletModal/PrivacyPolicyNotice'
 import { UniswapWalletOptions } from 'components/WalletModal/UniswapWalletOptions'
 import { useOrderedConnections } from 'components/WalletModal/useOrderedConnections'
-import { useIsUniExtensionAvailable, useUniswapWalletOptions } from 'hooks/useUniswapWalletOptions'
+import { useUniswapWalletOptions } from 'hooks/useUniswapWalletOptions'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
-import { useReducer } from 'react'
-import { ClickableStyle, ThemedText } from 'theme/components'
+import styled from 'styled-components'
+import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap } from 'theme/styles'
 import { Text } from 'ui/src'
 
-const Wrapper = styled.div<{ isUniExtensionAvailable?: boolean }>`
+const Wrapper = styled.div`
   ${flexColumnNoWrap};
   background-color: ${({ theme }) => theme.surface1};
   width: 100%;
-  padding: ${({ isUniExtensionAvailable }) => (isUniExtensionAvailable ? 0 : 14)}px 16px 16px;
+  padding: 14px 16px 16px;
   flex: 1;
   gap: 16px;
 `
 
-const OptionGrid = styled.div<{ closed?: boolean }>`
+const OptionGrid = styled.div`
   display: grid;
   flex: 1;
   grid-gap: 2px;
@@ -36,49 +33,25 @@ const OptionGrid = styled.div<{ closed?: boolean }>`
   ${({ theme }) => theme.deprecated_mediaWidth.deprecated_upToMedium`
     grid-template-columns: 1fr;
   `};
-  opacity ${({ closed }) => (closed ? 0 : 1)};
-  max-height: ${({ closed }) => (closed ? 0 : '100vh')};
-  transition: ${({ theme }) => `max-height ${theme.transition.duration.fast} ${theme.transition.timing.inOut}, opacity ${theme.transition.duration.fast} ${theme.transition.timing.inOut}`};
 `
 
 const TextSectionWrapper = styled.div`
   padding: 0 4px;
 `
 
-const OtherWalletsDividerRow = styled(Row)<{ clickable?: boolean }>`
-  ${({ clickable }) => clickable && ClickableStyle};
-  user-select: none;
-`
 const Line = styled.div`
   height: 1px;
   width: 100%;
   background: ${({ theme }) => theme.surface3};
 `
 
-const OtherWalletIconStyles = css`
-  height: 20px;
-  width: 20px;
-  fill: ${({ theme }) => theme.neutral2};
-  flex-shrink: 0;
-`
-
-const StyledExpandIcon = styled(ExpandIcon)`
-  ${OtherWalletIconStyles}
-`
-
-const StyledCollapsedIcon = styled(CollapsedIcon)`
-  ${OtherWalletIconStyles}
-`
-
 export default function WalletModal({ openSettings }: { openSettings: () => void }) {
   const showMoonpayText = useShowMoonpayText()
   const showUniswapWalletOptions = useUniswapWalletOptions()
   const connectors = useOrderedConnections(showUniswapWalletOptions)
-  const isUniExtensionAvailable = useIsUniExtensionAvailable()
-  const [showOtherWallets, toggleShowOtherWallets] = useReducer((s) => !s, true)
 
   return (
-    <Wrapper data-testid="wallet-modal" isUniExtensionAvailable={isUniExtensionAvailable}>
+    <Wrapper data-testid="wallet-modal">
       <ConnectionErrorView />
       <AutoRow justify="space-between" width="100%">
         <ThemedText.SubHeader>Connect a wallet</ThemedText.SubHeader>
@@ -87,26 +60,18 @@ export default function WalletModal({ openSettings }: { openSettings: () => void
       {showUniswapWalletOptions && (
         <>
           <UniswapWalletOptions />
-          <OtherWalletsDividerRow
-            align="center"
-            padding="8px 0px"
-            clickable={isUniExtensionAvailable}
-            onClick={() => isUniExtensionAvailable && toggleShowOtherWallets()}
-          >
+          <Row align="center" padding="8px 0px">
             <Line />
-            <Row align="center" marginX={18}>
-              <Text variant="body3" color="$neutral2" whiteSpace="nowrap">
-                <Trans i18nKey="wallet.other" />
-              </Text>
-              {isUniExtensionAvailable ? showOtherWallets ? <StyledExpandIcon /> : <StyledCollapsedIcon /> : null}
-            </Row>
+            <Text variant="body3" color="$neutral2" mx={18} whiteSpace="nowrap">
+              <Trans i18nKey="wallet.other" />
+            </Text>
             <Line />
-          </OtherWalletsDividerRow>
+          </Row>
         </>
       )}
       <Column gap="md" flex="1">
         <Row flex="1" align="flex-start">
-          <OptionGrid data-testid="option-grid" closed={isUniExtensionAvailable && !showOtherWallets}>
+          <OptionGrid data-testid="option-grid">
             {connectors.map((c) => (
               <Option connector={c} key={c.uid} />
             ))}
diff --git a/apps/web/src/components/WalletModal/useOrderedConnections.tsx b/apps/web/src/components/WalletModal/useOrderedConnections.tsx
index 9ff5533df38..f4f5a6178db 100644
--- a/apps/web/src/components/WalletModal/useOrderedConnections.tsx
+++ b/apps/web/src/components/WalletModal/useOrderedConnections.tsx
@@ -126,41 +126,3 @@ export function useOrderedConnections(excludeUniswapConnections?: boolean) {
     return orderedConnectors
   }, [connectors, excludeUniswapConnections, sortByRecent])
 }
-
-export enum ExtensionRequestMethods {
-  OPEN_SIDEBAR = 'uniswap_openSidebar',
-}
-
-const ExtensionRequestArguments = {
-  [ExtensionRequestMethods.OPEN_SIDEBAR]: ['Tokens', 'Activity'],
-} as const
-
-export function useUniswapExtensionConnector() {
-  const connector = useConnectorWithId(CONNECTION.UNISWAP_EXTENSION_RDNS)
-  const extensionRequest = useCallback(
-    async <
-      Type extends keyof typeof ExtensionRequestArguments,
-      Key extends (typeof ExtensionRequestArguments)[Type][number],
-    >(
-      method: Type,
-      arg: Key,
-    ) => {
-      const provider = (await connector?.getProvider()) as {
-        request?: (params: { method: Type; params: Key[] }) => Promise<void>
-      }
-      if (!provider.request) {
-        return
-      }
-
-      await provider.request({
-        method,
-        params: [arg],
-      })
-    },
-    [connector],
-  )
-
-  return useMemo(() => {
-    return connector ? { ...connector, extensionRequest } : undefined
-  }, [connector, extensionRequest])
-}
diff --git a/apps/web/src/components/WalletOneLinkQR/index.tsx b/apps/web/src/components/WalletOneLinkQR/index.tsx
index 2d87f19bb70..75c15a0b4d4 100644
--- a/apps/web/src/components/WalletOneLinkQR/index.tsx
+++ b/apps/web/src/components/WalletOneLinkQR/index.tsx
@@ -1,5 +1,5 @@
-import { useTheme } from 'lib/styled-components'
 import { ComponentProps } from 'react'
+import { useTheme } from 'styled-components'
 
 export const WalletOneLinkQR = (props: ComponentProps<'svg'>) => {
   const theme = useTheme()
diff --git a/apps/web/src/components/Web3Status/index.tsx b/apps/web/src/components/Web3Status/index.tsx
index 47b6cdcf237..6eb4decaa98 100644
--- a/apps/web/src/components/Web3Status/index.tsx
+++ b/apps/web/src/components/Web3Status/index.tsx
@@ -11,12 +11,11 @@ import { PrefetchBalancesWrapper } from 'graphql/data/apollo/TokenBalancesProvid
 import { navSearchInputVisibleSize } from 'hooks/screenSize/useScreenSize'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import { atom, useAtom } from 'jotai'
-import styled from 'lib/styled-components'
 import { Portal } from 'nft/components/common/Portal'
 import { darken } from 'polished'
-import { RefObject, useCallback, useEffect, useRef } from 'react'
+import { useCallback } from 'react'
 import { useAppSelector } from 'state/hooks'
+import styled from 'styled-components'
 import { flexRowNoWrap } from 'theme/styles'
 import { Unitag } from 'ui/src/components/icons'
 import Trace from 'uniswap/src/features/telemetry/Trace'
@@ -129,18 +128,9 @@ const StyledConnectButton = styled.button`
   color: inherit;
 `
 
-export const Web3StatusRef = atom<RefObject<HTMLElement> | undefined>(undefined)
-
 function Web3StatusInner() {
   const switchingChain = useAppSelector((state) => state.wallets.switchingChain)
   const account = useAccount()
-  const ref = useRef<HTMLDivElement>(null)
-  const [, setRef] = useAtom(Web3StatusRef)
-
-  // To share the Connect button ref with the AccountDrawer modal so it doesn't trigger useOnClickOutside
-  useEffect(() => {
-    setRef(ref)
-  }, [setRef])
 
   const accountDrawer = useAccountDrawer()
   const handleWalletDropdownClick = useCallback(() => {
@@ -154,7 +144,7 @@ function Web3StatusInner() {
   // TODO(WEB-4173): Remove isIFrame check when we can update wagmi to version >= 2.9.4
   if ((account.isConnecting || account.isReconnecting) && hasRecent && !isIFramed()) {
     return (
-      <Web3StatusConnecting disabled={true} onClick={handleWalletDropdownClick} ref={ref}>
+      <Web3StatusConnecting disabled={true} onClick={handleWalletDropdownClick}>
         <IconWrapper size={24}>
           <LoaderV3 size="24px" />
         </IconWrapper>
@@ -174,7 +164,6 @@ function Web3StatusInner() {
           data-testid="web3-status-connected"
           onClick={handleWalletDropdownClick}
           pending={hasPendingActivity}
-          ref={ref}
         >
           {!hasPendingActivity && <StatusIcon size={24} showMiniIcons={false} />}
           {hasPendingActivity ? (
@@ -204,7 +193,6 @@ function Web3StatusInner() {
           tabIndex={0}
           onKeyPress={(e) => e.key === 'Enter' && handleWalletDropdownClick()}
           onClick={handleWalletDropdownClick}
-          ref={ref}
         >
           <StyledConnectButton tabIndex={-1} data-testid="navbar-connect-wallet">
             <Trans i18nKey="common.connect.button" />
diff --git a/apps/web/src/components/addLiquidity/OwnershipWarning.tsx b/apps/web/src/components/addLiquidity/OwnershipWarning.tsx
index cc39cb8c710..2e84a756594 100644
--- a/apps/web/src/components/addLiquidity/OwnershipWarning.tsx
+++ b/apps/web/src/components/addLiquidity/OwnershipWarning.tsx
@@ -1,6 +1,6 @@
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { AlertTriangle } from 'react-feather'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const ExplainerText = styled.div`
diff --git a/apps/web/src/components/addLiquidity/PoolWarning.tsx b/apps/web/src/components/addLiquidity/PoolWarning.tsx
index ed9178332dc..b3f08bd2b41 100644
--- a/apps/web/src/components/addLiquidity/PoolWarning.tsx
+++ b/apps/web/src/components/addLiquidity/PoolWarning.tsx
@@ -1,8 +1,8 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { Text } from 'ui/src'
 import { AlertTriangle } from 'ui/src/components/icons'
diff --git a/apps/web/src/components/claim/AddressClaimModal.tsx b/apps/web/src/components/claim/AddressClaimModal.tsx
index bd12edaab95..3c64f9c352b 100644
--- a/apps/web/src/components/claim/AddressClaimModal.tsx
+++ b/apps/web/src/components/claim/AddressClaimModal.tsx
@@ -11,10 +11,10 @@ import { Break, CardBGImage, CardBGImageSmaller, CardNoise, CardSection, DataCar
 import { useAccount } from 'hooks/useAccount'
 import useENS from 'hooks/useENS'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useState } from 'react'
 import { useClaimCallback, useUserHasAvailableClaim, useUserUnclaimedAmount } from 'state/claim/hooks'
 import { useIsTransactionPending } from 'state/transactions/hooks'
+import styled from 'styled-components'
 import { CloseIcon, CustomLightSpinner, ExternalLink, ThemedText, UniTokenAnimated } from 'theme/components'
 import { Text } from 'ui/src'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/components/earn/styled.tsx b/apps/web/src/components/earn/styled.tsx
index 8167d7737dc..45dad0e6228 100644
--- a/apps/web/src/components/earn/styled.tsx
+++ b/apps/web/src/components/earn/styled.tsx
@@ -2,7 +2,7 @@ import uImage from 'assets/images/big_unicorn.png'
 import noise from 'assets/images/noise.png'
 import xlUnicorn from 'assets/images/xl_uni.png'
 import { AutoColumn } from 'components/Column'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const DataCard = styled(AutoColumn)<{ disabled?: boolean }>`
   background: radial-gradient(76.02% 75.41% at 1.84% 0%, #ff007a 0%, #2172e5 100%);
diff --git a/apps/web/src/components/swap/DetailLineItem.tsx b/apps/web/src/components/swap/DetailLineItem.tsx
index 5d2824cfc20..31641bf25a7 100644
--- a/apps/web/src/components/swap/DetailLineItem.tsx
+++ b/apps/web/src/components/swap/DetailLineItem.tsx
@@ -3,8 +3,8 @@ import { RowBetween } from 'components/Row'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import { useIsMobile } from 'hooks/screenSize'
 import useHoverProps from 'hooks/useHoverProps'
-import styled from 'lib/styled-components'
 import { PropsWithChildren } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 export type LineItemData = {
diff --git a/apps/web/src/components/swap/GasBreakdownTooltip.tsx b/apps/web/src/components/swap/GasBreakdownTooltip.tsx
index 3418567589f..587c9214d9c 100644
--- a/apps/web/src/components/swap/GasBreakdownTooltip.tsx
+++ b/apps/web/src/components/swap/GasBreakdownTooltip.tsx
@@ -5,10 +5,10 @@ import Row from 'components/Row'
 import { chainIdToBackendChain, useSupportedChainId } from 'constants/chains'
 import { nativeOnChain } from 'constants/tokens'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { InterfaceTrade } from 'state/routing/types'
 import { isPreviewTrade, isUniswapXTrade } from 'state/routing/utils'
+import styled from 'styled-components'
 import { Divider, ExternalLink, ThemedText } from 'theme/components'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/swap/GasEstimateTooltip.tsx b/apps/web/src/components/swap/GasEstimateTooltip.tsx
index 7ba1860f6a5..89df73acad0 100644
--- a/apps/web/src/components/swap/GasEstimateTooltip.tsx
+++ b/apps/web/src/components/swap/GasEstimateTooltip.tsx
@@ -6,10 +6,10 @@ import Row, { RowFixed } from 'components/Row'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import { GasBreakdownTooltip } from 'components/swap/GasBreakdownTooltip'
 import { SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
-import styled from 'lib/styled-components'
 import { SubmittableTrade } from 'state/routing/types'
 import { isUniswapXTrade } from 'state/routing/utils'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/swap/LimitDisclaimer.tsx b/apps/web/src/components/swap/LimitDisclaimer.tsx
index 6649086d517..491b7cd160d 100644
--- a/apps/web/src/components/swap/LimitDisclaimer.tsx
+++ b/apps/web/src/components/swap/LimitDisclaimer.tsx
@@ -1,6 +1,6 @@
 import Column from 'components/Column'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 
 const Container = styled(Column)`
diff --git a/apps/web/src/components/swap/PriceImpactModal.tsx b/apps/web/src/components/swap/PriceImpactModal.tsx
index 8399a282117..ee62b2123e8 100644
--- a/apps/web/src/components/swap/PriceImpactModal.tsx
+++ b/apps/web/src/components/swap/PriceImpactModal.tsx
@@ -4,8 +4,8 @@ import { ColumnCenter } from 'components/Column'
 import Modal from 'components/Modal'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { AlertTriangle } from 'react-feather'
+import styled from 'styled-components'
 import { CloseIcon, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/swap/PriceImpactWarning.tsx b/apps/web/src/components/swap/PriceImpactWarning.tsx
index 1e365d35b40..20b9c019b38 100644
--- a/apps/web/src/components/swap/PriceImpactWarning.tsx
+++ b/apps/web/src/components/swap/PriceImpactWarning.tsx
@@ -4,7 +4,7 @@ import { AutoColumn } from 'components/Column'
 import { RowBetween, RowFixed } from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
 import { useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/swap/SwapDetails.tsx b/apps/web/src/components/swap/SwapDetails.tsx
index ba7563036f5..2a1dc4d8a5d 100644
--- a/apps/web/src/components/swap/SwapDetails.tsx
+++ b/apps/web/src/components/swap/SwapDetails.tsx
@@ -12,7 +12,6 @@ import { SwapCallbackError, SwapShowAcceptChanges } from 'components/swap/styled
 import { Allowance, AllowanceState } from 'hooks/usePermit2Allowance'
 import { SwapResult } from 'hooks/useSwapCallback'
 import { Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import ms from 'ms'
 import { ReactNode, useMemo, useState } from 'react'
 import { AlertTriangle } from 'react-feather'
@@ -21,6 +20,7 @@ import { Text } from 'rebass'
 import { InterfaceTrade, LimitOrderTrade, RouterPreference } from 'state/routing/types'
 import { isClassicTrade, isLimitTrade } from 'state/routing/utils'
 import { useRouterPreference, useUserSlippageTolerance } from 'state/user/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, Separator, ThemedText } from 'theme/components'
 import { SpinningLoader } from 'ui/src'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/components/swap/SwapDetailsDropdown.tsx b/apps/web/src/components/swap/SwapDetailsDropdown.tsx
index e13ab12753d..1ad39b87b39 100644
--- a/apps/web/src/components/swap/SwapDetailsDropdown.tsx
+++ b/apps/web/src/components/swap/SwapDetailsDropdown.tsx
@@ -8,12 +8,12 @@ import GasEstimateTooltip from 'components/swap/GasEstimateTooltip'
 import SwapLineItem, { SwapLineItemType } from 'components/swap/SwapLineItem'
 import TradePrice from 'components/swap/TradePrice'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { formatCommonPropertiesForTrade } from 'lib/utils/analytics'
 import { useState } from 'react'
 import { ChevronDown } from 'react-feather'
 import { InterfaceTrade } from 'state/routing/types'
 import { isSubmittableTrade } from 'state/routing/utils'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
diff --git a/apps/web/src/components/swap/SwapHeader.tsx b/apps/web/src/components/swap/SwapHeader.tsx
index 374f4828ec0..d6a85f0d8c4 100644
--- a/apps/web/src/components/swap/SwapHeader.tsx
+++ b/apps/web/src/components/swap/SwapHeader.tsx
@@ -3,10 +3,10 @@ import SettingsTab from 'components/Settings'
 import SwapBuyFiatButton from 'components/swap/SwapBuyFiatButton'
 import { SwapHeaderTabButton } from 'components/swap/styled'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useCallback, useEffect, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { useSwapAndLimitContext, useSwapContext } from 'state/swap/hooks'
+import styled from 'styled-components'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
@@ -48,10 +48,6 @@ export default function SwapHeader({ compact, syncTabToUrl }: { compact: boolean
   useEffect(() => {
     if (pathname === '/buy') {
       setCurrentTab(forAggregatorEnabled ? SwapTab.Buy : SwapTab.Swap)
-    } else if (pathname === '/send' && isIFramed()) {
-      // Redirect to swap if send tab is iFramed (we do not allow the send tab to be iFramed due to clickjacking protections)
-      // https://www.notion.so/uniswaplabs/What-is-not-allowed-to-be-iFramed-Clickjacking-protections-874f85f066c648afa0eb3480b3f47b5c#d0ebf1846c83475a86342a594f77eae5
-      setCurrentTab(SwapTab.Swap)
     } else {
       setCurrentTab(PathnameToTab[pathname] ?? SwapTab.Swap)
     }
diff --git a/apps/web/src/components/swap/SwapLineItem.tsx b/apps/web/src/components/swap/SwapLineItem.tsx
index cf508af5124..41dcacf832e 100644
--- a/apps/web/src/components/swap/SwapLineItem.tsx
+++ b/apps/web/src/components/swap/SwapLineItem.tsx
@@ -12,13 +12,13 @@ import TradePrice from 'components/swap/TradePrice'
 import { SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
 import { useUSDPrice } from 'hooks/useUSDPrice'
 import { Trans, t } from 'i18n'
-import styled, { DefaultTheme } from 'lib/styled-components'
 import React, { ReactNode, useEffect, useState } from 'react'
 import { SpringValue, animated } from 'react-spring'
 import { InterfaceTrade, SubmittableTrade, TradeFillType } from 'state/routing/types'
 import { isLimitTrade, isPreviewTrade, isUniswapXTrade, isUniswapXTradeType } from 'state/routing/utils'
 import { useUserSlippageTolerance } from 'state/user/hooks'
 import { SlippageTolerance } from 'state/user/types'
+import styled, { DefaultTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { getPriceImpactColor } from 'utils/prices'
diff --git a/apps/web/src/components/swap/SwapModalHeaderAmount.tsx b/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
index d769a295639..73ac2a552b2 100644
--- a/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
+++ b/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
@@ -5,9 +5,9 @@ import Row from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Field } from 'components/swap/constants'
 import { useWindowSize } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { PropsWithChildren, ReactNode } from 'react'
 import { TextProps } from 'rebass'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/swap/SwapPreview.tsx b/apps/web/src/components/swap/SwapPreview.tsx
index b831ed0a226..05cdad7b633 100644
--- a/apps/web/src/components/swap/SwapPreview.tsx
+++ b/apps/web/src/components/swap/SwapPreview.tsx
@@ -4,9 +4,9 @@ import { SwapModalHeaderAmount } from 'components/swap/SwapModalHeaderAmount'
 import { Field } from 'components/swap/constants'
 import { useUSDPrice } from 'hooks/useUSDPrice'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { InterfaceTrade } from 'state/routing/types'
 import { isPreviewTrade } from 'state/routing/utils'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const HeaderContainer = styled(AutoColumn)`
diff --git a/apps/web/src/components/swap/SwapSkeleton.tsx b/apps/web/src/components/swap/SwapSkeleton.tsx
index 09f629316c8..f29bbbe0831 100644
--- a/apps/web/src/components/swap/SwapSkeleton.tsx
+++ b/apps/web/src/components/swap/SwapSkeleton.tsx
@@ -1,7 +1,7 @@
 import { ArrowContainer, ArrowWrapper } from 'components/swap/styled'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ArrowDown } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const StyledArrowWrapper = styled(ArrowWrapper)`
diff --git a/apps/web/src/components/swap/TradePrice.tsx b/apps/web/src/components/swap/TradePrice.tsx
index 72781dfba62..78193f20454 100644
--- a/apps/web/src/components/swap/TradePrice.tsx
+++ b/apps/web/src/components/swap/TradePrice.tsx
@@ -1,8 +1,8 @@
 import { Currency, Price } from '@uniswap/sdk-core'
 import { useUSDPrice } from 'hooks/useUSDPrice'
-import styled from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { useCallback, useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/components/swap/UnsupportedCurrencyFooter.tsx b/apps/web/src/components/swap/UnsupportedCurrencyFooter.tsx
index dc8fb6dfcf4..a5852486b7c 100644
--- a/apps/web/src/components/swap/UnsupportedCurrencyFooter.tsx
+++ b/apps/web/src/components/swap/UnsupportedCurrencyFooter.tsx
@@ -8,8 +8,8 @@ import { AutoRow, RowBetween } from 'components/Row'
 import { useCurrencyInfo } from 'hooks/Tokens'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useState } from 'react'
+import styled from 'styled-components'
 import { CloseIcon, ExternalLink, ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 import { Text } from 'ui/src'
diff --git a/apps/web/src/components/swap/styled.tsx b/apps/web/src/components/swap/styled.tsx
index 495a1c9914c..187d4ec6dc0 100644
--- a/apps/web/src/components/swap/styled.tsx
+++ b/apps/web/src/components/swap/styled.tsx
@@ -1,8 +1,8 @@
 import { AutoColumn } from 'components/Column'
-import styled, { css } from 'lib/styled-components'
 import { transparentize } from 'polished'
 import { ReactNode } from 'react'
 import { AlertTriangle } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { ButtonText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/components/vote/DelegateModal.tsx b/apps/web/src/components/vote/DelegateModal.tsx
index 70f094dba41..71aaaa999ea 100644
--- a/apps/web/src/components/vote/DelegateModal.tsx
+++ b/apps/web/src/components/vote/DelegateModal.tsx
@@ -10,10 +10,10 @@ import { useAccount } from 'hooks/useAccount'
 import useENS from 'hooks/useENS'
 import { Trans } from 'i18n'
 import { useTokenBalance } from 'lib/hooks/useCurrencyBalance'
-import styled from 'lib/styled-components'
 import { ReactNode, useState } from 'react'
 import { X } from 'react-feather'
 import { useDelegateCallback } from 'state/governance/hooks'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import { logger } from 'utilities/src/logger/logger'
diff --git a/apps/web/src/components/vote/ExecuteModal.tsx b/apps/web/src/components/vote/ExecuteModal.tsx
index 0e551269d7f..bf57a74688e 100644
--- a/apps/web/src/components/vote/ExecuteModal.tsx
+++ b/apps/web/src/components/vote/ExecuteModal.tsx
@@ -5,10 +5,10 @@ import Modal from 'components/Modal'
 import { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import { useExecuteCallback } from 'state/governance/hooks'
+import styled, { useTheme } from 'styled-components'
 import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
 import { logger } from 'utilities/src/logger/logger'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
diff --git a/apps/web/src/components/vote/ProposalEmptyState.tsx b/apps/web/src/components/vote/ProposalEmptyState.tsx
index 6d34808b455..6fc3fbb692e 100644
--- a/apps/web/src/components/vote/ProposalEmptyState.tsx
+++ b/apps/web/src/components/vote/ProposalEmptyState.tsx
@@ -1,6 +1,6 @@
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 
diff --git a/apps/web/src/components/vote/QueueModal.tsx b/apps/web/src/components/vote/QueueModal.tsx
index c49f50b3e7a..dcecfae2f4a 100644
--- a/apps/web/src/components/vote/QueueModal.tsx
+++ b/apps/web/src/components/vote/QueueModal.tsx
@@ -5,10 +5,10 @@ import Modal from 'components/Modal'
 import { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import { useQueueCallback } from 'state/governance/hooks'
+import styled, { useTheme } from 'styled-components'
 import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
 import { logger } from 'utilities/src/logger/logger'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
diff --git a/apps/web/src/components/vote/VoteModal.tsx b/apps/web/src/components/vote/VoteModal.tsx
index c70d1ffbd54..4a3dd84cc0f 100644
--- a/apps/web/src/components/vote/VoteModal.tsx
+++ b/apps/web/src/components/vote/VoteModal.tsx
@@ -5,11 +5,11 @@ import Modal from 'components/Modal'
 import { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import { useUserVotes, useVoteCallback } from 'state/governance/hooks'
 import { VoteOption } from 'state/governance/types'
+import styled, { useTheme } from 'styled-components'
 import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
 import { logger } from 'utilities/src/logger/logger'
 import { formatCurrencyAmount } from 'utils/formatCurrencyAmount'
diff --git a/apps/web/src/constants/chains.test.ts b/apps/web/src/constants/chains.test.ts
index 1f79d191616..87b888fa98d 100644
--- a/apps/web/src/constants/chains.test.ts
+++ b/apps/web/src/constants/chains.test.ts
@@ -8,6 +8,8 @@ import {
   GQL_MAINNET_CHAINS,
   INFURA_PREFIX_TO_CHAIN_ID,
   InterfaceGqlChain,
+  L1_CHAIN_IDS,
+  L2_CHAIN_IDS,
   SUPPORTED_GAS_ESTIMATE_CHAIN_IDS,
   SupportedInterfaceChainId,
   TESTNET_CHAIN_IDS,
@@ -45,7 +47,7 @@ test.each(chainPriorityTestCases)(
   (chainId: InterfaceChainId, expectedPriority: number) => {
     const priority = getChainPriority(chainId)
     expect(priority).toBe(expectedPriority)
-  },
+  }
 )
 
 const chainIdNames: { [chainId in SupportedInterfaceChainId]: string } = {
@@ -73,7 +75,7 @@ test.each(Object.keys(chainIdNames).map((key) => parseInt(key) as SupportedInter
   (chainId: SupportedInterfaceChainId) => {
     const name = CHAIN_IDS_TO_NAMES[chainId]
     expect(name).toBe(chainIdNames[chainId])
-  },
+  }
 )
 
 const supportedGasEstimateChains = [
@@ -94,7 +96,7 @@ test.each(supportedGasEstimateChains)(
   (chainId: SupportedInterfaceChainId) => {
     expect(SUPPORTED_GAS_ESTIMATE_CHAIN_IDS.includes(chainId)).toBe(true)
     expect(SUPPORTED_GAS_ESTIMATE_CHAIN_IDS.length).toEqual(supportedGasEstimateChains.length)
-  },
+  }
 )
 
 const testnetChainIds = [
@@ -111,7 +113,40 @@ test.each(testnetChainIds)('TESTNET_CHAIN_IDS generates the correct chainIds', (
   expect(TESTNET_CHAIN_IDS.length).toEqual(testnetChainIds.length)
 })
 
-const GQLProductionChains = [
+const l1ChainIds = [
+  UniverseChainId.Mainnet,
+  UniverseChainId.Goerli,
+  UniverseChainId.Sepolia,
+  UniverseChainId.Polygon,
+  UniverseChainId.PolygonMumbai,
+  UniverseChainId.Celo,
+  UniverseChainId.CeloAlfajores,
+  UniverseChainId.Bnb,
+  UniverseChainId.Avalanche,
+] as const
+
+test.each(l1ChainIds)('L1_CHAIN_IDS generates the correct chainIds', (chainId: SupportedInterfaceChainId) => {
+  expect(L1_CHAIN_IDS.includes(chainId)).toBe(true)
+  expect(L1_CHAIN_IDS.length).toEqual(l1ChainIds.length)
+})
+
+const l2ChainIds = [
+  UniverseChainId.ArbitrumOne,
+  UniverseChainId.ArbitrumGoerli,
+  UniverseChainId.Optimism,
+  UniverseChainId.OptimismGoerli,
+  UniverseChainId.Base,
+  UniverseChainId.Blast,
+  UniverseChainId.Zora,
+  UniverseChainId.Zksync,
+] as const
+
+test.each(l2ChainIds)('L2_CHAIN_IDS generates the correct chainIds', (chainId: SupportedInterfaceChainId) => {
+  expect(L2_CHAIN_IDS.includes(chainId)).toBe(true)
+  expect(L2_CHAIN_IDS.length).toEqual(l2ChainIds.length)
+})
+
+const GQLMainnetChains = [
   Chain.Ethereum,
   Chain.Polygon,
   Chain.Celo,
@@ -126,11 +161,11 @@ const GQLProductionChains = [
 ] as const
 
 const GQL_TESTNET_CHAINS = [Chain.EthereumGoerli, Chain.EthereumSepolia] as const
-const uxSupportedGQLChains = [...GQLProductionChains, ...GQL_TESTNET_CHAINS] as const
+const uxSupportedGQLChains = [...GQLMainnetChains, ...GQL_TESTNET_CHAINS] as const
 
-test.each(GQLProductionChains)('GQL_MAINNET_CHAINS generates the correct chains', (chain: InterfaceGqlChain) => {
+test.each(GQLMainnetChains)('GQL_MAINNET_CHAINS generates the correct chains', (chain: InterfaceGqlChain) => {
   expect(GQL_MAINNET_CHAINS.includes(chain)).toBe(true)
-  expect(GQL_MAINNET_CHAINS.length).toEqual(GQLProductionChains.length)
+  expect(GQL_MAINNET_CHAINS.length).toEqual(GQLMainnetChains.length)
 })
 
 test.each(uxSupportedGQLChains)('UX_SUPPORTED_GQL_CHAINS generates the correct chains', (chain: InterfaceGqlChain) => {
@@ -162,7 +197,7 @@ test.each(Object.keys(chainIdToBackendName).map((key) => parseInt(key) as Suppor
   (chainId: SupportedInterfaceChainId) => {
     const name = CHAIN_ID_TO_BACKEND_NAME[chainId]
     expect(name).toBe(chainIdToBackendName[chainId])
-  },
+  }
 )
 
 const chainToChainId = {
@@ -186,7 +221,7 @@ test.each(Object.keys(chainToChainId).map((key) => key as InterfaceGqlChain))(
   (chain) => {
     const chainId = CHAIN_NAME_TO_CHAIN_ID[chain]
     expect(chainId).toBe(chainToChainId[chain])
-  },
+  }
 )
 
 const backendSupportedChains = [
@@ -206,7 +241,7 @@ test.each(backendSupportedChains)(
   (chain: InterfaceGqlChain) => {
     expect(BACKEND_SUPPORTED_CHAINS.includes(chain)).toBe(true)
     expect(BACKEND_SUPPORTED_CHAINS.length).toEqual(backendSupportedChains.length)
-  },
+  }
 )
 
 const backendNotyetSupportedChainIds = [UniverseChainId.Zora, UniverseChainId.Zksync] as const
@@ -216,7 +251,7 @@ test.each(backendNotyetSupportedChainIds)(
   (chainId: SupportedInterfaceChainId) => {
     expect(BACKEND_NOT_YET_SUPPORTED_CHAIN_IDS.includes(chainId)).toBe(true)
     expect(BACKEND_NOT_YET_SUPPORTED_CHAIN_IDS.length).toEqual(backendNotyetSupportedChainIds.length)
-  },
+  }
 )
 
 const infuraPrefixToChainId: { [prefix: string]: SupportedInterfaceChainId } = {
@@ -271,7 +306,7 @@ test.each(WEB_SUPPORTED_CHAIN_IDS)(
   (chainId: SupportedInterfaceChainId) => {
     const block = UNIVERSE_CHAIN_INFO[chainId].blockPerMainnetEpochForChainId
     expect(block).toEqual(getBlocksPerMainnetEpochForChainId(chainId))
-  },
+  }
 )
 
 describe('getChainFromChainUrlParam', () => {
diff --git a/apps/web/src/constants/chains.ts b/apps/web/src/constants/chains.ts
index 5175bf978b7..af9678c43e6 100644
--- a/apps/web/src/constants/chains.ts
+++ b/apps/web/src/constants/chains.ts
@@ -7,7 +7,13 @@ import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { Chain as BackendChainId } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-import { InterfaceChainId, UniverseChainId, UniverseChainInfo, WEB_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
+import {
+  InterfaceChainId,
+  NetworkLayer,
+  UniverseChainId,
+  UniverseChainInfo,
+  WEB_SUPPORTED_CHAIN_IDS,
+} from 'uniswap/src/types/chains'
 
 export const AVERAGE_L1_BLOCK_TIME = ms(`12s`)
 
@@ -133,20 +139,29 @@ export const CHAIN_NAME_TO_CHAIN_ID = Object.fromEntries(
     .map(([key, value]) => [value.backendChain.chain, parseInt(key) as SupportedInterfaceChainId]),
 ) as { [chain in InterfaceGqlChain]: SupportedInterfaceChainId }
 
-export const ALL_CHAIN_IDS: UniverseChainId[] = Object.values(UNIVERSE_CHAIN_INFO).map((chain) => chain.id)
-
 export const SUPPORTED_GAS_ESTIMATE_CHAIN_IDS = Object.keys(UNIVERSE_CHAIN_INFO)
   .filter((key) => UNIVERSE_CHAIN_INFO[parseInt(key) as SupportedInterfaceChainId].supportsGasEstimates)
   .map((key) => parseInt(key) as SupportedInterfaceChainId)
 
-export const PRODUCTION_CHAIN_IDS: UniverseChainId[] = Object.values(UNIVERSE_CHAIN_INFO)
-  .filter((chain) => !chain.testnet)
-  .map((chain) => chain.id)
-
 export const TESTNET_CHAIN_IDS = Object.keys(UNIVERSE_CHAIN_INFO)
   .filter((key) => UNIVERSE_CHAIN_INFO[parseInt(key) as SupportedInterfaceChainId].testnet)
   .map((key) => parseInt(key) as SupportedInterfaceChainId)
 
+/**
+ * All the chain IDs that are running the Ethereum protocol.
+ */
+export const L1_CHAIN_IDS = Object.keys(UNIVERSE_CHAIN_INFO)
+  .filter((key) => UNIVERSE_CHAIN_INFO[parseInt(key) as SupportedInterfaceChainId].networkLayer === NetworkLayer.L1)
+  .map((key) => parseInt(key) as SupportedInterfaceChainId)
+
+/**
+ * Controls some L2 specific behavior, e.g. slippage tolerance, special UI behavior.
+ * The expectation is that all of these networks have immediate transaction confirmation.
+ */
+export const L2_CHAIN_IDS = Object.keys(UNIVERSE_CHAIN_INFO)
+  .filter((key) => UNIVERSE_CHAIN_INFO[parseInt(key) as SupportedInterfaceChainId].networkLayer === NetworkLayer.L2)
+  .map((key) => parseInt(key) as SupportedInterfaceChainId)
+
 /**
  * @deprecated when v2 pools are enabled on chains supported through sdk-core
  */
diff --git a/apps/web/src/dev/DevFlagsBox.tsx b/apps/web/src/dev/DevFlagsBox.tsx
index ec55d949dac..39b949a72da 100644
--- a/apps/web/src/dev/DevFlagsBox.tsx
+++ b/apps/web/src/dev/DevFlagsBox.tsx
@@ -1,11 +1,11 @@
 import { ColumnCenter } from 'components/Column'
 import { RowBetween } from 'components/Row'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
-import styled from 'lib/styled-components'
 import { useState } from 'react'
 import { Flag, Settings } from 'react-feather'
 import { useCloseModal, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 import { Statsig } from 'uniswap/src/features/gating/sdk/statsig'
diff --git a/apps/web/src/featureFlags/dynamicConfig/quickRouteChains.ts b/apps/web/src/featureFlags/dynamicConfig/quickRouteChains.ts
index 0192c7b0fd1..7e4cb491cf2 100644
--- a/apps/web/src/featureFlags/dynamicConfig/quickRouteChains.ts
+++ b/apps/web/src/featureFlags/dynamicConfig/quickRouteChains.ts
@@ -1,15 +1,13 @@
-import { DynamicConfigs, QuickRouteChainsConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import { InterfaceChainId, WEB_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
 import { logger } from 'utilities/src/logger/logger'
 
+export const QUICK_ROUTE_CONFIG_KEY = 'quick_route_chains'
+
 export function useQuickRouteChains(): InterfaceChainId[] {
-  const chains = useDynamicConfigValue(
-    DynamicConfigs.QuickRouteChains,
-    QuickRouteChainsConfigKey.Chains,
-    [] as InterfaceChainId[],
-    (x: unknown) => Array.isArray(x) && x.every((c: unknown) => typeof c === 'number'),
-  )
+  const statsigConfig = useDynamicConfig(DynamicConfigs.QuickRouteChains)
+  const chains = statsigConfig.get(QUICK_ROUTE_CONFIG_KEY, []) as InterfaceChainId[]
   if (chains.every((c) => WEB_SUPPORTED_CHAIN_IDS.includes(c))) {
     return chains
   } else {
diff --git a/apps/web/src/graphql/data/apollo/AssetActivityProvider.tsx b/apps/web/src/graphql/data/apollo/AssetActivityProvider.tsx
index c81814d6b3a..dda9ee3a627 100644
--- a/apps/web/src/graphql/data/apollo/AssetActivityProvider.tsx
+++ b/apps/web/src/graphql/data/apollo/AssetActivityProvider.tsx
@@ -3,7 +3,6 @@ import { createAdaptiveRefetchContext } from 'graphql/data/apollo/AdaptiveRefetc
 import { GQL_MAINNET_CHAINS_MUTABLE } from 'graphql/data/util'
 import { useAccount } from 'hooks/useAccount'
 import usePrevious from 'hooks/usePrevious'
-import ms from 'ms'
 import {
   PropsWithChildren,
   createContext,
@@ -14,7 +13,6 @@ import {
   useReducer,
   useState,
 } from 'react'
-import { useFiatOnRampTransactions } from 'state/fiatOnRampTransactions/hooks'
 import {
   ActivityWebQueryResult,
   AssetActivityPartsFragment,
@@ -26,7 +24,6 @@ import {
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { logger } from 'utilities/src/logger/logger'
-import { useInterval } from 'utilities/src/time/timing'
 import { v4 as uuidV4 } from 'uuid'
 
 const { Provider: AdaptiveAssetActivityProvider, useQuery: useAssetActivityQuery } =
@@ -57,35 +54,12 @@ export function AssetActivityProvider({ children }: PropsWithChildren) {
     },
   })
 
-  const fiatOnRampTransactions = useFiatOnRampTransactions()
-
   const [lazyFetch, query] = useActivityWebLazyQuery()
   const fetch = useCallback(
-    () =>
-      lazyFetch({
-        variables: {
-          account: account.address ?? '',
-          chains: GQL_MAINNET_CHAINS_MUTABLE,
-          // Include the externalsessionIDs of all fiat on-ramp transactions in the local store,
-          // so that the backend can find the transactions without signature authentication.
-          onRampTransactionIDs: Object.values(fiatOnRampTransactions).map(
-            (transaction) => transaction.externalSessionId,
-          ),
-        },
-      }),
-    [account.address, fiatOnRampTransactions, lazyFetch],
+    () => lazyFetch({ variables: { account: account.address ?? '', chains: GQL_MAINNET_CHAINS_MUTABLE } }),
+    [account.address, lazyFetch],
   )
 
-  useInterval(async () => {
-    if (
-      Object.values(fiatOnRampTransactions).some(
-        (transaction) => !transaction.syncedWithBackend && transaction.forceFetched,
-      )
-    ) {
-      fetch()
-    }
-  }, ms('15s'))
-
   return (
     <SubscriptionContext.Provider value={result}>
       <AdaptiveAssetActivityProvider query={query} fetch={fetch} stale={account.address !== previousAccount}>
diff --git a/apps/web/src/graphql/data/types.test.ts b/apps/web/src/graphql/data/types.test.ts
index 119d1752617..0b622fec06a 100644
--- a/apps/web/src/graphql/data/types.test.ts
+++ b/apps/web/src/graphql/data/types.test.ts
@@ -108,7 +108,7 @@ describe('gqlTokenToCurrencyInfo', () => {
             url: 'dai_url',
           },
         },
-      }),
+      })
     ).toThrow()
   })
 
diff --git a/apps/web/src/graphql/data/types.ts b/apps/web/src/graphql/data/types.ts
index 8322498ca13..88695af4b79 100644
--- a/apps/web/src/graphql/data/types.ts
+++ b/apps/web/src/graphql/data/types.ts
@@ -48,10 +48,7 @@ export function meldSupportedCurrencyToCurrencyInfo(forCurrency: FORSupportedTok
   })
 
   if (currencyInfo) {
-    return {
-      ...currencyInfo,
-      logoUrl: forCurrency.symbol,
-    }
+    return currencyInfo
   }
 
   // Special case for *bridged* USDC on Optimism, which we otherwise don't use in our app.
diff --git a/apps/web/src/graphql/data/util.tsx b/apps/web/src/graphql/data/util.tsx
index a652f031d7c..b1695de5934 100644
--- a/apps/web/src/graphql/data/util.tsx
+++ b/apps/web/src/graphql/data/util.tsx
@@ -14,10 +14,10 @@ import {
   isSupportedChainId,
 } from 'constants/chains'
 import { NATIVE_CHAIN_ID, WRAPPED_NATIVE_CURRENCY, nativeOnChain } from 'constants/tokens'
-import { DefaultTheme } from 'lib/styled-components'
 import ms from 'ms'
 import { ExploreTab } from 'pages/Explore'
 import { useEffect } from 'react'
+import { DefaultTheme } from 'styled-components'
 import { ThemeColors } from 'theme/colors'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import {
diff --git a/apps/web/src/hooks/useAutoSlippageTolerance.ts b/apps/web/src/hooks/useAutoSlippageTolerance.ts
index d5916473179..6fe8d73fb2f 100644
--- a/apps/web/src/hooks/useAutoSlippageTolerance.ts
+++ b/apps/web/src/hooks/useAutoSlippageTolerance.ts
@@ -2,7 +2,7 @@ import { MixedRoute, partitionMixedRouteByProtocol, Protocol, Trade } from '@uni
 import { Currency, CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'
 import { Pair } from '@uniswap/v2-sdk'
 import { Pool } from '@uniswap/v3-sdk'
-import { SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
+import { L2_CHAIN_IDS, SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import useGasPrice from 'hooks/useGasPrice'
 import { useStablecoinAmountFromFiatValue } from 'hooks/useStablecoinPrice'
@@ -11,7 +11,6 @@ import JSBI from 'jsbi'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import { useMemo } from 'react'
 import { ClassicTrade } from 'state/routing/types'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 import { logger } from 'utilities/src/logger/logger'
 
 const DEFAULT_AUTO_SLIPPAGE = new Percent(5, 1000) // 0.5%
@@ -76,7 +75,7 @@ const MAX_AUTO_SLIPPAGE_TOLERANCE = new Percent(5, 100) // 5%
  */
 export default function useClassicAutoSlippageTolerance(trade?: ClassicTrade): Percent {
   const { chainId } = useAccount()
-  const onL2 = isL2ChainId(chainId)
+  const onL2 = chainId && L2_CHAIN_IDS.includes(chainId)
   const outputUSD = useUSDPrice(trade?.outputAmount)
   const outputDollarValue = useStablecoinAmountFromFiatValue(outputUSD.data)
 
diff --git a/apps/web/src/hooks/useColor.ts b/apps/web/src/hooks/useColor.ts
index e0dcf654ac2..76f9b20eb90 100644
--- a/apps/web/src/hooks/useColor.ts
+++ b/apps/web/src/hooks/useColor.ts
@@ -1,7 +1,7 @@
 import { Currency } from '@uniswap/sdk-core'
 import { useCurrencyInfo } from 'hooks/Tokens'
-import { useTheme } from 'lib/styled-components'
 import { useMemo } from 'react'
+import { useTheme } from 'styled-components'
 import { useExtractedTokenColor } from 'ui/src'
 
 type ContrastSettings = { backgroundColor: string; darkMode: boolean }
diff --git a/apps/web/src/hooks/useFilterPossiblyMaliciousPositions.test.ts b/apps/web/src/hooks/useFilterPossiblyMaliciousPositions.test.ts
index 1b0aedbac8c..84fd8b683da 100644
--- a/apps/web/src/hooks/useFilterPossiblyMaliciousPositions.test.ts
+++ b/apps/web/src/hooks/useFilterPossiblyMaliciousPositions.test.ts
@@ -85,7 +85,7 @@ describe('useFilterPossiblyMaliciousPositions', () => {
     const { result } = renderHook(() => useFilterPossiblyMaliciousPositions(positions))
 
     expect(result.current.some((position) => position.token1 === '0xB85C51F89788C1B3Bd4568f773e8FfB40cA587Bb')).toEqual(
-      false,
+      false
     )
   })
 })
diff --git a/apps/web/src/hooks/useStablecoinPrice.ts b/apps/web/src/hooks/useStablecoinPrice.ts
index 882425a1405..0064c07a02c 100644
--- a/apps/web/src/hooks/useStablecoinPrice.ts
+++ b/apps/web/src/hooks/useStablecoinPrice.ts
@@ -3,22 +3,19 @@ import { getChain, useSupportedChainId } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { useMemo, useRef } from 'react'
-import { ClassicTrade, INTERNAL_ROUTER_PREFERENCE_PRICE, TradeState } from 'state/routing/types'
+import { ClassicTrade, INTERNAL_ROUTER_PREFERENCE_PRICE } from 'state/routing/types'
 import { useRoutingAPITrade } from 'state/routing/useRoutingAPITrade'
 
 /**
  * Returns the price in USDC of the input currency
  * @param currency currency to compute the USDC price of
  */
-export default function useStablecoinPrice(currency?: Currency): {
-  price?: Price<Currency, Token>
-  state: TradeState
-} {
+export default function useStablecoinPrice(currency?: Currency): Price<Currency, Token> | undefined {
   const chainId = useSupportedChainId(currency?.chainId)
   const amountOut = chainId ? getChain({ chainId }).spotPriceStablecoinAmount : undefined
   const stablecoin = amountOut?.currency
 
-  const { trade, state } = useRoutingAPITrade(
+  const { trade } = useRoutingAPITrade(
     false /* skip */,
     TradeType.EXACT_OUTPUT,
     amountOut,
@@ -53,11 +50,11 @@ export default function useStablecoinPrice(currency?: Currency): {
   ) {
     lastPrice.current = price
   }
-  return { price: lastPrice.current, state }
+  return lastPrice.current
 }
 
 export function useStablecoinValue(currencyAmount: CurrencyAmount<Currency> | undefined | null) {
-  const { price } = useStablecoinPrice(currencyAmount?.currency)
+  const price = useStablecoinPrice(currencyAmount?.currency)
 
   return useMemo(() => {
     if (!price || !currencyAmount) {
diff --git a/apps/web/src/hooks/useTokenBalances.test.ts b/apps/web/src/hooks/useTokenBalances.test.ts
index 39153a60194..c9d98fe1753 100644
--- a/apps/web/src/hooks/useTokenBalances.test.ts
+++ b/apps/web/src/hooks/useTokenBalances.test.ts
@@ -4,10 +4,7 @@ import { useTokenBalancesQuery } from 'graphql/data/apollo/TokenBalancesProvider
 import { useTokenBalances } from 'hooks/useTokenBalances'
 import { mocked } from 'test-utils/mocked'
 import { renderHook } from 'test-utils/render'
-import {
-  Chain,
-  useQuickTokenBalancesWebQuery,
-} from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
+import { Chain, useQuickTokenBalancesWebQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 jest.mock('@web3-react/core', () => ({
   useWeb3React: jest.fn(() => ({ account: '0x123', chainId: 1 })),
diff --git a/apps/web/src/hooks/useTokenWarningColor.ts b/apps/web/src/hooks/useTokenWarningColor.ts
index 187626a59d3..47ffa0af4c3 100644
--- a/apps/web/src/hooks/useTokenWarningColor.ts
+++ b/apps/web/src/hooks/useTokenWarningColor.ts
@@ -1,4 +1,4 @@
-import { useTheme } from 'lib/styled-components'
+import { useTheme } from 'styled-components'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 export const useTokenWarningTextColor = (level: SafetyLevel) => {
diff --git a/apps/web/src/hooks/useTransactionDeadline.ts b/apps/web/src/hooks/useTransactionDeadline.ts
index 1dec433d5c5..1de69339be7 100644
--- a/apps/web/src/hooks/useTransactionDeadline.ts
+++ b/apps/web/src/hooks/useTransactionDeadline.ts
@@ -1,11 +1,11 @@
 import { BigNumber } from '@ethersproject/bignumber'
+import { L2_CHAIN_IDS } from 'constants/chains'
 import { L2_DEADLINE_FROM_NOW } from 'constants/misc'
 import { useAccount } from 'hooks/useAccount'
 import { useInterfaceMulticall } from 'hooks/useContract'
 import useCurrentBlockTimestamp from 'hooks/useCurrentBlockTimestamp'
 import { useCallback, useMemo } from 'react'
 import { useAppSelector } from 'state/hooks'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 
 export default function useTransactionDeadline(): BigNumber | undefined {
   const { chainId } = useAccount()
@@ -29,7 +29,7 @@ export function useGetTransactionDeadline(): () => Promise<BigNumber | undefined
 }
 
 function timestampToDeadline(chainId?: number, blockTimestamp?: BigNumber, ttl?: number) {
-  if (blockTimestamp && isL2ChainId(chainId)) {
+  if (blockTimestamp && chainId && L2_CHAIN_IDS.includes(chainId)) {
     return blockTimestamp.add(L2_DEADLINE_FROM_NOW)
   }
   if (blockTimestamp && ttl) {
diff --git a/apps/web/src/hooks/useUSDPrice.ts b/apps/web/src/hooks/useUSDPrice.ts
index 64801d75e8d..aa6adfd5e96 100644
--- a/apps/web/src/hooks/useUSDPrice.ts
+++ b/apps/web/src/hooks/useUSDPrice.ts
@@ -93,7 +93,7 @@ export function useUSDPrice(
   })
 
   // Use USDC-based pricing for chains not yet supported by backend (for ETH-based pricing).
-  const { price: stablecoinPrice } = useStablecoinPrice(isTokenEthPriced ? undefined : currency)
+  const stablecoinPrice = useStablecoinPrice(isTokenEthPriced ? undefined : currency)
 
   return useMemo(() => {
     if (!currencyAmount) {
diff --git a/apps/web/src/hooks/useUSDTokenUpdater.ts b/apps/web/src/hooks/useUSDTokenUpdater.ts
index d72b8a15ae7..95b95a72519 100644
--- a/apps/web/src/hooks/useUSDTokenUpdater.ts
+++ b/apps/web/src/hooks/useUSDTokenUpdater.ts
@@ -3,28 +3,20 @@ import { getChain, useSupportedChainId } from 'constants/chains'
 import useStablecoinPrice from 'hooks/useStablecoinPrice'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { useMemo } from 'react'
-import { TradeState } from 'state/routing/types'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 const NUM_DECIMALS_USD = 2
 const NUM_DECIMALS_DISPLAY = 2
 
-export function useUSDTokenUpdater(
-  isFiatInput: boolean,
-  exactAmount: string,
-  exactCurrency?: Currency,
-): {
-  formattedAmount?: string
-  loading: boolean
-} {
-  const { price, state } = useStablecoinPrice(exactCurrency)
+export function useUSDTokenUpdater(isFiatInput: boolean, exactAmount: string, exactCurrency?: Currency) {
+  const price = useStablecoinPrice(exactCurrency)
   const { convertToFiatAmount, formatCurrencyAmount } = useFormatter()
   const conversionRate = convertToFiatAmount().amount
   const supportedChainId = useSupportedChainId(exactCurrency?.chainId)
 
   return useMemo(() => {
     if (!exactCurrency || !price) {
-      return { formattedAmount: undefined, loading: state === TradeState.LOADING }
+      return
     }
 
     if (isFiatInput) {
@@ -43,7 +35,7 @@ export function useUSDTokenUpdater(
         placeholder: '',
       })
 
-      return { formattedAmount: formattedCurrencyAmount, loading: state === TradeState.LOADING }
+      return formattedCurrencyAmount
     }
 
     const exactCurrencyAmount = tryParseCurrencyAmount(exactAmount || '0', exactCurrency)
@@ -52,7 +44,7 @@ export function useUSDTokenUpdater(
     const fiatPrice = convertToFiatAmount(parseFloat(usdPrice?.toExact() ?? '0')).amount
     const formattedFiatPrice = fiatPrice ? fiatPrice.toFixed(NUM_DECIMALS_DISPLAY) : '0'
 
-    return { formattedAmount: formattedFiatPrice, loading: state === TradeState.LOADING }
+    return formattedFiatPrice
   }, [
     conversionRate,
     convertToFiatAmount,
@@ -61,7 +53,6 @@ export function useUSDTokenUpdater(
     formatCurrencyAmount,
     isFiatInput,
     price,
-    state,
     supportedChainId,
   ])
 }
diff --git a/apps/web/src/hooks/useUniswapWalletOptions.ts b/apps/web/src/hooks/useUniswapWalletOptions.ts
index 6ea04ed7436..8cfbe8f7049 100644
--- a/apps/web/src/hooks/useUniswapWalletOptions.ts
+++ b/apps/web/src/hooks/useUniswapWalletOptions.ts
@@ -1,6 +1,5 @@
 import { useConnectorWithId } from 'components/WalletModal/useOrderedConnections'
 import { CONNECTION } from 'components/Web3Provider/constants'
-import { useAccount } from 'hooks/useAccount'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 
@@ -11,20 +10,3 @@ export function useUniswapWalletOptions() {
 
   return isExtensionInstalled || isGALive
 }
-
-/**
- * Checks if the `extension_launch` feature flag is enabled and if the user is not connected a different wallet.
- *
- * This hook returns `true` under the following conditions:
- * - The `extension_launch` feature flag is set to `true`.
- * - The user has not connected to a different wallet
- *
- * @returns {boolean} True if the extension launch feature is enabled and the user is not connected a different wallet; otherwise, false.
- */
-export function useIsUniExtensionAvailable() {
-  const isGALive = useFeatureFlag(FeatureFlags.ExtensionLaunch)
-  const currentConnector = useAccount().connector
-  const currentConnectIsNotUniExtension = currentConnector && currentConnector.id !== CONNECTION.UNISWAP_EXTENSION_RDNS
-
-  return isGALive && !currentConnectIsNotUniExtension
-}
diff --git a/apps/web/src/i18n/locales/source/en-US.json b/apps/web/src/i18n/locales/source/en-US.json
index 9588d946e82..475d957116e 100644
--- a/apps/web/src/i18n/locales/source/en-US.json
+++ b/apps/web/src/i18n/locales/source/en-US.json
@@ -84,7 +84,6 @@
   "common.automatic": "Auto",
   "common.availableIn": "Uniswap available in: ",
   "common.availableOnIOSAndroid": "Available on iOS and Android",
-  "common.availableOnIOSAndroidChrome": "Available on iOS, Android, and Chrome",
   "common.blocked.activities": "blocked activities",
   "common.blocked.ifError": "If you believe this is an error, please send an email including your address to ",
   "common.blocked.reason": "This address is blocked on the Uniswap Labs interface because it is associated with one or more",
@@ -185,7 +184,6 @@
   "common.developers": "Developers",
   "common.dismiss": "Dismiss",
   "common.dnsRegistrar": "DNS Registrar",
-  "common.download": "Download",
   "common.downloadUniswap": "Download Uniswap",
   "common.downloadUniswapApp": "Download the Uniswap app",
   "common.edit.button": "Edit",
@@ -228,7 +226,6 @@
   "common.getHelp.button": "Get help",
   "common.getSupport.button": "Get support",
   "common.getTheApp": "Get the app",
-  "common.getUniswapWallet": "Get Uniswap Wallet",
   "common.googleChrome": "Google Chrome",
   "common.governance": "Governance",
   "common.happyHolidays": "Happy Holidays from the Uniswap team!",
@@ -261,7 +258,6 @@
   "common.limit.failed": "Limit failed",
   "common.limit.opened": "Limit opened",
   "common.limit.pending": "Limit pending",
-  "common.limits": "Limits",
   "common.limits.approachMax": "Approaching 100 limit maximum",
   "common.limits.cancelProceed": "Cancel limits to proceed",
   "common.limits.expires": "Expires {{ timestamp }}",
@@ -288,6 +284,7 @@
   "common.mint.failed": "Mint failed",
   "common.minted": "Minted",
   "common.minting": "Minting",
+  "common.mobileWallet": "Mobile Wallet",
   "common.more": "More",
   "common.navigationButton": "Navigation button",
   "common.needHelp": "Need help?",
@@ -430,9 +427,9 @@
   "common.switchNetworks": "Switch networks",
   "common.termsOfService": "Terms of Service",
   "common.termsPrivacy": "Terms & Privacy",
-  "common.thisMonth": "This month",
-  "common.thisWeek": "This week",
-  "common.thisYear": "This year",
+  "common.thisMonth": "This Month",
+  "common.thisWeek": "This Week",
+  "common.thisYear": "This Year",
   "common.time.day": "day",
   "common.time.days": "days",
   "common.time.daysAbbr": "{{days}}d",
@@ -485,7 +482,6 @@
   "common.unavailable": "Unavailable",
   "common.uniGovernance": "UNI Governance",
   "common.uniInterface": "Uniswap Interface",
-  "common.uniswapMobile": "Uniswap Mobile",
   "common.uniswapProtocol": "Uniswap Protocol",
   "common.uniswapTVL": "Uniswap TVL",
   "common.uniswapWallet": "Uniswap wallet",
@@ -583,9 +579,6 @@
   "explore.unableToDisplayHistorical": "Unable to display historical volume data for the current chain.",
   "explore.unableToDisplayHistoricalTVL": "Unable to display historical TVL data for the current chain.",
   "explore.uniVolume": "Uniswap volume",
-  "extension.announcement": "The Uniswap Extension is here. Swap, sign transactions, and send tokens right from your browser.",
-  "extension.introduction": "Introducing the Uniswap Extension.",
-  "extension.open": "Open Uniswap Extension",
   "fee.bestForExotic": "Best for exotic pairs.",
   "fee.bestForMost": "Best for most pairs.",
   "fee.bestForStablePairs": "Best for stable pairs.",
@@ -594,12 +587,12 @@
   "fee.selectPercent": "{{pct}}% select",
   "fee.tier": "Fee tier",
   "fee.tierExact": "{{fee}} fee tier",
-  "fiatOnRamp.notAvailable.error": "This service is unavailable in your region",
+  "fiatOnRamp.notAvailable.error": "Crypto purchases are not available in your region. ",
   "fiatOnRamp.checkoutWith": "Checkout with",
   "fiatOnRamp.chooseProvider.description": "You’ll continue to the provider’s portal to see the fees associated with your transaction.",
   "fiatOnRamp.connection.message": "Connecting you to {{serviceProvider}}",
   "fiatOnRamp.connection.quote": "Buying {{amount}} worth of {{currencySymbol}}",
-  "fiatOnRamp.disclaimer": "By continuing, you acknowledge that you’ll be subject to the <tosLink>Terms of Service</tosLink> and <privacyLink>Privacy Policy</privacyLink> with {{serviceProvider}}, as applicable.",
+  "fiatOnRamp.disclaimer": "By continuing, you acknowledge that you’ll be subject to the Terms of Service and Privacy Policy with {{serviceProvider}}, as applicable.",
   "fiatOnRamp.error.min": "Minimum {{amount}}",
   "fiatOnRamp.error.max": "Maximum {{amount}}",
   "fiatOnRamp.continueInTab": "Go to the {{serviceProvider}} tab to continue. It’s safe to close this modal now.",
@@ -607,13 +600,6 @@
   "fiatOnRamp.quote.type.other": "Other options",
   "fiatOnRamp.connection.error": "Connection failed",
   "fiatOnRamp.connection.errorDescription": "Something went wrong connecting with {{serviceProvider}}.",
-  "fiatOnRamp.purchasedOn": "Purchased on {{serviceProvider}}",
-  "fiatOnRamp.exchangeRate": "{{outputAmount}} {{outputSymbol}} for {{inputAmount}} {{inputSymbol}}",
-  "fiatOnRamp.receiveCrypto.title": "Receive crypto",
-  "fiatOnRamp.receiveCrypto.transferFunds": "Fund your wallet by transferring crypto from another wallet or account",
-  "fiatOnRamp.receiveCrypto.modal.sectionTitle.fromAccount": "From an account",
-  "fiatOnRamp.receiveCrypto.modal.addressQr.supportedNetworks": "You can receive tokens & NFTs on Ethereum, Polygon, Arbitrum, Optimism, Base, BNB, Blast, Avalanche, Zora, and ZKsync.",
-  "fiatOnRamp.quote.type.recent": "Recently used",
   "for {{address}}": "for {{address}}",
   "for": "for",
   "globalPreferences.title": "Global preferences",
@@ -622,6 +608,8 @@
   "hero.subtitle": "The largest onchain marketplace. Buy and sell crypto on Ethereum and 7+ other chains.",
   "home.tokens.empty.action.buy.description": "Purchase crypto with a debit card or a bank account",
   "home.tokens.empty.action.buy.title": "Buy crypto with card",
+  "home.tokens.empty.action.receive.description": "Fund your wallet by transferring crypto from another wallet or account",
+  "home.tokens.empty.action.receive.title": "Receive crypto",
   "home.tokens.empty.welcome": "Welcome to your wallet!",
   "home.tokens.empty.welcome.description": "Looks like you have a new wallet. Let’s get it funded before you make your first swap.",
   "landing.buildNextGen": "Build the next generation of open applications and tools.",
@@ -878,14 +866,6 @@
   "proposal.willAppearHere": "Proposals submitted by community members will appear here.",
   "proposal.willEnact": "Executing this proposal will enact the calldata on-chain.",
   "removeLiquidity.collectFees": "You will also collect fees earned from this position.",
-  "quickKey.swap": "U",
-  "quickKey.limit": "L",
-  "quickKey.send": "E",
-  "quickKey.buy": "B",
-  "quickKey.tokens": "T",
-  "quickKey.pools": "P",
-  "quickKey.transactions": "X",
-  "quickKey.nfts": "N",
   "removeLiquidity.outputEstimated": "Output is estimated. If the price changes by more than {{ allowed }}% your transaction will revert.",
   "removeLiquidity.pendingText": "Removing {{ amtA }} {{ symA }} and {{ amtB }} {{ symB }}",
   "removeLiquidity.pooled": "Pooled {{ symbol }}:",
@@ -1057,7 +1037,7 @@
   "uniswapX.aggregatesLiquidity": "<logo /> aggregates liquidity sources for better prices and gas free swaps.",
   "uniswapX.learnMore": "Learn more about swapping with UniswapX",
   "uniswapx.v2QuoteFailed": "UniswapX v2 hard quote failed. Retry with classic swap.",
-  "uniswap.wallet.modal.title": "Get started with Uniswap",
+  "uniswap.wallet.modal.title": "Download the Uniswap Wallet today",
   "uniswap.wallet.modal.subtitle": "Uniswap products work seamlessly together to create the best swapping experience.",
   "unitag.addressClaim": "Enter an address to trigger a UNI claim. If the address has any claimable UNI it will be sent to them on submission.",
   "v2.notAvailable": "Uniswap V2 is not available on this network.",
diff --git a/apps/web/src/index.tsx b/apps/web/src/index.tsx
index a5be2b4abff..a476222fe3e 100644
--- a/apps/web/src/index.tsx
+++ b/apps/web/src/index.tsx
@@ -10,7 +10,6 @@ import 'tracing'
 // ensure translations load before things
 // prettier-ignore
 import 'i18n'
-// prettier-ignore
 import 'setupRive'
 
 import { getDeviceId } from '@amplitude/analytics-browser'
@@ -34,7 +33,6 @@ import { BrowserRouter, HashRouter, useLocation } from 'react-router-dom'
 import store from 'state'
 import { ActivityStateUpdater } from 'state/activity/updater'
 import ApplicationUpdater from 'state/application/updater'
-import FiatOnRampTransactionsUpdater from 'state/fiatOnRampTransactions/updater'
 import ListsUpdater from 'state/lists/updater'
 import LogsUpdater from 'state/logs/updater'
 import { StatsigProvider as BaseStatsigProvider, StatsigUser } from 'statsig-react'
@@ -69,7 +67,6 @@ function Updaters() {
       <ActivityStateUpdater />
       <MulticallUpdater />
       <LogsUpdater />
-      <FiatOnRampTransactionsUpdater />
     </>
   )
 }
diff --git a/apps/web/src/lib/hooks/routing/useRoutingAPIArguments.ts b/apps/web/src/lib/hooks/routing/useRoutingAPIArguments.ts
index 056b431e65e..90109e8e1e8 100644
--- a/apps/web/src/lib/hooks/routing/useRoutingAPIArguments.ts
+++ b/apps/web/src/lib/hooks/routing/useRoutingAPIArguments.ts
@@ -4,7 +4,7 @@ import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
 import { GetQuoteArgs, INTERNAL_ROUTER_PREFERENCE_PRICE, RouterPreference } from 'state/routing/types'
 import { currencyAddressForSwapQuote } from 'state/routing/utils'
-import { ArbitrumXV2OpenOrderProperties, Experiments } from 'uniswap/src/features/gating/experiments'
+import { Experiments } from 'uniswap/src/features/gating/experiments'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useExperimentGroupName, useExperimentValue, useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
@@ -41,21 +41,9 @@ export function useRoutingAPIArguments({
   const xv2ArbitrumEnabled =
     useExperimentGroupName(Experiments.ArbitrumXV2OpenOrders) === ArbitrumXV2ExperimentGroup.Test
   const isXv2Arbitrum = tokenIn?.chainId === UniverseChainId.ArbitrumOne && xv2ArbitrumEnabled
-  const priceImprovementBps = useExperimentValue(
-    Experiments.ArbitrumXV2OpenOrders,
-    ArbitrumXV2OpenOrderProperties.PriceImprovementBps,
-    0,
-  )
-  const forceOpenOrders = useExperimentValue(
-    Experiments.ArbitrumXV2OpenOrders,
-    ArbitrumXV2OpenOrderProperties.ForceOpenOrders,
-    false,
-  )
-  const deadlineBufferSecs = useExperimentValue(
-    Experiments.ArbitrumXV2OpenOrders,
-    ArbitrumXV2OpenOrderProperties.DeadlineBufferSecs,
-    30,
-  )
+  const priceImprovementBps = useExperimentValue(Experiments.ArbitrumXV2OpenOrders, 'priceImprovementBps', 0)
+  const forceOpenOrders = useExperimentValue(Experiments.ArbitrumXV2OpenOrders, 'forceOpenOrders', false)
+  const deadlineBufferSecs = useExperimentValue(Experiments.ArbitrumXV2OpenOrders, 'deadlineBufferSecs', 30)
   // Don't enable fee logic if this is a quote for pricing
   const sendPortionEnabled = routerPreference !== INTERNAL_ROUTER_PREFERENCE_PRICE
 
diff --git a/apps/web/src/lib/hooks/useTokenList/fetchTokenList.test.ts b/apps/web/src/lib/hooks/useTokenList/fetchTokenList.test.ts
index 244a9a86022..dcd7b92a66c 100644
--- a/apps/web/src/lib/hooks/useTokenList/fetchTokenList.test.ts
+++ b/apps/web/src/lib/hooks/useTokenList/fetchTokenList.test.ts
@@ -17,7 +17,7 @@ describe('fetchTokenList', () => {
       throw new Error()
     })
     await expect(fetchTokenList(url, resolver)).rejects.toThrow(
-      `No valid token list found at any URLs derived from ${url}.`,
+      `No valid token list found at any URLs derived from ${url}.`
     )
     expect(console.debug).toHaveBeenCalled()
     expect(resolver).not.toHaveBeenCalled()
@@ -28,7 +28,7 @@ describe('fetchTokenList', () => {
     const contenthash = '0xD3ADB33F'
     resolver.mockResolvedValue(contenthash)
     await expect(fetchTokenList(url, resolver)).rejects.toThrow(
-      `failed to translate contenthash to URI: ${contenthash}`,
+      `failed to translate contenthash to URI: ${contenthash}`
     )
     expect(resolver).toHaveBeenCalledWith(url)
   })
@@ -43,7 +43,7 @@ describe('fetchTokenList', () => {
 
   it('fetches and validates a list from an ENS address', async () => {
     jest.mock('../../utils/contenthashToUri', () =>
-      jest.fn().mockImplementation(() => 'ipfs://QmPgEqyV3m8SB52BS2j2mJpu9zGprhj2BGCHtRiiw2fdM1'),
+      jest.fn().mockImplementation(() => 'ipfs://QmPgEqyV3m8SB52BS2j2mJpu9zGprhj2BGCHtRiiw2fdM1')
     )
     const url = 'example.eth'
     const contenthash = '0xe3010170122013e051d1cfff20606de36845d4fe28deb9861a319a5bc8596fa4e610e8803918'
@@ -63,7 +63,7 @@ describe('fetchTokenList', () => {
     const url = 'https://example.com/invalid-tokenlist.json'
     fetch.mockOnceIf(url, () => Promise.resolve({ status: 404 }))
     await expect(fetchTokenList(url, resolver)).rejects.toThrow(
-      `No valid token list found at any URLs derived from ${url}.`,
+      `No valid token list found at any URLs derived from ${url}.`
     )
     expect(console.debug).toHaveBeenCalled()
     expect(resolver).not.toHaveBeenCalled()
@@ -73,7 +73,7 @@ describe('fetchTokenList', () => {
     const url = 'https://example.com/invalid-tokenlist.json'
     fetch.mockOnceIf(url, () => Promise.resolve('invalid json'))
     await expect(fetchTokenList(url, resolver)).rejects.toThrow(
-      `No valid token list found at any URLs derived from ${url}.`,
+      `No valid token list found at any URLs derived from ${url}.`
     )
     expect(console.debug).toHaveBeenCalled()
     expect(resolver).not.toHaveBeenCalled()
diff --git a/apps/web/src/lib/hooks/useTokenList/sorting.test.ts b/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
index a051a710411..235fb93a721 100644
--- a/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
+++ b/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
@@ -147,7 +147,7 @@ describe('sorting', () => {
           [DAI.address]: { usdValue: 100, balance: 100 },
           [USDT.address]: { usdValue: 100, balance: 100 },
         },
-        UniverseChainId.Mainnet,
+        UniverseChainId.Mainnet
       )
 
       expect(result).toEqual([nativeOnChain(UniverseChainId.Mainnet), USDT, WBTC])
diff --git a/apps/web/src/lib/styled-components.ts b/apps/web/src/lib/styled-components.ts
deleted file mode 100644
index 73af4f92a19..00000000000
--- a/apps/web/src/lib/styled-components.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Note: we're deprecating styled-components in favor of Tamagui, which you
- * should import from `ui/src`. It should cover most of what styled-components
- * handles.
- *
- * If not, you can bail to using either $platform-web style prop or inline style
- * tag, or we can add on any one-off CSS by either inlining a style tag in the
- * component itself, or importing it via CSS modules.
- */
-
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import styledFn from 'styled-components'
-
-/** @deprecated use `styled` from `ui/src` instead */
-export default styledFn
-
-// eslint-disable-next-line no-restricted-syntax, @typescript-eslint/no-restricted-imports
-export * from 'styled-components'
diff --git a/apps/web/src/nft/components/Box.ts b/apps/web/src/nft/components/Box.ts
index 2fc0e6d2b3d..e7c90a82c53 100644
--- a/apps/web/src/nft/components/Box.ts
+++ b/apps/web/src/nft/components/Box.ts
@@ -15,7 +15,6 @@ type Props = Atoms &
     className?: ClassValue
   }
 
-/** @deprecated Please use `Flex` from `ui/src` going forward */
 export const Box = React.forwardRef<HTMLElement, Props>(({ as = 'div', className, ...props }: Props, ref) => {
   const atomProps: Record<string, unknown> = {}
   const nativeProps: Record<string, unknown> = {}
diff --git a/apps/web/src/nft/components/bag/Bag.tsx b/apps/web/src/nft/components/bag/Bag.tsx
index e1cd460be80..e6b686f06bd 100644
--- a/apps/web/src/nft/components/bag/Bag.tsx
+++ b/apps/web/src/nft/components/bag/Bag.tsx
@@ -2,7 +2,6 @@ import { NFTEventName } from '@uniswap/analytics-events'
 import { useIsMobile } from 'hooks/screenSize'
 import { useIsNftDetailsPage, useIsNftPage, useIsNftProfilePage } from 'hooks/useIsNftPage'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column } from 'nft/components/Flex'
 import * as styles from 'nft/components/bag/Bag.css'
@@ -17,6 +16,7 @@ import { useBag, useProfilePageState, useSellAsset, useSubscribeScrollState } fr
 import { BagStatus, ProfilePageStateType } from 'nft/types'
 import { formatAssetEventProperties, recalculateBagUsingPooledAssets } from 'nft/utils'
 import { useCallback, useEffect, useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 
diff --git a/apps/web/src/nft/components/bag/BagFooter.tsx b/apps/web/src/nft/components/bag/BagFooter.tsx
index 28b87e5fda6..2b612f8918e 100644
--- a/apps/web/src/nft/components/bag/BagFooter.tsx
+++ b/apps/web/src/nft/components/bag/BagFooter.tsx
@@ -22,7 +22,6 @@ import { useSwitchChain } from 'hooks/useSwitchChain'
 import { Trans, t } from 'i18n'
 import JSBI from 'jsbi'
 import useCurrencyBalance, { useTokenBalance } from 'lib/hooks/useCurrencyBalance'
-import styled, { useTheme } from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { BuyButtonStateData, BuyButtonStates, getBuyButtonStateData } from 'nft/components/bag/ButtonStates'
 import { useBag } from 'nft/hooks/useBag'
@@ -37,6 +36,7 @@ import { BagStatus } from 'nft/types'
 import { PropsWithChildren, useEffect, useMemo, useState } from 'react'
 import { AlertTriangle, ChevronDown } from 'react-feather'
 import { InterfaceTrade, TradeFillType, TradeState } from 'state/routing/types'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/nft/components/bag/BagHeader.tsx b/apps/web/src/nft/components/bag/BagHeader.tsx
index 2bc391bc7ce..9ea49304592 100644
--- a/apps/web/src/nft/components/bag/BagHeader.tsx
+++ b/apps/web/src/nft/components/bag/BagHeader.tsx
@@ -1,8 +1,8 @@
 import { OpacityHoverState } from 'components/Common'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { BagCloseIcon } from 'nft/components/icons'
 import { useMemo } from 'react'
+import styled from 'styled-components'
 import { ButtonText, ThemedText } from 'theme/components'
 
 const ClearButton = styled(ButtonText)`
diff --git a/apps/web/src/nft/components/bag/BagRow.tsx b/apps/web/src/nft/components/bag/BagRow.tsx
index ad77d08491f..08683c30b64 100644
--- a/apps/web/src/nft/components/bag/BagRow.tsx
+++ b/apps/web/src/nft/components/bag/BagRow.tsx
@@ -2,7 +2,6 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { formatEther as ethersFormatEther } from '@ethersproject/units'
 import clsx from 'clsx'
 import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/bag/BagRow.css'
@@ -23,6 +22,7 @@ import { GenieAsset, UpdatedGenieAsset } from 'nft/types'
 import { getAssetHref } from 'nft/utils'
 import { MouseEvent, useCallback, useEffect, useReducer, useState } from 'react'
 import { Link } from 'react-router-dom'
+import styled from 'styled-components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 export const RemoveButton = styled(ThemeButton)`
diff --git a/apps/web/src/nft/components/bag/ButtonStates.tsx b/apps/web/src/nft/components/bag/ButtonStates.tsx
index 36f822df659..f0082ee1440 100644
--- a/apps/web/src/nft/components/bag/ButtonStates.tsx
+++ b/apps/web/src/nft/components/bag/ButtonStates.tsx
@@ -1,7 +1,7 @@
 import { Trans } from 'i18n'
-import { DefaultTheme } from 'lib/styled-components'
 import { PriceImpact } from 'nft/hooks/usePriceImpact'
 import { ReactNode } from 'react'
+import { DefaultTheme } from 'styled-components'
 
 export enum BuyButtonStates {
   WALLET_NOT_CONNECTED,
diff --git a/apps/web/src/nft/components/bag/EmptyContent.tsx b/apps/web/src/nft/components/bag/EmptyContent.tsx
index 7b759ee9b8e..e8f85737aca 100644
--- a/apps/web/src/nft/components/bag/EmptyContent.tsx
+++ b/apps/web/src/nft/components/bag/EmptyContent.tsx
@@ -1,9 +1,9 @@
 import { useIsNftProfilePage } from 'hooks/useIsNftPage'
-import styled from 'lib/styled-components'
 import { Center, Column } from 'nft/components/Flex'
 import { BagIcon, LargeTagIcon } from 'nft/components/icons'
 import { subhead } from 'nft/css/common.css'
 import { themeVars } from 'nft/css/sprinkles.css'
+import styled from 'styled-components'
 
 const StyledColumn = styled(Column)`
   gap: 12px;
diff --git a/apps/web/src/nft/components/bag/TimedLoader.tsx b/apps/web/src/nft/components/bag/TimedLoader.tsx
index 89b2a81158b..347533b20c5 100644
--- a/apps/web/src/nft/components/bag/TimedLoader.tsx
+++ b/apps/web/src/nft/components/bag/TimedLoader.tsx
@@ -1,5 +1,5 @@
-import styled, { keyframes } from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
+import styled, { keyframes } from 'styled-components'
 
 const dash = keyframes`
   0% {
diff --git a/apps/web/src/nft/components/card/containers.tsx b/apps/web/src/nft/components/card/containers.tsx
index 14d93582279..1479c385af2 100644
--- a/apps/web/src/nft/components/card/containers.tsx
+++ b/apps/web/src/nft/components/card/containers.tsx
@@ -1,9 +1,9 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
-import styled from 'lib/styled-components'
 import { StyledImage } from 'nft/components/card/media'
 import { ReactNode } from 'react'
 import { Link } from 'react-router-dom'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 
diff --git a/apps/web/src/nft/components/card/icons.tsx b/apps/web/src/nft/components/card/icons.tsx
index 080999d12c2..0fab24deb43 100644
--- a/apps/web/src/nft/components/card/icons.tsx
+++ b/apps/web/src/nft/components/card/icons.tsx
@@ -1,11 +1,11 @@
 import Row from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { getMarketplaceIcon } from 'nft/components/card/utils'
 import { CollectionSelectedAssetIcon } from 'nft/components/icons'
 import { Markets } from 'nft/types'
 import { AlertTriangle, Check, Tag } from 'react-feather'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NftStandard } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/card/media.tsx b/apps/web/src/nft/components/card/media.tsx
index 423721a148c..a614187e25b 100644
--- a/apps/web/src/nft/components/card/media.tsx
+++ b/apps/web/src/nft/components/card/media.tsx
@@ -1,10 +1,10 @@
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { getHeightFromAspectRatio, getMediaAspectRatio, handleUniformAspectRatio } from 'nft/components/card/utils'
 import { UniformAspectRatio, UniformAspectRatios } from 'nft/types'
 import { ReactNode, useEffect, useRef, useState } from 'react'
 import { Pause, Play } from 'react-feather'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { colors } from 'theme/colors'
 import { ThemedText } from 'theme/components'
diff --git a/apps/web/src/nft/components/collection/Activity.tsx b/apps/web/src/nft/components/collection/Activity.tsx
index 1713cf042f3..27b0f8069b0 100644
--- a/apps/web/src/nft/components/collection/Activity.tsx
+++ b/apps/web/src/nft/components/collection/Activity.tsx
@@ -1,7 +1,6 @@
 import { OpacityHoverState } from 'components/Common'
 import { useNftActivity } from 'graphql/data/nft/NftActivity'
 import { useIsMobile } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/Activity.css'
@@ -12,6 +11,7 @@ import { ActivityEventType } from 'nft/types'
 import { useCallback, useReducer } from 'react'
 import InfiniteScroll from 'react-infinite-scroll-component'
 import { Link } from 'react-router-dom'
+import styled from 'styled-components'
 import { NftActivityType } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 enum ColumnHeaders {
diff --git a/apps/web/src/nft/components/collection/ActivityCells.tsx b/apps/web/src/nft/components/collection/ActivityCells.tsx
index 38a31869134..ab9ea411a35 100644
--- a/apps/web/src/nft/components/collection/ActivityCells.tsx
+++ b/apps/web/src/nft/components/collection/ActivityCells.tsx
@@ -1,7 +1,6 @@
 import { InterfacePageName, NFTEventName } from '@uniswap/analytics-events'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/Activity.css'
@@ -27,6 +26,7 @@ import { getMarketplaceIcon } from 'nft/utils'
 import { buildActivityAsset } from 'nft/utils/buildActivityAsset'
 import { getTimeDifference } from 'nft/utils/date'
 import { MouseEvent, ReactNode, useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import {
   NftActivityType,
diff --git a/apps/web/src/nft/components/collection/ActivitySwitcher.tsx b/apps/web/src/nft/components/collection/ActivitySwitcher.tsx
index 0423a5c9e37..8ff8502bd8a 100644
--- a/apps/web/src/nft/components/collection/ActivitySwitcher.tsx
+++ b/apps/web/src/nft/components/collection/ActivitySwitcher.tsx
@@ -1,9 +1,9 @@
 import { InterfaceElementName, NFTEventName } from '@uniswap/analytics-events'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/ActivitySwitcher.css'
 import { useIsCollectionLoading } from 'nft/hooks'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 
 const BaseActivityContainer = styled(Row)`
diff --git a/apps/web/src/nft/components/collection/CollectionNfts.tsx b/apps/web/src/nft/components/collection/CollectionNfts.tsx
index 6e79d0e7afd..70437efe3cb 100644
--- a/apps/web/src/nft/components/collection/CollectionNfts.tsx
+++ b/apps/web/src/nft/components/collection/CollectionNfts.tsx
@@ -7,7 +7,6 @@ import { ASSET_PAGE_SIZE, AssetFetcherParams, useNftAssets } from 'graphql/data/
 import { useIsMobile, useScreenSize } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
 import useDebounce from 'hooks/useDebounce'
-import styled, { css } from 'lib/styled-components'
 import { AnimatedBox, Box } from 'nft/components/Box'
 import { Center, Column, Row } from 'nft/components/Flex'
 import { CollectionSearch, FilterButton } from 'nft/components/collection'
@@ -55,6 +54,7 @@ import { applyFiltersFromURL, syncLocalFiltersWithURL } from 'nft/utils/urlParam
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import InfiniteScroll from 'react-infinite-scroll-component'
 import { useLocation } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import {
   NftAssetTraitInput,
diff --git a/apps/web/src/nft/components/collection/CollectionPageSkeleton.tsx b/apps/web/src/nft/components/collection/CollectionPageSkeleton.tsx
index ba44ee67a8a..b50eb333016 100644
--- a/apps/web/src/nft/components/collection/CollectionPageSkeleton.tsx
+++ b/apps/web/src/nft/components/collection/CollectionPageSkeleton.tsx
@@ -1,7 +1,6 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { useIsMobile } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { BAG_WIDTH, XXXL_BAG_WIDTH } from 'nft/components/bag/Bag'
 import { ActivitySwitcherLoading } from 'nft/components/collection/ActivitySwitcher'
 import { CollectionNftsAndMenuLoading } from 'nft/components/collection/CollectionNfts'
@@ -9,6 +8,7 @@ import { CollectionStatsLoading } from 'nft/components/collection/CollectionStat
 import { useBag } from 'nft/hooks'
 import { BannerWrapper, CollectionBannerLoading } from 'nft/pages/collection'
 import { ScreenBreakpointsPaddings } from 'nft/pages/collection/index.css'
+import styled from 'styled-components'
 
 const CollectionDescriptionSection = styled(Column)`
   ${ScreenBreakpointsPaddings}
diff --git a/apps/web/src/nft/components/collection/CollectionStats.tsx b/apps/web/src/nft/components/collection/CollectionStats.tsx
index 906f1167e71..4d4f520d6c6 100644
--- a/apps/web/src/nft/components/collection/CollectionStats.tsx
+++ b/apps/web/src/nft/components/collection/CollectionStats.tsx
@@ -1,6 +1,5 @@
 import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { useIsMobile, useScreenSize } from 'hooks/screenSize'
-import styled, { css } from 'lib/styled-components'
 import { Box, BoxProps } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/CollectionStats.css'
@@ -22,6 +21,7 @@ import { GenieCollection, TokenType } from 'nft/types'
 import { roundWholePercentage } from 'nft/utils/numbers'
 import { ReactNode, useEffect, useReducer, useRef, useState } from 'react'
 import ReactMarkdown from 'react-markdown'
+import styled, { css } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/collection/MarketplaceSelect.tsx b/apps/web/src/nft/components/collection/MarketplaceSelect.tsx
index f935d7957db..13f8a01e344 100644
--- a/apps/web/src/nft/components/collection/MarketplaceSelect.tsx
+++ b/apps/web/src/nft/components/collection/MarketplaceSelect.tsx
@@ -1,6 +1,5 @@
 import { NFTEventName, NFTFilterTypes } from '@uniswap/analytics-events'
 import clsx from 'clsx'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/Filters.css'
@@ -11,6 +10,7 @@ import { useCollectionFilters } from 'nft/hooks/useCollectionFilters'
 import { TraitPosition, useTraitsOpen } from 'nft/hooks/useTraitsOpen'
 import { getMarketplaceIcon } from 'nft/utils'
 import { FormEvent, useEffect, useMemo, useReducer, useState } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 
diff --git a/apps/web/src/nft/components/collection/PriceRange.tsx b/apps/web/src/nft/components/collection/PriceRange.tsx
index cf6e4a4e7d3..28f7a8fb514 100644
--- a/apps/web/src/nft/components/collection/PriceRange.tsx
+++ b/apps/web/src/nft/components/collection/PriceRange.tsx
@@ -1,7 +1,6 @@
 import 'rc-slider/assets/index.css'
 
 import { NFTEventName, NFTFilterTypes } from '@uniswap/analytics-events'
-import styled, { useTheme } from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/PriceRange.css'
@@ -15,6 +14,7 @@ import { scrollToTop } from 'nft/utils/scrollToTop'
 import { default as Slider } from 'rc-slider'
 import { FocusEventHandler, FormEvent, useEffect, useState } from 'react'
 import { useLocation } from 'react-router-dom'
+import styled, { useTheme } from 'styled-components'
 import { darkDeprecatedTheme } from 'theme/deprecatedColors'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 
diff --git a/apps/web/src/nft/components/collection/Sweep.tsx b/apps/web/src/nft/components/collection/Sweep.tsx
index e537ee229dd..72277a4df12 100644
--- a/apps/web/src/nft/components/collection/Sweep.tsx
+++ b/apps/web/src/nft/components/collection/Sweep.tsx
@@ -4,12 +4,12 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { formatEther as ethersFormatEther, parseEther } from '@ethersproject/units'
 import { SweepFetcherParams, useSweepNftAssets } from 'graphql/data/nft/Asset'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useBag, useCollectionFilters } from 'nft/hooks'
 import { GenieAsset, Markets, isPooledMarket } from 'nft/types'
 import { calcPoolPrice, isInSameSudoSwapPool } from 'nft/utils'
 import { default as Slider } from 'rc-slider'
 import { useEffect, useMemo, useReducer, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/collection/TraitChip.tsx b/apps/web/src/nft/components/collection/TraitChip.tsx
index 53258a4258b..8451e2a6cb9 100644
--- a/apps/web/src/nft/components/collection/TraitChip.tsx
+++ b/apps/web/src/nft/components/collection/TraitChip.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { CrossIcon } from 'nft/components/icons'
+import styled from 'styled-components'
 
 const TraitChipWrap = styled.div`
   display: flex;
diff --git a/apps/web/src/nft/components/collection/TraitsHeader.tsx b/apps/web/src/nft/components/collection/TraitsHeader.tsx
index 0aab3681977..6f6851d772c 100644
--- a/apps/web/src/nft/components/collection/TraitsHeader.tsx
+++ b/apps/web/src/nft/components/collection/TraitsHeader.tsx
@@ -1,12 +1,12 @@
 import clsx from 'clsx'
 import { useIsMobile } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import * as styles from 'nft/components/collection/Filters.css'
 import { ChevronUpIcon } from 'nft/components/icons'
 import { subheadSmall } from 'nft/css/common.css'
 import { TraitPosition, useTraitsOpen } from 'nft/hooks/useTraitsOpen'
 import { ReactNode, useEffect, useState } from 'react'
+import styled from 'styled-components'
 
 const ChildreMobileWrapper = styled.div<{ isMobile: boolean }>`
   padding: ${({ isMobile }) => (isMobile ? '0px 16px 0px 12px' : '0px')};
diff --git a/apps/web/src/nft/components/collection/TransactionCompleteModal.tsx b/apps/web/src/nft/components/collection/TransactionCompleteModal.tsx
index d01d8e8649c..eb9383fa402 100644
--- a/apps/web/src/nft/components/collection/TransactionCompleteModal.tsx
+++ b/apps/web/src/nft/components/collection/TransactionCompleteModal.tsx
@@ -5,7 +5,6 @@ import { OpacityHoverState } from 'components/Common'
 import { UniIcon } from 'components/Logo/UniIcon'
 import { useIsMobile } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Row } from 'nft/components/Flex'
 import * as styles from 'nft/components/collection/TransactionCompleteModal.css'
@@ -18,6 +17,7 @@ import { TxResponse, TxStateType } from 'nft/types'
 import { generateTweetForPurchase, getSuccessfulImageSize, parseTransactionResponse } from 'nft/utils'
 import { formatAssetEventProperties } from 'nft/utils/formatEventProperties'
 import { useEffect, useMemo, useRef, useState } from 'react'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/collection/UnavailableCollectionPage.tsx b/apps/web/src/nft/components/collection/UnavailableCollectionPage.tsx
index 5d43cb1d703..d3dac453b06 100644
--- a/apps/web/src/nft/components/collection/UnavailableCollectionPage.tsx
+++ b/apps/web/src/nft/components/collection/UnavailableCollectionPage.tsx
@@ -1,7 +1,7 @@
 import Column from 'components/Column'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { AlertTriangle } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, StyledInternalLink, ThemedText } from 'theme/components'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 
diff --git a/apps/web/src/nft/components/collection/shared.tsx b/apps/web/src/nft/components/collection/shared.tsx
index 9db29d4d00b..69fcb0cfba4 100644
--- a/apps/web/src/nft/components/collection/shared.tsx
+++ b/apps/web/src/nft/components/collection/shared.tsx
@@ -1,4 +1,4 @@
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const ClearAllButton = styled.button`
   color: ${({ theme }) => theme.neutral3};
diff --git a/apps/web/src/nft/components/common/SortDropdown/FilterSortDropdown.tsx b/apps/web/src/nft/components/common/SortDropdown/FilterSortDropdown.tsx
index a361ffcaf03..eed0d006bc1 100644
--- a/apps/web/src/nft/components/common/SortDropdown/FilterSortDropdown.tsx
+++ b/apps/web/src/nft/components/common/SortDropdown/FilterSortDropdown.tsx
@@ -1,9 +1,9 @@
-import styled from 'lib/styled-components'
 import { FilterDropdown, FilterItem } from 'nft/components/collection/MarketplaceSelect'
 import { useCollectionFilters } from 'nft/hooks'
 import { DropDownOption } from 'nft/types'
 import { useState } from 'react'
 import { Check } from 'react-feather'
+import styled from 'styled-components'
 
 const CheckIcon = styled(Check)`
   height: 20px;
diff --git a/apps/web/src/nft/components/details/AssetActivity.tsx b/apps/web/src/nft/components/details/AssetActivity.tsx
index 62a298cc5bb..47202c1ea42 100644
--- a/apps/web/src/nft/components/details/AssetActivity.tsx
+++ b/apps/web/src/nft/components/details/AssetActivity.tsx
@@ -1,12 +1,12 @@
 import { OpacityHoverState, ScrollBarStyles } from 'components/Common'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { EventCell } from 'nft/components/collection/ActivityCells'
 import { ActivityEvent } from 'nft/types'
 import { getMarketplaceIcon } from 'nft/utils'
 import { getTimeDifference } from 'nft/utils/date'
 import { ReactNode } from 'react'
+import styled from 'styled-components'
 import { shortenAddress } from 'utilities/src/addresses'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/details/AssetDetails.tsx b/apps/web/src/nft/components/details/AssetDetails.tsx
index efd5fe81a7b..ede1ac3b056 100644
--- a/apps/web/src/nft/components/details/AssetDetails.tsx
+++ b/apps/web/src/nft/components/details/AssetDetails.tsx
@@ -2,7 +2,6 @@ import { OpacityHoverState, ScrollBarStyles } from 'components/Common'
 import Resource from 'components/Tokens/TokenDetails/Resource'
 import { MouseoverTooltip } from 'components/Tooltip/index'
 import { useNftActivity } from 'graphql/data/nft/NftActivity'
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { Center } from 'nft/components/Flex'
 import { reduceFilters } from 'nft/components/collection/Activity'
@@ -20,6 +19,7 @@ import { isVideo } from 'nft/utils/isVideo'
 import { useCallback, useMemo, useReducer, useState } from 'react'
 import InfiniteScroll from 'react-infinite-scroll-component'
 import { Link as RouterLink } from 'react-router-dom'
+import styled from 'styled-components'
 import { NftActivityType } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { shortenAddress } from 'utilities/src/addresses'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/details/AssetDetailsLoading.tsx b/apps/web/src/nft/components/details/AssetDetailsLoading.tsx
index deb180c4a3a..d17d770f937 100644
--- a/apps/web/src/nft/components/details/AssetDetailsLoading.tsx
+++ b/apps/web/src/nft/components/details/AssetDetailsLoading.tsx
@@ -1,8 +1,8 @@
 import Column from 'components/Column'
 import Loader from 'components/Icons/LoadingSpinner'
 import { LoadingBubble } from 'components/Tokens/loading'
-import styled, { useTheme } from 'lib/styled-components'
 import { ScreenBreakpointsPaddings } from 'nft/pages/collection/index.css'
+import styled, { useTheme } from 'styled-components'
 
 const BREAKPOINT = '960px'
 
diff --git a/apps/web/src/nft/components/details/AssetPriceDetails.tsx b/apps/web/src/nft/components/details/AssetPriceDetails.tsx
index 53bbd080e1e..82f71fe2daf 100644
--- a/apps/web/src/nft/components/details/AssetPriceDetails.tsx
+++ b/apps/web/src/nft/components/details/AssetPriceDetails.tsx
@@ -3,13 +3,13 @@ import { OpacityHoverState } from 'components/Common'
 import { Share } from 'components/Icons/Share'
 import { useNftBalance } from 'graphql/data/nft/NftBalance'
 import { useAccount } from 'hooks/useAccount'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { CancelListingIcon, VerifiedIcon } from 'nft/components/icons'
 import { useBag, useNativeUsdPrice, useProfilePageState, useSellAsset, useUsdPriceofNftAsset } from 'nft/hooks'
 import { CollectionInfoForAsset, GenieAsset, ProfilePageStateType, WalletAsset } from 'nft/types'
 import { generateTweetForAsset, getMarketplaceIcon, timeLeft } from 'nft/utils'
 import { useMemo } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
+import styled, { css, useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/nft/components/details/DetailsContainer.tsx b/apps/web/src/nft/components/details/DetailsContainer.tsx
index c55065afe1c..e587d592ed6 100644
--- a/apps/web/src/nft/components/details/DetailsContainer.tsx
+++ b/apps/web/src/nft/components/details/DetailsContainer.tsx
@@ -1,9 +1,9 @@
 import { OpacityHoverState } from 'components/Common'
 import useCopyClipboard from 'hooks/useCopyClipboard'
-import styled from 'lib/styled-components'
 import { CollectionInfoForAsset, GenieAsset } from 'nft/types'
 import { useCallback } from 'react'
 import { Copy } from 'react-feather'
+import styled from 'styled-components'
 import { shortenAddress } from 'utilities/src/addresses'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/details/InfoContainer.tsx b/apps/web/src/nft/components/details/InfoContainer.tsx
index 8586fbc3c6d..2fbbd16a1df 100644
--- a/apps/web/src/nft/components/details/InfoContainer.tsx
+++ b/apps/web/src/nft/components/details/InfoContainer.tsx
@@ -1,6 +1,6 @@
-import styled, { css } from 'lib/styled-components'
 import { useState } from 'react'
 import { ChevronDown, ChevronUp } from 'react-feather'
+import styled, { css } from 'styled-components'
 
 const Header = styled.div<{ isOpen: boolean }>`
   display: flex;
diff --git a/apps/web/src/nft/components/details/TraitsContainer.tsx b/apps/web/src/nft/components/details/TraitsContainer.tsx
index c1681cfc98b..248d7d42873 100644
--- a/apps/web/src/nft/components/details/TraitsContainer.tsx
+++ b/apps/web/src/nft/components/details/TraitsContainer.tsx
@@ -1,9 +1,9 @@
 import { OpacityHoverState } from 'components/Common'
-import styled from 'lib/styled-components'
 import { GenieAsset, Trait } from 'nft/types'
 import qs from 'query-string'
 import { useMemo } from 'react'
 import { Link } from 'react-router-dom'
+import styled from 'styled-components'
 
 const Grid = styled.div`
   display: grid;
diff --git a/apps/web/src/nft/components/explore/Banner.tsx b/apps/web/src/nft/components/explore/Banner.tsx
index 0367d12ddd9..9472023395f 100644
--- a/apps/web/src/nft/components/explore/Banner.tsx
+++ b/apps/web/src/nft/components/explore/Banner.tsx
@@ -1,10 +1,10 @@
 import { useTrendingCollections } from 'graphql/data/nft/TrendingCollections'
-import styled from 'lib/styled-components'
 import { Carousel, LoadingCarousel } from 'nft/components/explore/Carousel'
 import { CarouselCard, LoadingCarouselCard } from 'nft/components/explore/CarouselCard'
 import { calculateCardIndex } from 'nft/utils'
 import { useCallback, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { HistoryDuration } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
 const BannerContainer = styled.div`
diff --git a/apps/web/src/nft/components/explore/Carousel.tsx b/apps/web/src/nft/components/explore/Carousel.tsx
index 52f7560a422..2bf34669e0f 100644
--- a/apps/web/src/nft/components/explore/Carousel.tsx
+++ b/apps/web/src/nft/components/explore/Carousel.tsx
@@ -1,8 +1,8 @@
-import styled from 'lib/styled-components'
 import { ChevronLeftIcon, ChevronRightIcon } from 'nft/components/icons'
 import { calculateCardIndex, calculateFirstCardIndex, calculateRank } from 'nft/utils'
 import { ReactNode, useCallback, useEffect, useRef } from 'react'
 import { a, useSprings } from 'react-spring'
+import styled from 'styled-components'
 
 const CarouselContainer = styled.div`
   display: flex;
diff --git a/apps/web/src/nft/components/explore/CarouselCard.tsx b/apps/web/src/nft/components/explore/CarouselCard.tsx
index 6ac2b8ce09e..073dc65ddc6 100644
--- a/apps/web/src/nft/components/explore/CarouselCard.tsx
+++ b/apps/web/src/nft/components/explore/CarouselCard.tsx
@@ -1,9 +1,9 @@
 import { loadingAnimation } from 'components/Loader/styled'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { useCollection } from 'graphql/data/nft/Collection'
-import styled from 'lib/styled-components'
 import { UniswapMagentaIcon, VerifiedIcon } from 'nft/components/icons'
 import { Markets, TrendingCollection } from 'nft/types'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components/text'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/explore/Cells/Cells.tsx b/apps/web/src/nft/components/explore/Cells/Cells.tsx
index a0f07fb514e..1c848e67a17 100644
--- a/apps/web/src/nft/components/explore/Cells/Cells.tsx
+++ b/apps/web/src/nft/components/explore/Cells/Cells.tsx
@@ -1,11 +1,11 @@
 import { formatEther } from '@ethersproject/units'
 import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { useIsMobile } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import * as styles from 'nft/components/explore/Cells/Cells.css'
 import { VerifiedIcon } from 'nft/components/icons'
 import { Denomination } from 'nft/types'
 import { ReactNode } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/explore/Table.tsx b/apps/web/src/nft/components/explore/Table.tsx
index 6c9adea1598..4a19361dfc8 100644
--- a/apps/web/src/nft/components/explore/Table.tsx
+++ b/apps/web/src/nft/components/explore/Table.tsx
@@ -4,7 +4,6 @@ import { ArrowChangeUp } from 'components/Icons/ArrowChangeUp'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { useIsMobile, useWindowSize } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
-import styled, { useTheme } from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { ColumnHeaders } from 'nft/components/explore/CollectionTable'
 import * as styles from 'nft/components/explore/Explore.css'
@@ -12,6 +11,7 @@ import { CollectionTableColumn } from 'nft/types'
 import { useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { Column, ColumnInstance, HeaderGroup, IdType, useSortBy, useTable } from 'react-table'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 
diff --git a/apps/web/src/nft/components/explore/TrendingCollections.tsx b/apps/web/src/nft/components/explore/TrendingCollections.tsx
index b8264b7e9c9..88bec093584 100644
--- a/apps/web/src/nft/components/explore/TrendingCollections.tsx
+++ b/apps/web/src/nft/components/explore/TrendingCollections.tsx
@@ -1,10 +1,10 @@
 import { OpacityHoverState } from 'components/Common'
 import { useTrendingCollections } from 'graphql/data/nft/TrendingCollections'
-import styled from 'lib/styled-components'
 import CollectionTable from 'nft/components/explore/CollectionTable'
 import { useNativeUsdPrice } from 'nft/hooks'
 import { CollectionTableColumn, Denomination, TimePeriod, VolumeType } from 'nft/types'
 import { useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { HistoryDuration } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { useFormatterLocales } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/icons.tsx b/apps/web/src/nft/components/icons.tsx
index c34124d998d..f8d4339d371 100644
--- a/apps/web/src/nft/components/icons.tsx
+++ b/apps/web/src/nft/components/icons.tsx
@@ -1,6 +1,6 @@
-import styled, { useTheme } from 'lib/styled-components'
 import { themeVars, vars } from 'nft/css/sprinkles.css'
 import React from 'react'
+import styled, { useTheme } from 'styled-components'
 
 // ESLint reports `fill` is missing, whereas it exists on an SVGProps type
 type SVGProps = React.SVGProps<SVGSVGElement> & {
@@ -235,6 +235,28 @@ export const BrokenLinkIcon = (props: SVGProps) => (
   </svg>
 )
 
+export const RowsCollpsedIcon = () => (
+  <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M13.9912 5.42773C13.71 5.42773 13.4639 5.55957 13.1738 5.78809L7.24121 10.5869C7.03027 10.7627 6.89844 11.0264 6.89844 11.3516C6.89844 11.9492 7.38184 12.3887 7.93555 12.3887C8.19043 12.3887 8.44531 12.292 8.7002 12.0898L14 7.81836L19.291 12.0898C19.5371 12.292 19.8008 12.3887 20.0557 12.3887C20.6094 12.3887 21.0928 11.9492 21.0928 11.3516C21.0928 11.0264 20.9609 10.7627 20.75 10.5869L14.8086 5.78809C14.5273 5.55957 14.2812 5.42773 13.9912 5.42773ZM13.9912 21.7139C14.2812 21.7139 14.5273 21.5908 14.8086 21.3623L20.75 16.5635C20.9609 16.3789 21.0928 16.1152 21.0928 15.7988C21.0928 15.1924 20.6094 14.7529 20.0557 14.7529C19.8008 14.7529 19.5371 14.8584 19.291 15.0605L14 19.332L8.7002 15.0605C8.44531 14.8584 8.19043 14.7529 7.93555 14.7529C7.38184 14.7529 6.89844 15.1924 6.89844 15.7988C6.89844 16.1152 7.03027 16.3789 7.24121 16.5635L13.1738 21.3535C13.4639 21.5908 13.71 21.7139 13.9912 21.7139Z"
+      fill="#70757A"
+    />
+  </svg>
+)
+
+export const RowsExpandedIcon = () => (
+  <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M13.9912 11.9609C14.2812 11.9609 14.5273 11.8379 14.8086 11.6094L20.75 6.81055C20.9609 6.62598 21.0928 6.3623 21.0928 6.0459C21.0928 5.43945 20.6094 5 20.0557 5C19.8008 5 19.5371 5.10547 19.291 5.30762L14 9.5791L8.7002 5.30762C8.44531 5.10547 8.19043 5 7.93555 5C7.38184 5 6.89844 5.43945 6.89844 6.0459C6.89844 6.3623 7.03027 6.62598 7.24121 6.81055L13.1738 11.6006C13.4639 11.8379 13.71 11.9609 13.9912 11.9609Z"
+      fill="#70757A"
+    />
+    <path
+      d="M14.0928 15C13.8115 15 13.5654 15.1318 13.2754 15.3604L7.34277 20.1592C7.13184 20.335 7 20.5986 7 20.9238C7 21.5215 7.4834 21.9609 8.03711 21.9609C8.29199 21.9609 8.54688 21.8643 8.80176 21.6621L14.1016 17.3906L19.3926 21.6621C19.6387 21.8643 19.9023 21.9609 20.1572 21.9609C20.7109 21.9609 21.1943 21.5215 21.1943 20.9238C21.1943 20.5986 21.0625 20.335 20.8516 20.1592L14.9102 15.3604C14.6289 15.1318 14.3828 15 14.0928 15Z"
+      fill="#70757A"
+    />
+  </svg>
+)
+
 export const ClockIcon = () => (
   <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
diff --git a/apps/web/src/nft/components/layout/Checkbox.tsx b/apps/web/src/nft/components/layout/Checkbox.tsx
index 0121b8609c6..daeeb395402 100644
--- a/apps/web/src/nft/components/layout/Checkbox.tsx
+++ b/apps/web/src/nft/components/layout/Checkbox.tsx
@@ -1,6 +1,6 @@
-import styled from 'lib/styled-components'
 import { ApprovedCheckmarkIcon } from 'nft/components/icons'
 import React from 'react'
+import styled from 'styled-components'
 import { ClickableStyle } from 'theme/components'
 
 const CheckboxLabel = styled.label`
diff --git a/apps/web/src/nft/components/profile/list/Dropdown.tsx b/apps/web/src/nft/components/profile/list/Dropdown.tsx
index c4c1b6ce3a0..83e052876c9 100644
--- a/apps/web/src/nft/components/profile/list/Dropdown.tsx
+++ b/apps/web/src/nft/components/profile/list/Dropdown.tsx
@@ -1,8 +1,8 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
-import styled, { useTheme } from 'lib/styled-components'
 import { DropDownOption } from 'nft/types'
 import { Check } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const DropdownWrapper = styled(Column)<{ $width: number }>`
diff --git a/apps/web/src/nft/components/profile/list/ListPage.tsx b/apps/web/src/nft/components/profile/list/ListPage.tsx
index 1e7d5eb5708..80376116a86 100644
--- a/apps/web/src/nft/components/profile/list/ListPage.tsx
+++ b/apps/web/src/nft/components/profile/list/ListPage.tsx
@@ -7,7 +7,6 @@ import { useEthersSigner } from 'hooks/useEthersSigner'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import { Trans } from 'i18n'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { ListingButton } from 'nft/components/profile/list/ListingButton'
 import { ListModal } from 'nft/components/profile/list/Modal/ListModal'
@@ -26,6 +25,7 @@ import { ProfilePageStateType } from 'nft/types'
 import { ListingMarkets } from 'nft/utils/listNfts'
 import { useEffect, useMemo, useReducer, useState } from 'react'
 import { ArrowLeft } from 'react-feather'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/nft/components/profile/list/ListingButton.tsx b/apps/web/src/nft/components/profile/list/ListingButton.tsx
index 9b1a6c8bd28..865968d7c69 100644
--- a/apps/web/src/nft/components/profile/list/ListingButton.tsx
+++ b/apps/web/src/nft/components/profile/list/ListingButton.tsx
@@ -1,11 +1,11 @@
 import { BaseButton } from 'components/Button'
 import { useIsMobile } from 'hooks/screenSize'
 import { Plural, Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { BelowFloorWarningModal } from 'nft/components/profile/list/Modal/BelowFloorWarningModal'
 import { findListingIssues } from 'nft/components/profile/list/utils'
 import { useSellAsset } from 'nft/hooks'
 import { useMemo, useState } from 'react'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 
 const StyledListingButton = styled(BaseButton)<{ showResolveIssues: boolean; missingPrices: boolean }>`
diff --git a/apps/web/src/nft/components/profile/list/MarketplaceRow.tsx b/apps/web/src/nft/components/profile/list/MarketplaceRow.tsx
index 98e00400d8f..2b2b1c3666c 100644
--- a/apps/web/src/nft/components/profile/list/MarketplaceRow.tsx
+++ b/apps/web/src/nft/components/profile/list/MarketplaceRow.tsx
@@ -1,10 +1,8 @@
 import Column from 'components/Column'
-import { CollapsedIcon } from 'components/Icons/Collapse'
-import { ExpandIcon } from 'components/Icons/Expand'
 import Row from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
+import { RowsCollpsedIcon, RowsExpandedIcon } from 'nft/components/icons'
 import { PriceTextInput } from 'nft/components/profile/list/PriceTextInput'
 import { RoyaltyTooltip } from 'nft/components/profile/list/RoyaltyTooltip'
 import { RemoveIconWrap, SetPriceMethod } from 'nft/components/profile/list/shared'
@@ -14,6 +12,7 @@ import { useNativeUsdPrice } from 'nft/hooks/useUsdPrice'
 import { ListingMarket, WalletAsset } from 'nft/types'
 import { getMarketplaceIcon } from 'nft/utils'
 import { Dispatch, DispatchWithoutAction, useCallback, useEffect, useMemo, useReducer, useState } from 'react'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
@@ -231,7 +230,7 @@ export const MarketplaceRow = ({
         />
         {rowHovered && ((expandMarketplaceRows && marketRowHovered) || selectedMarkets.length > 1) && (
           <ExpandMarketIconWrapper onClick={toggleExpandMarketplaceRows}>
-            {expandMarketplaceRows ? <ExpandIcon /> : <CollapsedIcon />}
+            {expandMarketplaceRows ? <RowsExpandedIcon /> : <RowsCollpsedIcon />}
           </ExpandMarketIconWrapper>
         )}
       </Row>
diff --git a/apps/web/src/nft/components/profile/list/Modal/BelowFloorWarningModal.tsx b/apps/web/src/nft/components/profile/list/Modal/BelowFloorWarningModal.tsx
index e956596b226..2942938c428 100644
--- a/apps/web/src/nft/components/profile/list/Modal/BelowFloorWarningModal.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/BelowFloorWarningModal.tsx
@@ -1,12 +1,12 @@
 import { ButtonPrimary } from 'components/Button'
 import Column from 'components/Column'
 import { Plural, Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Portal } from 'nft/components/common/Portal'
 import { Overlay } from 'nft/components/modals/Overlay'
 import { Listing, WalletAsset } from 'nft/types'
 import React from 'react'
 import { AlertTriangle, X } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/nft/components/profile/list/Modal/ContentRow.tsx b/apps/web/src/nft/components/profile/list/Modal/ContentRow.tsx
index 80cf7b9f00e..7efaf21545e 100644
--- a/apps/web/src/nft/components/profile/list/Modal/ContentRow.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/ContentRow.tsx
@@ -2,12 +2,12 @@ import Column from 'components/Column'
 import Loader from 'components/Icons/LoadingSpinner'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { VerifiedIcon } from 'nft/components/icons'
 import { AssetRow, CollectionRow, ListingStatus } from 'nft/types'
 import { getMarketplaceIcon } from 'nft/utils'
 import { useEffect, useRef } from 'react'
 import { Check, XOctagon } from 'react-feather'
+import styled, { css, useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
 
diff --git a/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx b/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx
index 66dde30ab9b..7025d4a580a 100644
--- a/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx
@@ -4,7 +4,6 @@ import { useEthersWeb3Provider } from 'hooks/useEthersProvider'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import { Trans } from 'i18n'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { Portal } from 'nft/components/common/Portal'
 import { Overlay } from 'nft/components/modals/Overlay'
@@ -16,6 +15,7 @@ import { useNFTList, useSellAsset } from 'nft/hooks'
 import { ListingStatus } from 'nft/types'
 import { useCallback, useEffect, useMemo, useReducer } from 'react'
 import { X } from 'react-feather'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/nft/components/profile/list/Modal/ListModalSection.tsx b/apps/web/src/nft/components/profile/list/Modal/ListModalSection.tsx
index 6c04c6af018..4982b4e4445 100644
--- a/apps/web/src/nft/components/profile/list/Modal/ListModalSection.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/ListModalSection.tsx
@@ -3,13 +3,13 @@ import { ScrollBarStyles } from 'components/Common'
 import Row from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { Plural, Trans, t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ChevronUpIcon, ListingModalWindowActive, ListingModalWindowClosed } from 'nft/components/icons'
 import { ContentRow } from 'nft/components/profile/list/Modal/ContentRow'
 import { useSellAsset } from 'nft/hooks'
 import { AssetRow, CollectionRow, ListingRow, ListingStatus } from 'nft/types'
 import { useMemo } from 'react'
 import { Info } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { colors } from 'theme/colors'
 import { ThemedText } from 'theme/components'
 import { TRANSITION_DURATIONS } from 'theme/styles'
diff --git a/apps/web/src/nft/components/profile/list/Modal/SuccessScreen.tsx b/apps/web/src/nft/components/profile/list/Modal/SuccessScreen.tsx
index dae9486f7c9..dbe4d9cfe4b 100644
--- a/apps/web/src/nft/components/profile/list/Modal/SuccessScreen.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/SuccessScreen.tsx
@@ -5,7 +5,6 @@ import { useAccount } from 'hooks/useAccount'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import { Trans } from 'i18n'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled, { css, useTheme } from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { TitleRow } from 'nft/components/profile/list/shared'
 import { getTotalEthValue } from 'nft/components/profile/list/utils'
@@ -13,6 +12,7 @@ import { useSellAsset } from 'nft/hooks'
 import { generateTweetForList, pluralize } from 'nft/utils'
 import { useMemo } from 'react'
 import { Twitter, X } from 'react-feather'
+import styled, { css, useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/profile/list/NFTListRow.tsx b/apps/web/src/nft/components/profile/list/NFTListRow.tsx
index e2fdddbe3e7..f773b79a647 100644
--- a/apps/web/src/nft/components/profile/list/NFTListRow.tsx
+++ b/apps/web/src/nft/components/profile/list/NFTListRow.tsx
@@ -1,6 +1,5 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
-import styled, { css, useTheme } from 'lib/styled-components'
 import { VerifiedIcon } from 'nft/components/icons'
 import { MarketplaceRow } from 'nft/components/profile/list/MarketplaceRow'
 import { SetPriceMethod } from 'nft/components/profile/list/shared'
@@ -8,6 +7,7 @@ import { useSellAsset } from 'nft/hooks'
 import { ListingMarket, WalletAsset } from 'nft/types'
 import { Dispatch, useEffect, useReducer, useState } from 'react'
 import { Trash2 } from 'react-feather'
+import styled, { css, useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 
diff --git a/apps/web/src/nft/components/profile/list/NFTListingsGrid.tsx b/apps/web/src/nft/components/profile/list/NFTListingsGrid.tsx
index 3cf35f5eb1a..35c688765be 100644
--- a/apps/web/src/nft/components/profile/list/NFTListingsGrid.tsx
+++ b/apps/web/src/nft/components/profile/list/NFTListingsGrid.tsx
@@ -2,7 +2,6 @@ import Column from 'components/Column'
 import Row from 'components/Row'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { Dropdown } from 'nft/components/profile/list/Dropdown'
 import { NFTListRow } from 'nft/components/profile/list/NFTListRow'
 import { SetPriceMethod } from 'nft/components/profile/list/shared'
@@ -10,6 +9,7 @@ import { useSellAsset } from 'nft/hooks'
 import { DropDownOption, ListingMarket } from 'nft/types'
 import { useMemo, useReducer, useRef, useState } from 'react'
 import { ChevronDown } from 'react-feather'
+import styled, { css } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 
 const TableHeader = styled.div`
diff --git a/apps/web/src/nft/components/profile/list/PriceTextInput.tsx b/apps/web/src/nft/components/profile/list/PriceTextInput.tsx
index 3d16f8b958f..374bdd03035 100644
--- a/apps/web/src/nft/components/profile/list/PriceTextInput.tsx
+++ b/apps/web/src/nft/components/profile/list/PriceTextInput.tsx
@@ -1,7 +1,6 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { BrokenLinkIcon } from 'nft/components/icons'
 import { NumericInput } from 'nft/components/layout/Input'
 import { WarningType } from 'nft/components/profile/list/shared'
@@ -11,6 +10,7 @@ import { useSellAsset } from 'nft/hooks'
 import { WalletAsset } from 'nft/types'
 import { Dispatch, useRef, useState } from 'react'
 import { AlertTriangle, Link } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { colors } from 'theme/colors'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/nft/components/profile/list/RoyaltyTooltip.tsx b/apps/web/src/nft/components/profile/list/RoyaltyTooltip.tsx
index ead75f81c38..a55a5ba1374 100644
--- a/apps/web/src/nft/components/profile/list/RoyaltyTooltip.tsx
+++ b/apps/web/src/nft/components/profile/list/RoyaltyTooltip.tsx
@@ -1,10 +1,10 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { getRoyalty } from 'nft/components/profile/list/utils'
 import { ListingMarket, WalletAsset } from 'nft/types'
 import { getMarketplaceIcon } from 'nft/utils'
+import styled, { css } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/nft/components/profile/list/SelectMarketplacesDropdown.tsx b/apps/web/src/nft/components/profile/list/SelectMarketplacesDropdown.tsx
index d3b76255eee..ddc0592b4ce 100644
--- a/apps/web/src/nft/components/profile/list/SelectMarketplacesDropdown.tsx
+++ b/apps/web/src/nft/components/profile/list/SelectMarketplacesDropdown.tsx
@@ -1,6 +1,5 @@
 import { SMALL_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import styled from 'lib/styled-components'
 import { Column, Row } from 'nft/components/Flex'
 import { ChevronUpIcon } from 'nft/components/icons'
 import { Checkbox } from 'nft/components/layout/Checkbox'
@@ -10,6 +9,7 @@ import { ListingMarket } from 'nft/types'
 import { getMarketplaceIcon } from 'nft/utils'
 import { ListingMarkets } from 'nft/utils/listNfts'
 import { Dispatch, FormEvent, useMemo, useReducer, useRef } from 'react'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/nft/components/profile/list/SetDurationModal.tsx b/apps/web/src/nft/components/profile/list/SetDurationModal.tsx
index 499d951d9ad..8c7ac2994a0 100644
--- a/apps/web/src/nft/components/profile/list/SetDurationModal.tsx
+++ b/apps/web/src/nft/components/profile/list/SetDurationModal.tsx
@@ -1,6 +1,5 @@
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Plural, t } from 'i18n'
-import styled from 'lib/styled-components'
 import ms from 'ms'
 import { Column, Row } from 'nft/components/Flex'
 import { NumericInput } from 'nft/components/layout/Input'
@@ -10,6 +9,7 @@ import { useSellAsset } from 'nft/hooks'
 import { DropDownOption } from 'nft/types'
 import { useEffect, useMemo, useReducer, useRef, useState } from 'react'
 import { AlertTriangle, ChevronDown } from 'react-feather'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 const ModalWrapper = styled(Column)`
diff --git a/apps/web/src/nft/components/profile/list/shared.tsx b/apps/web/src/nft/components/profile/list/shared.tsx
index f46a8ea40e6..a9e86bd5f50 100644
--- a/apps/web/src/nft/components/profile/list/shared.tsx
+++ b/apps/web/src/nft/components/profile/list/shared.tsx
@@ -1,5 +1,5 @@
 import Row from 'components/Row'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const RemoveIconWrap = styled.div<{ hovered: boolean }>`
   position: absolute;
diff --git a/apps/web/src/nft/components/profile/view/EmptyWalletContent.tsx b/apps/web/src/nft/components/profile/view/EmptyWalletContent.tsx
index b337b2c9496..0665b60e4b3 100644
--- a/apps/web/src/nft/components/profile/view/EmptyWalletContent.tsx
+++ b/apps/web/src/nft/components/profile/view/EmptyWalletContent.tsx
@@ -1,9 +1,9 @@
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { EmptyActivityIcon, EmptyNftsIcon, EmptyPoolsIcon, EmptyTokensIcon } from 'nft/components/profile/view/icons'
 import { headlineMedium } from 'nft/css/common.css'
 import { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const EmptyWalletContainer = styled.div`
diff --git a/apps/web/src/nft/components/profile/view/FilterSidebar.tsx b/apps/web/src/nft/components/profile/view/FilterSidebar.tsx
index 6d46e36b20d..566157aacb4 100644
--- a/apps/web/src/nft/components/profile/view/FilterSidebar.tsx
+++ b/apps/web/src/nft/components/profile/view/FilterSidebar.tsx
@@ -1,7 +1,6 @@
 import { ScrollBarStyles } from 'components/Common'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { useIsMobile } from 'hooks/screenSize'
-import styled from 'lib/styled-components'
 import { AnimatedBox, Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import { XMarkIcon } from 'nft/components/icons'
@@ -29,6 +28,7 @@ import { easings, useSpring } from 'react-spring'
 import AutoSizer from 'react-virtualized-auto-sizer'
 import { FixedSizeList, ListOnItemsRenderedProps } from 'react-window'
 import InfiniteLoader from 'react-window-infinite-loader'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { TRANSITION_DURATIONS } from 'theme/styles'
 import noop from 'utilities/src/react/noop'
diff --git a/apps/web/src/nft/components/profile/view/ProfilePage.tsx b/apps/web/src/nft/components/profile/view/ProfilePage.tsx
index 8a9269a819d..e8a69cc6812 100644
--- a/apps/web/src/nft/components/profile/view/ProfilePage.tsx
+++ b/apps/web/src/nft/components/profile/view/ProfilePage.tsx
@@ -2,7 +2,6 @@ import { useInfiniteQuery } from '@tanstack/react-query'
 import { useNftBalance } from 'graphql/data/nft/NftBalance'
 import { useIsMobile } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
-import styled from 'lib/styled-components'
 import { AnimatedBox, Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
 import { LoadingAssets } from 'nft/components/collection/CollectionAssetLoading'
@@ -23,6 +22,7 @@ import { WalletCollection } from 'nft/types'
 import { Dispatch, SetStateAction, Suspense, useCallback, useEffect, useMemo, useState } from 'react'
 import InfiniteScroll from 'react-infinite-scroll-component'
 import { easings, useSpring } from 'react-spring'
+import styled from 'styled-components'
 
 const ProfilePageColumn = styled(Column)`
   ${ScreenBreakpointsPaddings}
diff --git a/apps/web/src/nft/components/profile/view/ProfilePageLoadingSkeleton.tsx b/apps/web/src/nft/components/profile/view/ProfilePageLoadingSkeleton.tsx
index ae525610954..b6cbd537681 100644
--- a/apps/web/src/nft/components/profile/view/ProfilePageLoadingSkeleton.tsx
+++ b/apps/web/src/nft/components/profile/view/ProfilePageLoadingSkeleton.tsx
@@ -1,8 +1,8 @@
-import styled from 'lib/styled-components'
 import { Box } from 'nft/components/Box'
 import { assetList } from 'nft/components/collection/CollectionNfts.css'
 import { DEFAULT_WALLET_ASSET_QUERY_AMOUNT } from 'nft/components/profile/view/ProfilePage'
 import { loadingAsset } from 'nft/css/loading.css'
+import styled from 'styled-components'
 
 const SkeletonBodyWrapper = styled.div`
   display: flex;
diff --git a/apps/web/src/nft/components/profile/view/icons.tsx b/apps/web/src/nft/components/profile/view/icons.tsx
index 2e9d1f49a5b..35f2a42e147 100644
--- a/apps/web/src/nft/components/profile/view/icons.tsx
+++ b/apps/web/src/nft/components/profile/view/icons.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from 'lib/styled-components'
+import { useTheme } from 'styled-components'
 import { colors } from 'theme/colors'
 
 type SVGProps = React.SVGProps<SVGSVGElement> & { fill?: string }
diff --git a/apps/web/src/nft/hooks/usePriceImpact.ts b/apps/web/src/nft/hooks/usePriceImpact.ts
index bb42d4a8fab..b9191021a28 100644
--- a/apps/web/src/nft/hooks/usePriceImpact.ts
+++ b/apps/web/src/nft/hooks/usePriceImpact.ts
@@ -1,6 +1,6 @@
-import { useTheme } from 'lib/styled-components'
 import { useMemo } from 'react'
 import { ClassicTrade } from 'state/routing/types'
+import { useTheme } from 'styled-components'
 import { useFormatter } from 'utils/formatNumbers'
 import { computeRealizedPriceImpact, getPriceImpactWarning } from 'utils/prices'
 
diff --git a/apps/web/src/nft/pages/asset/Asset.tsx b/apps/web/src/nft/pages/asset/Asset.tsx
index b92aefd182e..5f3c3972da9 100644
--- a/apps/web/src/nft/pages/asset/Asset.tsx
+++ b/apps/web/src/nft/pages/asset/Asset.tsx
@@ -1,7 +1,6 @@
 import { InterfacePageName } from '@uniswap/analytics-events'
 import { useNftAssetDetails } from 'graphql/data/nft/Details'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { AssetDetails } from 'nft/components/details/AssetDetails'
 import { AssetDetailsLoading } from 'nft/components/details/AssetDetailsLoading'
 import { AssetPriceDetails } from 'nft/components/details/AssetPriceDetails'
@@ -11,8 +10,8 @@ import { useMemo } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
 import { Navigate, useParams } from 'react-router-dom'
 import { formatNFTAssetMetatagTitleName } from 'shared-cloud/metatags'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
-import { isIFramed } from 'utils/isIFramed'
 
 const AssetContainer = styled.div`
   display: flex;
@@ -60,9 +59,7 @@ const AssetPage = () => {
   )
   const metaTags = useDynamicMetatags(metaTagProperties)
 
-  // Don't allow iFraming of this page. isIFramed(true) busts out of the iFrame by redirecting main page to current iFrame url
-  // https://www.notion.so/uniswaplabs/What-is-not-allowed-to-be-iFramed-Clickjacking-protections-874f85f066c648afa0eb3480b3f47b5c#d0ebf1846c83475a86342a594f77eae5
-  if (blocklistedCollections.includes(contractAddress) || isIFramed(true)) {
+  if (blocklistedCollections.includes(contractAddress)) {
     return <Navigate to="/nfts" replace />
   }
 
diff --git a/apps/web/src/nft/pages/collection/index.css.ts b/apps/web/src/nft/pages/collection/index.css.ts
index a004f8fd6fb..fbb73a4da73 100644
--- a/apps/web/src/nft/pages/collection/index.css.ts
+++ b/apps/web/src/nft/pages/collection/index.css.ts
@@ -1,9 +1,9 @@
 import { style } from '@vanilla-extract/css'
 import { MOBILE_MEDIA_BREAKPOINT, SMALL_MEDIA_BREAKPOINT, XLARGE_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
-import { css } from 'lib/styled-components'
 import { buttonTextMedium } from 'nft/css/common.css'
 import { loadingBlock } from 'nft/css/loading.css'
 import { sprinkles } from 'nft/css/sprinkles.css'
+import { css } from 'styled-components'
 
 export const baseActivitySwitcherToggle = style([
   buttonTextMedium,
diff --git a/apps/web/src/nft/pages/collection/index.tsx b/apps/web/src/nft/pages/collection/index.tsx
index e9e32805670..88cec91a43d 100644
--- a/apps/web/src/nft/pages/collection/index.tsx
+++ b/apps/web/src/nft/pages/collection/index.tsx
@@ -7,7 +7,6 @@ import { useCollection } from 'graphql/data/nft/Collection'
 import { useIsMobile, useScreenSize } from 'hooks/screenSize'
 import { useAccount } from 'hooks/useAccount'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { BAG_WIDTH, XXXL_BAG_WIDTH } from 'nft/components/bag/Bag'
 import { MobileHoverBag } from 'nft/components/bag/MobileHoverBag'
 import { Activity, ActivitySwitcher, CollectionNfts, CollectionStats, Filters } from 'nft/components/collection'
@@ -23,6 +22,7 @@ import { Suspense, useEffect, useMemo } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
 import { useLocation, useNavigate, useParams } from 'react-router-dom'
 import { animated, easings, useSpring } from 'react-spring'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { TRANSITION_DURATIONS } from 'theme/styles'
 import { Z_INDEX } from 'theme/zIndex'
diff --git a/apps/web/src/nft/pages/explore/index.tsx b/apps/web/src/nft/pages/explore/index.tsx
index 1f2c1e0113e..a9075604916 100644
--- a/apps/web/src/nft/pages/explore/index.tsx
+++ b/apps/web/src/nft/pages/explore/index.tsx
@@ -1,9 +1,9 @@
 import { InterfacePageName } from '@uniswap/analytics-events'
-import styled from 'lib/styled-components'
 import Banner from 'nft/components/explore/Banner'
 import TrendingCollections from 'nft/components/explore/TrendingCollections'
 import { useBag } from 'nft/hooks'
 import { useEffect } from 'react'
+import styled from 'styled-components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 
 const ExploreContainer = styled.div`
diff --git a/apps/web/src/nft/pages/profile/index.tsx b/apps/web/src/nft/pages/profile/index.tsx
index 142e902742a..155dc43f6b6 100644
--- a/apps/web/src/nft/pages/profile/index.tsx
+++ b/apps/web/src/nft/pages/profile/index.tsx
@@ -4,7 +4,6 @@ import { ButtonPrimary } from 'components/Button'
 import { useAccount } from 'hooks/useAccount'
 import useENSName from 'hooks/useENSName'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { XXXL_BAG_WIDTH } from 'nft/components/bag/Bag'
 import { ListPage } from 'nft/components/profile/list/ListPage'
 import { ProfilePage } from 'nft/components/profile/view/ProfilePage'
@@ -13,6 +12,7 @@ import { LIST_PAGE_MARGIN, LIST_PAGE_MARGIN_MOBILE } from 'nft/pages/profile/sha
 import { ProfilePageStateType } from 'nft/types'
 import { useEffect, useRef } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/AddLiquidity/Review.tsx b/apps/web/src/pages/AddLiquidity/Review.tsx
index 33eeeb1873f..6432a815307 100644
--- a/apps/web/src/pages/AddLiquidity/Review.tsx
+++ b/apps/web/src/pages/AddLiquidity/Review.tsx
@@ -2,8 +2,8 @@ import { Currency, CurrencyAmount, Price } from '@uniswap/sdk-core'
 import { Position } from '@uniswap/v3-sdk'
 import { AutoColumn } from 'components/Column'
 import { PositionPreview } from 'components/PositionPreview'
-import styled from 'lib/styled-components'
 import { Bound, Field } from 'state/mint/v3/actions'
+import styled from 'styled-components'
 
 const Wrapper = styled.div`
   padding-top: 12px;
diff --git a/apps/web/src/pages/AddLiquidity/blastAlerts.tsx b/apps/web/src/pages/AddLiquidity/blastAlerts.tsx
index 4635c8db20d..fee34319a52 100644
--- a/apps/web/src/pages/AddLiquidity/blastAlerts.tsx
+++ b/apps/web/src/pages/AddLiquidity/blastAlerts.tsx
@@ -3,10 +3,10 @@ import { Dialog, DialogButtonType } from 'components/Dialog/Dialog'
 import AlertTriangleFilled from 'components/Icons/AlertTriangleFilled'
 import Row from 'components/Row'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useCallback, useState } from 'react'
 import { ChevronDown } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { ButtonText, ExternalLink, ThemedText } from 'theme/components'
 
 const StyledAlertIcon = styled(AlertTriangleFilled)`
diff --git a/apps/web/src/pages/AddLiquidity/index.tsx b/apps/web/src/pages/AddLiquidity/index.tsx
index e71eebd9126..ab637b19a9a 100644
--- a/apps/web/src/pages/AddLiquidity/index.tsx
+++ b/apps/web/src/pages/AddLiquidity/index.tsx
@@ -54,7 +54,6 @@ import { useV3PositionFromTokenId } from 'hooks/useV3Positions'
 import { Trans, t } from 'i18n'
 import { atomWithStorage, useAtomValue, useUpdateAtom } from 'jotai/utils'
 import { useSingleCallResult } from 'lib/hooks/multicall'
-import styled, { useTheme } from 'lib/styled-components'
 import { Review } from 'pages/AddLiquidity/Review'
 import { BlastRebasingAlert, BlastRebasingModal } from 'pages/AddLiquidity/blastAlerts'
 import {
@@ -82,6 +81,7 @@ import {
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TransactionInfo, TransactionType } from 'state/transactions/types'
 import { useUserSlippageToleranceWithDefault } from 'state/user/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
diff --git a/apps/web/src/pages/AddLiquidity/styled.tsx b/apps/web/src/pages/AddLiquidity/styled.tsx
index 4c7636f6021..2fbf1ef4666 100644
--- a/apps/web/src/pages/AddLiquidity/styled.tsx
+++ b/apps/web/src/pages/AddLiquidity/styled.tsx
@@ -1,6 +1,6 @@
 import { AutoColumn } from 'components/Column'
 import { Input } from 'components/NumericalInput'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 export const Wrapper = styled.div`
   position: relative;
diff --git a/apps/web/src/pages/AddLiquidityV2/PoolPriceBar.tsx b/apps/web/src/pages/AddLiquidityV2/PoolPriceBar.tsx
index e7e6f61b403..46d0042e1e3 100644
--- a/apps/web/src/pages/AddLiquidityV2/PoolPriceBar.tsx
+++ b/apps/web/src/pages/AddLiquidityV2/PoolPriceBar.tsx
@@ -3,9 +3,9 @@ import { AutoColumn } from 'components/Column'
 import { AutoRow } from 'components/Row'
 import { ONE_BIPS } from 'constants/misc'
 import { Trans } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import { Text } from 'rebass'
 import { Field } from 'state/mint/actions'
+import { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 export function PoolPriceBar({
diff --git a/apps/web/src/pages/AddLiquidityV2/index.tsx b/apps/web/src/pages/AddLiquidityV2/index.tsx
index 8e427f67cd4..c1b4d064d26 100644
--- a/apps/web/src/pages/AddLiquidityV2/index.tsx
+++ b/apps/web/src/pages/AddLiquidityV2/index.tsx
@@ -33,7 +33,6 @@ import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
 import { useGetTransactionDeadline } from 'hooks/useTransactionDeadline'
 import { PairState } from 'hooks/useV2Pairs'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ConfirmAddModalBottom } from 'pages/AddLiquidityV2/ConfirmAddModalBottom'
 import { PoolPriceBar } from 'pages/AddLiquidityV2/PoolPriceBar'
 import AppBody from 'pages/App/AppBody'
@@ -46,6 +45,7 @@ import { useDerivedMintInfo, useMintActionHandlers, useMintState } from 'state/m
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TransactionInfo, TransactionType } from 'state/transactions/types'
 import { useUserSlippageToleranceWithDefault } from 'state/user/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/App/AppBody.tsx b/apps/web/src/pages/App/AppBody.tsx
index 2841cbcc8e0..9ff76f6f9a0 100644
--- a/apps/web/src/pages/App/AppBody.tsx
+++ b/apps/web/src/pages/App/AppBody.tsx
@@ -1,5 +1,5 @@
-import styled from 'lib/styled-components'
 import { PropsWithChildren } from 'react'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
 export const BodyWrapper = styled.main<BodyWrapperProps>`
diff --git a/apps/web/src/pages/App/Header.tsx b/apps/web/src/pages/App/Header.tsx
index c18cf5f90fe..ac76f5c4139 100644
--- a/apps/web/src/pages/App/Header.tsx
+++ b/apps/web/src/pages/App/Header.tsx
@@ -2,11 +2,11 @@ import Navbar from 'components/NavBar/index'
 import { MobileAppPromoBanner, useMobileAppPromoBannerEligible } from 'components/TopLevelBanners/MobileAppPromoBanner'
 import { UkBanner, useRenderUkBanner } from 'components/TopLevelBanners/UkBanner'
 import { ScrollDirection, useScroll } from 'hooks/useScroll'
-import styled from 'lib/styled-components'
 import { useBag } from 'nft/hooks'
 import { GRID_AREAS } from 'pages/App/utils/shared'
 import { memo } from 'react'
 import { useLocation } from 'react-router-dom'
+import styled from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
diff --git a/apps/web/src/pages/App/Layout.tsx b/apps/web/src/pages/App/Layout.tsx
index a10ec2d2196..af6429fce67 100644
--- a/apps/web/src/pages/App/Layout.tsx
+++ b/apps/web/src/pages/App/Layout.tsx
@@ -1,9 +1,9 @@
 import { PageTabs } from 'components/NavBar/LEGACY'
 import { MobileBottomBarLegacy } from 'components/NavBar/MobileBottomBar'
-import styled from 'lib/styled-components'
 import { Body } from 'pages/App/Body'
 import { Header } from 'pages/App/Header'
 import { GRID_AREAS } from 'pages/App/utils/shared'
+import styled from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { Z_INDEX } from 'theme/zIndex'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
diff --git a/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx b/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
index 370fae0681c..f0991179da5 100644
--- a/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
@@ -3,8 +3,8 @@ import AddressInputPanel from 'components/AddressInputPanel'
 import CurrencyInputPanel from 'components/CurrencyInputPanel'
 import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ProposalAction } from 'pages/CreateProposal/ProposalActionSelector'
+import styled from 'styled-components'
 
 enum ProposalActionDetailField {
   ADDRESS,
diff --git a/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx b/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
index 861e92706c7..fe03452fe97 100644
--- a/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
@@ -4,9 +4,9 @@ import Modal from 'components/Modal'
 import { RowBetween } from 'components/Row'
 import { MenuItem, PaddedColumn, Separator } from 'components/SearchModal/styled'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { useCallback } from 'react'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 import { CloseIcon } from 'theme/components'
 
 export enum ProposalAction {
diff --git a/apps/web/src/pages/CreateProposal/ProposalEditor.tsx b/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
index 95671dd83c5..eb125a446be 100644
--- a/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
@@ -1,9 +1,9 @@
 // eslint-disable-next-line no-restricted-imports
 import { ResizingTextArea, TextInput } from 'components/TextInput'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { memo } from 'react'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 
 const ProposalEditorHeader = styled(Text)`
   font-size: 14px;
diff --git a/apps/web/src/pages/CreateProposal/ProposalSubmissionModal.tsx b/apps/web/src/pages/CreateProposal/ProposalSubmissionModal.tsx
index bd34571d59b..627d8fab48c 100644
--- a/apps/web/src/pages/CreateProposal/ProposalSubmissionModal.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalSubmissionModal.tsx
@@ -3,9 +3,9 @@ import { AutoColumn } from 'components/Column'
 import Modal from 'components/Modal'
 import { LoadingView, SubmittedView } from 'components/ModalViews'
 import { Trans } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
+import { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
diff --git a/apps/web/src/pages/CreateProposal/index.tsx b/apps/web/src/pages/CreateProposal/index.tsx
index 3ebaa27070f..2d212b302a5 100644
--- a/apps/web/src/pages/CreateProposal/index.tsx
+++ b/apps/web/src/pages/CreateProposal/index.tsx
@@ -10,7 +10,6 @@ import { UNI } from 'constants/tokens'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
-import styled from 'lib/styled-components'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import AppBody from 'pages/App/AppBody'
 import { ProposalActionDetail } from 'pages/CreateProposal/ProposalActionDetail'
@@ -34,6 +33,7 @@ import {
   useProposalThreshold,
   useUserVotes,
 } from 'state/governance/hooks'
+import styled from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 
diff --git a/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx b/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
index 3a705e4aa93..83f238b5919 100644
--- a/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
+++ b/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
@@ -17,8 +17,8 @@ import { useDailyProtocolTVL, useHistoricalProtocolVolume } from 'graphql/data/p
 import { TimePeriod, getProtocolColor, getSupportedGraphQlChain } from 'graphql/data/util'
 import { useScreenSize } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode, useMemo, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { HistoryDuration, PriceSource } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/pages/Explore/index.tsx b/apps/web/src/pages/Explore/index.tsx
index 68af37ae0c9..fd3d3f03b66 100644
--- a/apps/web/src/pages/Explore/index.tsx
+++ b/apps/web/src/pages/Explore/index.tsx
@@ -12,12 +12,12 @@ import { getTokenExploreURL, isBackendSupportedChain } from 'graphql/data/util'
 import { useOnGlobalChainSwitch } from 'hooks/useGlobalChainSwitch'
 import { Trans } from 'i18n'
 import { useResetAtom } from 'jotai/utils'
-import styled from 'lib/styled-components'
 import { ExploreChartsSection } from 'pages/Explore/charts/ExploreChartsSection'
 import { useExploreParams } from 'pages/Explore/redirects'
 import RecentTransactions from 'pages/Explore/tables/RecentTransactions'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { StyledInternalLink, ThemedText } from 'theme/components'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/Landing/Fold.tsx b/apps/web/src/pages/Landing/Fold.tsx
index 8c3da1b1c06..3f9cb221403 100644
--- a/apps/web/src/pages/Landing/Fold.tsx
+++ b/apps/web/src/pages/Landing/Fold.tsx
@@ -1,9 +1,9 @@
-import styled from 'lib/styled-components'
 import { DirectToDefi } from 'pages/Landing/sections/DirectToDefi'
 import { Footer } from 'pages/Landing/sections/Footer'
 import { NewsletterEtc } from 'pages/Landing/sections/NewsletterEtc'
 import { Stats } from 'pages/Landing/sections/Stats'
 import { forwardRef } from 'react'
+import styled from 'styled-components'
 
 const Container = styled.div`
   gap: 120px;
diff --git a/apps/web/src/pages/Landing/LandingV2.tsx b/apps/web/src/pages/Landing/LandingV2.tsx
index 6f95fe37c5e..8b9f6af04ea 100644
--- a/apps/web/src/pages/Landing/LandingV2.tsx
+++ b/apps/web/src/pages/Landing/LandingV2.tsx
@@ -1,6 +1,6 @@
-import styled from 'lib/styled-components'
 import { Hero } from 'pages/Landing/sections/Hero'
 import { Suspense, lazy, memo, useRef } from 'react'
+import styled from 'styled-components'
 
 // The Fold is always loaded, but is lazy-loaded because it is not seen without user interaction.
 // Annotating it with webpackPreload allows it to be ready when requested.
diff --git a/apps/web/src/pages/Landing/components/Generics.tsx b/apps/web/src/pages/Landing/components/Generics.tsx
index dbd0a11380a..bc17a438969 100644
--- a/apps/web/src/pages/Landing/components/Generics.tsx
+++ b/apps/web/src/pages/Landing/components/Generics.tsx
@@ -1,4 +1,4 @@
-import styled, { css } from 'lib/styled-components'
+import styled, { css } from 'styled-components'
 
 const H1Styles = css<{ color?: string }>`
   padding: 0;
diff --git a/apps/web/src/pages/Landing/components/StatCard.tsx b/apps/web/src/pages/Landing/components/StatCard.tsx
index fe950481062..fadc17961af 100644
--- a/apps/web/src/pages/Landing/components/StatCard.tsx
+++ b/apps/web/src/pages/Landing/components/StatCard.tsx
@@ -1,7 +1,7 @@
 import Row from 'components/Row'
 import { motion } from 'framer-motion'
-import styled, { keyframes, useTheme } from 'lib/styled-components'
 import { parseToRgb } from 'polished'
+import styled, { keyframes, useTheme } from 'styled-components'
 import { opacify } from 'theme/utils'
 
 const Mask = motion(styled.div`
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx b/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
index 6d26e433ff9..6154bacb4e6 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
@@ -1,7 +1,7 @@
 import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { motion } from 'framer-motion'
-import styled from 'lib/styled-components'
 import { TickerPosition } from 'pages/Landing/components/TokenCloud'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx b/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
index f8529befaa8..282ea97af69 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
@@ -1,12 +1,12 @@
 import { NATIVE_CHAIN_ID } from 'constants/tokens'
 import { motion } from 'framer-motion'
 import { getTokenDetailsURL } from 'graphql/data/util'
-import styled, { keyframes } from 'lib/styled-components'
 import { TokenStandard } from 'pages/Landing/assets/approvedTokens'
 import { Ticker } from 'pages/Landing/components/TokenCloud/Ticker'
 import { randomChoice } from 'pages/Landing/components/TokenCloud/utils'
 import { useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled, { keyframes } from 'styled-components'
 import {
   useCollectionPromoQuery,
   useTokenPromoQuery,
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/index.tsx b/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
index 2384fe2205c..d86f1b6476b 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
@@ -1,9 +1,9 @@
-import styled from 'lib/styled-components'
 import { approvedERC20, approvedERC721, InteractiveToken } from 'pages/Landing/assets/approvedTokens'
 import { Token } from 'pages/Landing/components/TokenCloud/Token'
 import { mixArrays, randomFloat, randomInt } from 'pages/Landing/components/TokenCloud/utils'
 import PoissonDiskSampling from 'poisson-disk-sampling'
 import { useMemo, useRef, useState } from 'react'
+import styled from 'styled-components'
 
 const Container = styled.div`
   width: 100vw;
diff --git a/apps/web/src/pages/Landing/components/animations.tsx b/apps/web/src/pages/Landing/components/animations.tsx
index bc6d75f7b12..cf10c72f4db 100644
--- a/apps/web/src/pages/Landing/components/animations.tsx
+++ b/apps/web/src/pages/Landing/components/animations.tsx
@@ -1,5 +1,5 @@
 import { motion } from 'framer-motion'
-import styled, { css, keyframes } from 'lib/styled-components'
+import styled, { css, keyframes } from 'styled-components'
 
 type RiseInProps = {
   delay?: number
diff --git a/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx b/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
index cbc3c8d6d1a..0b8495d0ea2 100644
--- a/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
@@ -1,10 +1,10 @@
 import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
 import { useScreenSize } from 'hooks/screenSize'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { CodeBrackets } from 'pages/Landing/components/Icons'
 import { PillButton } from 'pages/Landing/components/cards/PillButton'
 import ValuePropCard from 'pages/Landing/components/cards/ValuePropCard'
+import styled from 'styled-components'
 
 const Contents = styled.div`
   width: 100%;
diff --git a/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx b/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
index 821e6d994e7..2ba2056b169 100644
--- a/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
@@ -1,9 +1,9 @@
 import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
 import { t } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { Wallet } from 'pages/Landing/components/Icons'
 import { PillButton } from 'pages/Landing/components/cards/PillButton'
 import ValuePropCard from 'pages/Landing/components/cards/ValuePropCard'
+import styled, { useTheme } from 'styled-components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 
 const Contents = styled.div`
diff --git a/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx b/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
index a8c925a1427..4aaaa17162f 100644
--- a/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
@@ -1,10 +1,10 @@
 import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
 import { useScreenSize } from 'hooks/screenSize'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { Bars } from 'pages/Landing/components/Icons'
 import { PillButton } from 'pages/Landing/components/cards/PillButton'
 import ValuePropCard from 'pages/Landing/components/cards/ValuePropCard'
+import styled from 'styled-components'
 
 const Contents = styled.div`
   width: 100%;
diff --git a/apps/web/src/pages/Landing/components/cards/PillButton.tsx b/apps/web/src/pages/Landing/components/cards/PillButton.tsx
index 7bea047e113..fd2aec22286 100644
--- a/apps/web/src/pages/Landing/components/cards/PillButton.tsx
+++ b/apps/web/src/pages/Landing/components/cards/PillButton.tsx
@@ -1,7 +1,7 @@
 import { motion, MotionProps } from 'framer-motion'
-import styled from 'lib/styled-components'
 import { Box } from 'pages/Landing/components/Generics'
 import { ArrowRight } from 'pages/Landing/components/Icons'
+import styled from 'styled-components'
 
 const Button = styled(motion.button)<{ cursor?: string }>`
   display: flex;
diff --git a/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx b/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
index e6fa7d479ba..5c96e928006 100644
--- a/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
@@ -1,7 +1,7 @@
 import { motion } from 'framer-motion'
-import styled, { css } from 'lib/styled-components'
 import { Box, BoxProps } from 'pages/Landing/components/Generics'
 import { useNavigate } from 'react-router-dom'
+import styled, { css } from 'styled-components'
 
 type ValuePropCardProps = {
   isDarkMode?: boolean
diff --git a/apps/web/src/pages/Landing/components/cards/WebappCard.tsx b/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
index 1efed739f8e..2ab93566ce8 100644
--- a/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
@@ -6,13 +6,13 @@ import { getTokenDetailsURL } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
 import { useScreenSize } from 'hooks/screenSize'
 import { t } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box } from 'pages/Landing/components/Generics'
 import { Computer } from 'pages/Landing/components/Icons'
 import { PillButton } from 'pages/Landing/components/cards/PillButton'
 import ValuePropCard from 'pages/Landing/components/cards/ValuePropCard'
 import { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
+import styled from 'styled-components'
 import { useTokenPromoQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/pages/Landing/sections/DirectToDefi.tsx b/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
index 1771cde046a..581552f836d 100644
--- a/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
+++ b/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
@@ -1,10 +1,10 @@
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Box, H2 } from 'pages/Landing/components/Generics'
 import { DocumentationCard } from 'pages/Landing/components/cards/DocumentationCard'
 import { DownloadWalletCard } from 'pages/Landing/components/cards/DownloadWalletCard'
 import { LiquidityCard } from 'pages/Landing/components/cards/LiquidityCard'
 import { WebappCard } from 'pages/Landing/components/cards/WebappCard'
+import styled from 'styled-components'
 
 const SectionLayout = styled.div`
   display: flex;
diff --git a/apps/web/src/pages/Landing/sections/Footer.tsx b/apps/web/src/pages/Landing/sections/Footer.tsx
index a505fb18e47..71b97c6a6a5 100644
--- a/apps/web/src/pages/Landing/sections/Footer.tsx
+++ b/apps/web/src/pages/Landing/sections/Footer.tsx
@@ -1,12 +1,12 @@
 import Row from 'components/Row'
 import { useScreenSize } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { Body1, Box, H3 } from 'pages/Landing/components/Generics'
 import { Discord, Github, Twitter } from 'pages/Landing/components/Icons'
 import { Wiggle } from 'pages/Landing/components/animations'
 import { Link } from 'react-router-dom'
 import { useTogglePrivacyPolicy } from 'state/application/hooks'
+import styled, { css } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
 const SocialIcon = styled(Wiggle)`
diff --git a/apps/web/src/pages/Landing/sections/Hero.tsx b/apps/web/src/pages/Landing/sections/Hero.tsx
index 02f3d6e825b..e843c230bb7 100644
--- a/apps/web/src/pages/Landing/sections/Hero.tsx
+++ b/apps/web/src/pages/Landing/sections/Hero.tsx
@@ -2,13 +2,13 @@ import { ColumnCenter } from 'components/Column'
 import { useCurrency } from 'hooks/Tokens'
 import { useScroll } from 'hooks/useScroll'
 import { Trans } from 'i18n'
-import styled, { css, keyframes } from 'lib/styled-components'
 import { Box, H1 } from 'pages/Landing/components/Generics'
 import { TokenCloud } from 'pages/Landing/components/TokenCloud/index'
 import { Hover, RiseIn, RiseInText } from 'pages/Landing/components/animations'
 import { Swap } from 'pages/Swap'
 import { ChevronDown } from 'react-feather'
 import { useTranslation } from 'react-i18next'
+import styled, { css, keyframes } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { Text } from 'ui/src'
 import { heightBreakpoints } from 'ui/src/theme'
diff --git a/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx b/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
index 14c1d8cbf53..1da7568a6d0 100644
--- a/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
+++ b/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
@@ -1,9 +1,9 @@
 import { motion } from 'framer-motion'
 import { t, Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { PillButton } from 'pages/Landing/components/cards/PillButton'
 import { Box, H2, H3 } from 'pages/Landing/components/Generics'
 import { BookOpen, ChatBubbles, HelpCircle } from 'pages/Landing/components/Icons'
+import styled, { useTheme } from 'styled-components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 
 const SectionLayout = styled.div`
diff --git a/apps/web/src/pages/Landing/sections/Stats.tsx b/apps/web/src/pages/Landing/sections/Stats.tsx
index 38ceb806e15..77c53d5c202 100644
--- a/apps/web/src/pages/Landing/sections/Stats.tsx
+++ b/apps/web/src/pages/Landing/sections/Stats.tsx
@@ -1,11 +1,11 @@
 import Row from 'components/Row'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { Body1, Box, H2 } from 'pages/Landing/components/Generics'
 import { StatCard } from 'pages/Landing/components/StatCard'
 import { useInView } from 'pages/Landing/sections/useInView'
 import { useMemo } from 'react'
 import { ArrowRightCircle } from 'react-feather'
+import styled from 'styled-components'
 import { ClickableStyle, ExternalLink } from 'theme/components'
 import {
   ProtocolVersion,
diff --git a/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx b/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
index abe65570061..d7c7d22fed7 100644
--- a/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
+++ b/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
@@ -31,7 +31,6 @@ import { useV2LiquidityTokenPermit } from 'hooks/useV2LiquidityTokenPermit'
 import { Trans, t } from 'i18n'
 import JSBI from 'jsbi'
 import { NEVER_RELOAD, useSingleCallResult } from 'lib/hooks/multicall'
-import { useTheme } from 'lib/styled-components'
 import { BodyWrapper } from 'pages/App/AppBody'
 import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react'
 import { AlertCircle, AlertTriangle, ArrowDown } from 'react-feather'
@@ -43,6 +42,7 @@ import { useRangeHopCallbacks, useV3DerivedMintInfo, useV3MintActionHandlers } f
 import { useIsTransactionPending, useTransactionAdder } from 'state/transactions/hooks'
 import { TransactionType } from 'state/transactions/types'
 import { useUserSlippageToleranceWithDefault } from 'state/user/hooks'
+import { useTheme } from 'styled-components'
 import { BackArrowLink, ExternalLink, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/pages/MigrateV2/index.tsx b/apps/web/src/pages/MigrateV2/index.tsx
index f610b3ea881..031df93eb33 100644
--- a/apps/web/src/pages/MigrateV2/index.tsx
+++ b/apps/web/src/pages/MigrateV2/index.tsx
@@ -16,11 +16,11 @@ import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
 import { PairState, useV2Pairs } from 'hooks/useV2Pairs'
 import { Trans } from 'i18n'
 import { useRpcTokenBalancesWithLoadingIndicator } from 'lib/hooks/useCurrencyBalance'
-import styled, { useTheme } from 'lib/styled-components'
 import { BodyWrapper } from 'pages/App/AppBody'
 import { ReactNode, useMemo } from 'react'
 import { Text } from 'rebass'
 import { toV2LiquidityToken, useTrackedTokenPairs } from 'state/user/hooks'
+import styled, { useTheme } from 'styled-components'
 import { BackArrowLink, StyledInternalLink, ThemedText } from 'theme/components'
 
 export const MigrateHeader = styled(ThemedText.H1Small)`
diff --git a/apps/web/src/pages/NotFound/index.tsx b/apps/web/src/pages/NotFound/index.tsx
index 82c36af9dec..33710bda69a 100644
--- a/apps/web/src/pages/NotFound/index.tsx
+++ b/apps/web/src/pages/NotFound/index.tsx
@@ -4,8 +4,8 @@ import lightImage from 'assets/images/404-page-light.png'
 import { SmallButtonPrimary } from 'components/Button'
 import { useIsMobile } from 'hooks/screenSize'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { Link } from 'react-router-dom'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/Pool/CTACards.tsx b/apps/web/src/pages/Pool/CTACards.tsx
index f3976828acf..8bcf4ed921c 100644
--- a/apps/web/src/pages/Pool/CTACards.tsx
+++ b/apps/web/src/pages/Pool/CTACards.tsx
@@ -2,7 +2,7 @@ import { AutoColumn } from 'components/Column'
 import { useSupportedChainId } from 'constants/chains'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
+import styled, { css } from 'styled-components'
 import { ExternalLink, StyledInternalLink, ThemedText } from 'theme/components'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/pages/Pool/PositionPage.tsx b/apps/web/src/pages/Pool/PositionPage.tsx
index 9f70788e5c3..249abc620f8 100644
--- a/apps/web/src/pages/Pool/PositionPage.tsx
+++ b/apps/web/src/pages/Pool/PositionPage.tsx
@@ -39,7 +39,6 @@ import { useV3PositionFromTokenId } from 'hooks/useV3Positions'
 import { Trans, t } from 'i18n'
 import { useSingleCallResult } from 'lib/hooks/multicall'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
-import styled, { useTheme } from 'lib/styled-components'
 import { LoadingRows } from 'pages/Pool/styled'
 import { PropsWithChildren, useCallback, useMemo, useRef, useState } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
@@ -47,6 +46,7 @@ import { Link, useParams } from 'react-router-dom'
 import { Bound } from 'state/mint/v3/actions'
 import { useIsTransactionPending, useTransactionAdder } from 'state/transactions/hooks'
 import { TransactionType } from 'state/transactions/types'
+import styled, { useTheme } from 'styled-components'
 import { ClickableStyle, ExternalLink, HideExtraSmall, HideSmall, StyledRouterLink, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import Trace from 'uniswap/src/features/telemetry/Trace'
@@ -496,8 +496,8 @@ function PositionPageContent() {
   const [showConfirm, setShowConfirm] = useState(false)
 
   // usdc prices always in terms of tokens
-  const { price: price0 } = useStablecoinPrice(token0 ?? undefined)
-  const { price: price1 } = useStablecoinPrice(token1 ?? undefined)
+  const price0 = useStablecoinPrice(token0 ?? undefined)
+  const price1 = useStablecoinPrice(token1 ?? undefined)
 
   const fiatValueOfFees: CurrencyAmount<Currency> | null = useMemo(() => {
     if (!price0 || !price1 || !feeValue0 || !feeValue1) {
diff --git a/apps/web/src/pages/Pool/index.tsx b/apps/web/src/pages/Pool/index.tsx
index 9425123fb2d..ee5b1b0508c 100644
--- a/apps/web/src/pages/Pool/index.tsx
+++ b/apps/web/src/pages/Pool/index.tsx
@@ -12,7 +12,6 @@ import { useFilterPossiblyMaliciousPositions } from 'hooks/useFilterPossiblyMali
 import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
 import { useV3Positions } from 'hooks/useV3Positions'
 import { Trans } from 'i18n'
-import styled, { css, useTheme } from 'lib/styled-components'
 import CTACards from 'pages/Pool/CTACards'
 import { PoolVersionMenu } from 'pages/Pool/shared'
 import { LoadingRows } from 'pages/Pool/styled'
@@ -21,6 +20,7 @@ import { AlertTriangle, BookOpen, ChevronDown, ChevronsRight, Inbox, Layers } fr
 import { Link } from 'react-router-dom'
 import { ApplicationModal } from 'state/application/reducer'
 import { useUserHideClosedPositions } from 'state/user/hooks'
+import styled, { css, useTheme } from 'styled-components'
 import { HideSmall, ThemedText } from 'theme/components'
 import { PositionDetails } from 'types/position'
 import { ProtocolVersion } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
diff --git a/apps/web/src/pages/Pool/shared.tsx b/apps/web/src/pages/Pool/shared.tsx
index 6ff5de88ba5..bf79bca751c 100644
--- a/apps/web/src/pages/Pool/shared.tsx
+++ b/apps/web/src/pages/Pool/shared.tsx
@@ -2,10 +2,10 @@ import { ButtonGray } from 'components/Button'
 import { Pool } from 'components/Icons/Pool'
 import { FlyoutAlignment, Menu } from 'components/Menu'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import { ChevronDown } from 'react-feather'
 import { useModalIsOpen } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
+import styled, { css } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { ProtocolVersion } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 
diff --git a/apps/web/src/pages/Pool/styled.tsx b/apps/web/src/pages/Pool/styled.tsx
index e064547a380..862865ddae2 100644
--- a/apps/web/src/pages/Pool/styled.tsx
+++ b/apps/web/src/pages/Pool/styled.tsx
@@ -1,6 +1,6 @@
 import { LoadingRows as BaseLoadingRows } from 'components/Loader/styled'
-import styled from 'lib/styled-components'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 
 export const Wrapper = styled.div`
   position: relative;
diff --git a/apps/web/src/pages/Pool/v2.tsx b/apps/web/src/pages/Pool/v2.tsx
index fa13b249134..108a3c93925 100644
--- a/apps/web/src/pages/Pool/v2.tsx
+++ b/apps/web/src/pages/Pool/v2.tsx
@@ -16,7 +16,6 @@ import { useV2Pairs } from 'hooks/useV2Pairs'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
 import { useRpcTokenBalancesWithLoadingIndicator } from 'lib/hooks/useCurrencyBalance'
-import styled, { useTheme } from 'lib/styled-components'
 import { PoolVersionMenu } from 'pages/Pool/shared'
 import { useMemo } from 'react'
 import { ChevronsRight } from 'react-feather'
@@ -24,6 +23,7 @@ import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import { useStakingInfo } from 'state/stake/hooks'
 import { toV2LiquidityToken, useTrackedTokenPairs } from 'state/user/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, HideSmall, ThemedText } from 'theme/components'
 import { ProtocolVersion } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/PoolDetails/index.tsx b/apps/web/src/pages/PoolDetails/index.tsx
index d3661980989..8a565f5e0aa 100644
--- a/apps/web/src/pages/PoolDetails/index.tsx
+++ b/apps/web/src/pages/PoolDetails/index.tsx
@@ -12,7 +12,6 @@ import { PoolData, usePoolData } from 'graphql/data/pools/usePoolData'
 import { getSupportedGraphQlChain, gqlToCurrency, unwrapToken } from 'graphql/data/util'
 import { useColor } from 'hooks/useColor'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import NotFound from 'pages/NotFound'
 import { getPoolDetailPageTitle } from 'pages/PoolDetails/utils'
 import { useDynamicMetatags } from 'pages/metatags'
@@ -20,6 +19,7 @@ import { useMemo, useReducer } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
 import { useParams } from 'react-router-dom'
 import { Text } from 'rebass'
+import styled, { useTheme } from 'styled-components'
 import { BREAKPOINTS, ThemeProvider } from 'theme'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { isAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/pages/RemoveLiquidity/index.tsx b/apps/web/src/pages/RemoveLiquidity/index.tsx
index 4c8ef5e3497..7cd955c4f6b 100644
--- a/apps/web/src/pages/RemoveLiquidity/index.tsx
+++ b/apps/web/src/pages/RemoveLiquidity/index.tsx
@@ -35,7 +35,6 @@ import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
 import { useGetTransactionDeadline } from 'hooks/useTransactionDeadline'
 import { useV2LiquidityTokenPermit } from 'hooks/useV2LiquidityTokenPermit'
 import { Trans } from 'i18n'
-import { useTheme } from 'lib/styled-components'
 import AppBody from 'pages/App/AppBody'
 import { PositionPageUnsupportedContent } from 'pages/Pool/PositionPage'
 import { ClickableText, MaxButton, Wrapper } from 'pages/Pool/styled'
@@ -47,6 +46,7 @@ import { useBurnActionHandlers, useBurnState, useDerivedBurnInfo } from 'state/b
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TransactionType } from 'state/transactions/types'
 import { useUserSlippageToleranceWithDefault } from 'state/user/hooks'
+import { useTheme } from 'styled-components'
 import { StyledInternalLink, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import Trace from 'uniswap/src/features/telemetry/Trace'
diff --git a/apps/web/src/pages/RemoveLiquidity/styled.tsx b/apps/web/src/pages/RemoveLiquidity/styled.tsx
index 7568e6679ec..f9363762e0a 100644
--- a/apps/web/src/pages/RemoveLiquidity/styled.tsx
+++ b/apps/web/src/pages/RemoveLiquidity/styled.tsx
@@ -1,6 +1,6 @@
-import styled from 'lib/styled-components'
 import { MaxButton } from 'pages/Pool/styled'
 import { Text } from 'rebass'
+import styled from 'styled-components'
 
 export const Wrapper = styled.div`
   position: relative;
diff --git a/apps/web/src/pages/Swap/Buy/BuyForm.tsx b/apps/web/src/pages/Swap/Buy/BuyForm.tsx
index 1b8de719fce..5d166a4fb3f 100644
--- a/apps/web/src/pages/Swap/Buy/BuyForm.tsx
+++ b/apps/web/src/pages/Swap/Buy/BuyForm.tsx
@@ -1,7 +1,6 @@
 import Column from 'components/Column'
 import Row from 'components/Row'
 import { useActiveLocalCurrencyComponents } from 'hooks/useActiveLocalCurrency'
-import styled from 'lib/styled-components'
 import { BuyFormButton } from 'pages/Swap/Buy/BuyFormButton'
 import { BuyFormContextProvider, ethCurrencyInfo, useBuyFormContext } from 'pages/Swap/Buy/BuyFormContext'
 import { ChooseProviderModal } from 'pages/Swap/Buy/ChooseProviderModal'
@@ -17,26 +16,26 @@ import {
 } from 'pages/Swap/common/shared'
 import { useEffect } from 'react'
 import { Trans } from 'react-i18next'
+import styled from 'styled-components'
 import { Text } from 'ui/src/components/text/Text'
 import { FiatOnRampCountryPicker } from 'uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker'
 import { SelectTokenButton } from 'uniswap/src/features/fiatOnRamp/SelectTokenButton'
 import { useFiatOnRampAggregatorGetCountryQuery } from 'uniswap/src/features/fiatOnRamp/api'
 import Trace from 'uniswap/src/features/telemetry/Trace'
-import { FiatOnRampEventName, InterfacePageNameLocal } from 'uniswap/src/features/telemetry/constants'
-import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { InterfacePageNameLocal } from 'uniswap/src/features/telemetry/constants'
 import useResizeObserver from 'use-resize-observer'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 const InputWrapper = styled(Column)`
   position: relative;
   background-color: ${({ theme }) => theme.surface2};
-  padding: 0 16px 52px 16px;
+  padding: 0 16px 40px 16px;
   height: 342px;
   align-items: center;
   border-radius: 20px;
   justify-content: flex-end;
   overflow: hidden;
-  gap: 8px;
+  gap: 16px;
 `
 
 const HeaderRow = styled(Row)`
@@ -55,24 +54,19 @@ type BuyFormProps = {
 }
 
 function BuyFormInner({ disabled }: BuyFormProps) {
-  const { formatNumberOrString, convertToFiatAmount } = useFormatter()
+  const { formatNumberOrString } = useFormatter()
   const { symbol: fiatSymbol } = useActiveLocalCurrencyComponents()
 
   const { buyFormState, setBuyFormState, derivedBuyFormInfo } = useBuyFormContext()
   const { inputAmount, selectedCountry, quoteCurrency, currencyModalOpen, countryModalOpen, providerModalOpen } =
     buyFormState
-  const { amountOut, amountOutLoading, supportedTokens, countryOptionsResult, error, notAvailableInThisRegion } =
-    derivedBuyFormInfo
+  const { amountOut, supportedTokens, countryOptionsResult, error, notAvailableInThisRegion } = derivedBuyFormInfo
 
   const postWidthAdjustedDisplayValue = useWidthAdjustedDisplayValue(inputAmount)
   const hiddenObserver = useResizeObserver<HTMLElement>()
 
   const handleUserInput = (newValue: string) => {
     setBuyFormState((state) => ({ ...state, inputAmount: newValue }))
-    sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampAmountEntered, {
-      amountUSD: convertToFiatAmount(Number(newValue)).amount,
-      source: 'textInput',
-    })
   }
 
   const { data: countryResult } = useFiatOnRampAggregatorGetCountryQuery()
@@ -83,7 +77,7 @@ function BuyFormInner({ disabled }: BuyFormProps) {
   }, [buyFormState.selectedCountry, countryResult, selectedCountry, setBuyFormState])
 
   return (
-    <Trace page={InterfacePageNameLocal.Buy} logImpression>
+    <Trace page={InterfacePageNameLocal.Buy}>
       <Column gap="xs">
         <InputWrapper>
           <HeaderRow>
@@ -119,30 +113,20 @@ function BuyFormInner({ disabled }: BuyFormProps) {
               setBuyFormState((state) => ({ ...state, currencyModalOpen: true }))
             }}
             selectedCurrencyInfo={quoteCurrency.currencyInfo ?? ethCurrencyInfo}
-            formattedAmount={
-              amountOutLoading
-                ? ''
-                : formatNumberOrString({
-                    input: amountOut || '0',
-                    type: NumberType.TokenNonTx,
-                  })
-            }
+            formattedAmount={formatNumberOrString({
+              input: amountOut || '0',
+              type: NumberType.TokenNonTx,
+            })}
             disabled={disabled}
             iconSize={18}
             chevronDirection="down"
             backgroundColor="$surface1"
-            amountReady={Boolean(amountOut)}
-            loading={amountOutLoading && inputAmount !== ''}
           />
-          <Row gap="md" justify="center" marginTop="8px">
+          <Row gap="md" justify="center">
             {PREDEFINED_AMOUNTS.map((amount: number) => (
               <PredefinedAmount
                 onClick={() => {
                   setBuyFormState((state) => ({ ...state, inputAmount: amount.toString() }))
-                  sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampAmountEntered, {
-                    amountUSD: convertToFiatAmount(amount).amount,
-                    source: 'chip',
-                  })
                 }}
                 key={amount}
                 amount={amount}
@@ -152,14 +136,7 @@ function BuyFormInner({ disabled }: BuyFormProps) {
             ))}
           </Row>
           {notAvailableInThisRegion && (
-            <Text
-              variant="body3"
-              userSelect="none"
-              color="$neutral2"
-              textAlign="center"
-              position="absolute"
-              bottom="20px"
-            >
+            <Text variant="body3" userSelect="none" color="$neutral2" textAlign="center">
               <Trans i18nKey="fiatOnRamp.notAvailable.error" />
             </Text>
           )}
@@ -174,13 +151,6 @@ function BuyFormInner({ disabled }: BuyFormProps) {
           }}
           onSelectCurrency={(currency) => {
             setBuyFormState((state) => ({ ...state, quoteCurrency: currency }))
-            sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampTokenSelected, {
-              token:
-                currency.meldCurrencyCode ??
-                currency.moonpayCurrencyCode ??
-                currency.currencyInfo?.currency.symbol ??
-                '',
-            })
           }}
           currencies={supportedTokens}
         />
diff --git a/apps/web/src/pages/Swap/Buy/BuyFormButton.tsx b/apps/web/src/pages/Swap/Buy/BuyFormButton.tsx
index d2e671c5a1a..f86b1527b56 100644
--- a/apps/web/src/pages/Swap/Buy/BuyFormButton.tsx
+++ b/apps/web/src/pages/Swap/Buy/BuyFormButton.tsx
@@ -1,10 +1,8 @@
 import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
-import { ButtonLight, ButtonPrimary, LoadingButtonSpinner } from 'components/Button'
-import { useTheme } from 'lib/styled-components'
+import { ButtonLight, ButtonPrimary } from 'components/Button'
 import { useBuyFormContext } from 'pages/Swap/Buy/BuyFormContext'
 import { useMemo } from 'react'
 import { Trans } from 'react-i18next'
-import { Flex } from 'ui/src'
 import { useAccount } from 'wagmi'
 
 interface BuyFormButtonProps {
@@ -14,7 +12,6 @@ interface BuyFormButtonProps {
 export function BuyFormButton({ forceDisabled }: BuyFormButtonProps) {
   const account = useAccount()
   const accountDrawer = useAccountDrawer()
-  const theme = useTheme()
 
   const { buyFormState, derivedBuyFormInfo, setBuyFormState } = useBuyFormContext()
   const { inputAmount } = buyFormState
@@ -48,12 +45,7 @@ export function BuyFormButton({ forceDisabled }: BuyFormButtonProps) {
     }
 
     return {
-      label: (
-        <Flex row alignItems="center" gap="$spacing12">
-          {fetchingQuotes && <LoadingButtonSpinner fill={theme.neutral2} />}
-          <Trans i18nKey="common.continue.button" />
-        </Flex>
-      ),
+      label: <Trans i18nKey="common.continue.button" />,
       disabled: Boolean(fetchingQuotes || !quotes || !quotes.quotes || quotes.quotes.length === 0 || error),
       Component: ButtonPrimary,
       onClick: () => {
@@ -65,14 +57,12 @@ export function BuyFormButton({ forceDisabled }: BuyFormButtonProps) {
     inputAmount,
     forceDisabled,
     notAvailableInThisRegion,
-    theme.neutral2,
     fetchingQuotes,
     quotes,
     error,
     accountDrawer.open,
     setBuyFormState,
   ])
-
   return (
     <buyButtonState.Component fontWeight={535} disabled={buyButtonState.disabled} onClick={buyButtonState.onClick}>
       {buyButtonState.label}
diff --git a/apps/web/src/pages/Swap/Buy/BuyFormContext.tsx b/apps/web/src/pages/Swap/Buy/BuyFormContext.tsx
index c907120c1e5..0be603bf287 100644
--- a/apps/web/src/pages/Swap/Buy/BuyFormContext.tsx
+++ b/apps/web/src/pages/Swap/Buy/BuyFormContext.tsx
@@ -4,7 +4,6 @@ import { nativeOnChain } from 'constants/tokens'
 import { useUSDTokenUpdater } from 'hooks/useUSDTokenUpdater'
 import { t } from 'i18next'
 import { useFiatOnRampSupportedTokens, useMeldFiatCurrencyInfo } from 'pages/Swap/Buy/hooks'
-import { formatFiatOnRampFiatAmount } from 'pages/Swap/Buy/shared'
 import { Dispatch, PropsWithChildren, SetStateAction, createContext, useContext, useMemo, useState } from 'react'
 import {
   useFiatOnRampAggregatorCountryListQuery,
@@ -24,6 +23,7 @@ import {
   isInvalidRequestAmountTooLow,
 } from 'uniswap/src/features/fiatOnRamp/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { useAccount } from 'wagmi'
 
 class BuyFormError extends Error {
@@ -47,7 +47,6 @@ type BuyInfo = {
   readonly countryOptionsResult?: FORSupportedCountriesResponse
   readonly supportedTokens?: FiatOnRampCurrency[]
   readonly amountOut?: string
-  readonly amountOutLoading?: boolean
   readonly quotes?: FORQuoteResponse
   readonly fetchingQuotes: boolean
   readonly error?: BuyFormError
@@ -81,7 +80,6 @@ export const BuyFormContext = createContext<BuyFormContextType>({
     countryOptionsResult: undefined,
     supportedTokens: [],
     amountOut: undefined,
-    amountOutLoading: false,
     quotes: undefined,
     fetchingQuotes: false,
     error: undefined,
@@ -94,14 +92,14 @@ export function useBuyFormContext() {
 
 function useDerivedBuyFormInfo(state: BuyFormState): BuyInfo {
   const account = useAccount()
-  const { formattedAmount: amountOut, loading: amountOutLoading } = useUSDTokenUpdater(
+  const amountOut = useUSDTokenUpdater(
     true /* inputInFiat */,
     state.inputAmount,
     state.quoteCurrency?.currencyInfo?.currency,
   )
+  const { formatNumberOrString } = useFormatter()
 
   const { meldSupportedFiatCurrency, notAvailableInThisRegion } = useMeldFiatCurrencyInfo(state.selectedCountry)
-
   const { data: countryOptionsResult } = useFiatOnRampAggregatorCountryListQuery()
   const supportedTokens = useFiatOnRampSupportedTokens(meldSupportedFiatCurrency, state.selectedCountry?.countryCode)
 
@@ -133,28 +131,27 @@ function useDerivedBuyFormInfo(state: BuyFormState): BuyInfo {
   const error = useMemo(() => {
     if (quotesError && isFiatOnRampApiError(quotesError)) {
       if (isInvalidRequestAmountTooLow(quotesError)) {
-        const formattedAmount = formatFiatOnRampFiatAmount(
-          (quotesError as InvalidRequestAmountTooLow).data.context.minimumAllowed,
-          meldSupportedFiatCurrency,
-        )
+        const formattedAmount = formatNumberOrString({
+          input: (quotesError as InvalidRequestAmountTooLow).data.context.minimumAllowed,
+          type: NumberType.FiatTokenQuantity,
+        })
         return new BuyFormError(t(`fiatOnRamp.error.min`, { amount: formattedAmount }))
       }
       if (isInvalidRequestAmountTooHigh(quotesError)) {
-        const formattedAmount = formatFiatOnRampFiatAmount(
-          quotesError.data.context.maximumAllowed,
-          meldSupportedFiatCurrency,
-        )
+        const formattedAmount = formatNumberOrString({
+          input: quotesError.data.context.maximumAllowed,
+          type: NumberType.FiatTokenQuantity,
+        })
         return new BuyFormError(t(`fiatOnRamp.error.max`, { amount: formattedAmount }))
       }
       return new BuyFormError(t('common.somethingWentWrong.error'))
     }
     return undefined
-  }, [meldSupportedFiatCurrency, quotesError])
+  }, [formatNumberOrString, quotesError])
 
   return useMemo(
     () => ({
       amountOut,
-      amountOutLoading,
       notAvailableInThisRegion,
       meldSupportedFiatCurrency,
       supportedTokens,
@@ -165,7 +162,6 @@ function useDerivedBuyFormInfo(state: BuyFormState): BuyInfo {
     }),
     [
       amountOut,
-      amountOutLoading,
       countryOptionsResult,
       error,
       fetchingQuotes,
diff --git a/apps/web/src/pages/Swap/Buy/ChooseProviderModal.tsx b/apps/web/src/pages/Swap/Buy/ChooseProviderModal.tsx
index 36d63096233..5fb71aedd8e 100644
--- a/apps/web/src/pages/Swap/Buy/ChooseProviderModal.tsx
+++ b/apps/web/src/pages/Swap/Buy/ChooseProviderModal.tsx
@@ -1,24 +1,32 @@
+import { skipToken } from '@reduxjs/toolkit/query/react'
+import GetHelpButton from 'components/Button/GetHelp'
 import { AutoColumn } from 'components/Column'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
+import Modal from 'components/Modal'
+import Row, { RowBetween } from 'components/Row'
 import { useAccount } from 'hooks/useAccount'
-import styled from 'lib/styled-components'
-import ms from 'ms'
 import { useBuyFormContext } from 'pages/Swap/Buy/BuyFormContext'
 import { ProviderConnectedView } from 'pages/Swap/Buy/ProviderConnectedView'
+import { ProviderConnectingView } from 'pages/Swap/Buy/ProviderConnectingView'
 import { ProviderConnectionError } from 'pages/Swap/Buy/ProviderConnectionError'
-import { ProviderOption } from 'pages/Swap/Buy/ProviderOption'
 import { ContentWrapper } from 'pages/Swap/Buy/shared'
-import { useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { Trans } from 'react-i18next'
-import { AdaptiveWebModalSheet, Flex, Separator, Text } from 'ui/src'
-import { TimePast } from 'ui/src/components/icons'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { useAddFiatOnRampTransaction } from 'state/fiatOnRampTransactions/hooks'
+import { FiatOnRampTransactionStatus, FiatOnRampTransactionType } from 'state/fiatOnRampTransactions/types'
+import styled from 'styled-components'
+import { CloseIcon } from 'theme/components'
+import { Text } from 'ui/src'
+import { UNISWAP_WEB_URL, uniswapUrls } from 'uniswap/src/constants/urls'
+import { FORQuoteItem } from 'uniswap/src/features/fiatOnRamp/FORQuoteItem'
+import { useFiatOnRampAggregatorWidgetQuery } from 'uniswap/src/features/fiatOnRamp/api'
 import { FORQuote, FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
-import { logger } from 'utilities/src/logger/logger'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import { useTimeout } from 'utilities/src/time/timing'
+import { v4 as uuid } from 'uuid'
 
 const ProviderListPaddedColumn = styled(AutoColumn)`
   position: relative;
-  padding-bottom: 8px;
+  padding: 16px 24px 24px 24px;
 `
 
 interface ChooseProviderModal {
@@ -30,122 +38,129 @@ function ChooseProviderModalContent({ closeModal }: ChooseProviderModal) {
   const { derivedBuyFormInfo, buyFormState } = useBuyFormContext()
   const { quoteCurrency, selectedCountry, inputAmount } = buyFormState
   const { quotes, meldSupportedFiatCurrency } = derivedBuyFormInfo
-  const [errorProvider, setErrorProvider] = useState<FORServiceProvider>()
-  const [connectedProvider, setConnectedProvider] = useState<FORServiceProvider>()
 
   const account = useAccount()
+  const addFiatOnRampTransaction = useAddFiatOnRampTransaction()
 
-  const [mostRecentlyUsedProvider, otherProviders] = useMemo(() => {
-    if (!quotes || !quotes.quotes) {
-      return [undefined, []] as const
-    }
-    const mostRecent = quotes.quotes.find((q: FORQuote) => q.isMostRecentlyUsedProvider)
-    if (mostRecent) {
-      return [mostRecent, quotes.quotes.filter((q: FORQuote) => !q.isMostRecentlyUsedProvider)] as const
-    }
-    return [undefined, quotes.quotes] as const
-  }, [quotes])
+  const [selectedServiceProvider, setSelectedServiceProvider] = useState<FORServiceProvider>()
+  const [delayElapsed, setDelayElapsed] = useState(false)
 
-  const onClose = () => {
-    closeModal()
-    // Delay the state reset until the modal finishes animating away:
-    setTimeout(() => {
-      setErrorProvider(undefined)
-      setConnectedProvider(undefined)
-    }, ms('500ms'))
-  }
+  const widgetQueryParams = useMemo(() => {
+    return selectedServiceProvider &&
+      quoteCurrency.meldCurrencyCode &&
+      meldSupportedFiatCurrency &&
+      inputAmount &&
+      account.address &&
+      selectedCountry?.countryCode
+      ? {
+          serviceProvider: selectedServiceProvider.serviceProvider,
+          countryCode: selectedCountry.countryCode,
+          destinationCurrencyCode: quoteCurrency.meldCurrencyCode,
+          sourceAmount: parseFloat(inputAmount),
+          sourceCurrencyCode: meldSupportedFiatCurrency.code,
+          walletAddress: account.address,
+          externalSessionId: uuid(),
+          redirectUrl: `${UNISWAP_WEB_URL}/buy`,
+        }
+      : skipToken
+  }, [
+    account.address,
+    inputAmount,
+    meldSupportedFiatCurrency,
+    quoteCurrency.meldCurrencyCode,
+    selectedCountry?.countryCode,
+    selectedServiceProvider,
+  ])
 
-  const quoteCurrencyCode = quoteCurrency.meldCurrencyCode
-  const recipientAddress = account.address
-  if (!selectedCountry || !quoteCurrencyCode || !meldSupportedFiatCurrency || !recipientAddress) {
-    logger.debug('ChooseProviderModal', 'ChooseProviderModalContent', 'Modal opened with invalid state. Closing modal.')
-    onClose()
-    return null
-  }
+  const { data: widgetData, error: widgetError } = useFiatOnRampAggregatorWidgetQuery(widgetQueryParams)
+  useTimeout(() => {
+    if (selectedServiceProvider && !delayElapsed) {
+      setDelayElapsed(true)
+    }
+  }, 2 * ONE_SECOND_MS)
+
+  useEffect(() => {
+    if (
+      widgetQueryParams !== skipToken &&
+      account.address &&
+      selectedServiceProvider &&
+      delayElapsed &&
+      widgetData?.widgetUrl
+    ) {
+      window.open(widgetData.widgetUrl, '_blank')
+      addFiatOnRampTransaction({
+        externalSessionId: widgetQueryParams.externalSessionId,
+        account: account.address,
+        status: FiatOnRampTransactionStatus.INITIATED,
+        forceFetched: false,
+        addedAt: Date.now(),
+        type: FiatOnRampTransactionType.BUY,
+      })
+    }
+  }, [
+    account.address,
+    addFiatOnRampTransaction,
+    delayElapsed,
+    selectedServiceProvider,
+    widgetData?.widgetUrl,
+    widgetQueryParams,
+  ])
 
-  if (errorProvider) {
+  if (selectedServiceProvider && widgetError) {
     return (
       <ProviderConnectionError
-        onBack={() => setErrorProvider(undefined)}
-        closeModal={onClose}
-        selectedServiceProvider={errorProvider}
+        onBack={() => setSelectedServiceProvider(undefined)}
+        closeModal={closeModal}
+        selectedServiceProvider={selectedServiceProvider}
       />
     )
   }
 
-  if (connectedProvider) {
-    return <ProviderConnectedView closeModal={onClose} selectedServiceProvider={connectedProvider} />
+  if (selectedServiceProvider && delayElapsed) {
+    return <ProviderConnectedView closeModal={closeModal} selectedServiceProvider={selectedServiceProvider} />
   }
 
-  return (
-    <ProviderListPaddedColumn gap="24px">
-      <GetHelpHeader
-        title={<Trans i18nKey="fiatOnRamp.checkoutWith" />}
-        link={uniswapUrls.helpArticleUrls.fiatOnRampHelp}
-        closeModal={closeModal}
-        closeDataTestId="ChooseProviderModal-close"
-      />
-      <Flex gap="16px">
-        {mostRecentlyUsedProvider && (
-          <Flex gap="$spacing12">
-            <Flex row alignItems="center" pb="$spacing12" pl="$spacing8">
-              <TimePast color="$neutral3" size="$icon.16" />
-              <Text color="$neutral2" pl="$spacing4" variant="body3">
-                <Trans i18nKey="fiatOnRamp.quote.type.recent" />
-              </Text>
-            </Flex>
-            <ProviderOption
-              key={mostRecentlyUsedProvider.serviceProviderDetails.serviceProvider}
-              quote={mostRecentlyUsedProvider}
-              selectedCountry={selectedCountry}
-              quoteCurrencyCode={quoteCurrencyCode}
-              inputAmount={inputAmount}
-              meldSupportedFiatCurrency={meldSupportedFiatCurrency}
-              walletAddress={recipientAddress}
-              setConnectedProvider={setConnectedProvider}
-              setErrorProvider={setErrorProvider}
-            />
-            {otherProviders && otherProviders.length > 0 && (
-              <Flex centered row gap="$spacing12" mt="$spacing12">
-                <Separator />
-                <Text color="$neutral3" variant="body3">
-                  <Trans i18nKey="fiatOnRamp.quote.type.other" />
-                </Text>
-                <Separator />
-              </Flex>
-            )}
-          </Flex>
-        )}
+  if (selectedServiceProvider) {
+    return <ProviderConnectingView closeModal={closeModal} selectedServiceProvider={selectedServiceProvider} />
+  }
 
-        {otherProviders?.map((q: FORQuote) => {
-          return (
-            <ProviderOption
-              key={q.serviceProviderDetails.serviceProvider}
-              quote={q}
-              selectedCountry={selectedCountry}
-              quoteCurrencyCode={quoteCurrencyCode}
-              inputAmount={inputAmount}
-              meldSupportedFiatCurrency={meldSupportedFiatCurrency}
-              walletAddress={recipientAddress}
-              setConnectedProvider={setConnectedProvider}
-              setErrorProvider={setErrorProvider}
-            />
-          )
-        })}
-        <Text variant="body3" textAlign="center" color="$neutral2">
-          <Trans i18nKey="fiatOnRamp.chooseProvider.description" />
-        </Text>
-      </Flex>
+  return (
+    <ProviderListPaddedColumn gap="16px">
+      <RowBetween>
+        <Row>
+          <Text variant="body3">
+            <Trans i18nKey="fiatOnRamp.checkoutWith" />
+          </Text>
+        </Row>
+        <Row justify="right" gap="xs">
+          <GetHelpButton url={uniswapUrls.helpArticleUrls.fiatOnRampHelp} />
+          <CloseIcon data-testid="ChooseProviderModal-close" onClick={closeModal} />
+        </Row>
+      </RowBetween>
+      {quotes?.quotes?.map((q: FORQuote) => {
+        return (
+          <FORQuoteItem
+            key={q.serviceProvider}
+            serviceProvider={q.serviceProviderDetails}
+            onPress={() => {
+              setSelectedServiceProvider(q.serviceProviderDetails)
+            }}
+          />
+        )
+      })}
+      <Text variant="body3" textAlign="center" color="$neutral2">
+        <Trans i18nKey="fiatOnRamp.chooseProvider.description" />
+      </Text>
     </ProviderListPaddedColumn>
   )
 }
 
 export function ChooseProviderModal(props: ChooseProviderModal) {
   return (
-    <AdaptiveWebModalSheet isOpen={props.isOpen} onClose={props.closeModal} width={420}>
+    <Modal isOpen={props.isOpen} onDismiss={props.closeModal}>
       <ContentWrapper>
         <ChooseProviderModalContent {...props} />
       </ContentWrapper>
-    </AdaptiveWebModalSheet>
+    </Modal>
   )
 }
diff --git a/apps/web/src/pages/Swap/Buy/CountryListRow.tsx b/apps/web/src/pages/Swap/Buy/CountryListRow.tsx
index 49342915c32..4ea2dfbec30 100644
--- a/apps/web/src/pages/Swap/Buy/CountryListRow.tsx
+++ b/apps/web/src/pages/Swap/Buy/CountryListRow.tsx
@@ -1,6 +1,6 @@
 import Row from 'components/Row'
-import styled, { CSSProperties } from 'lib/styled-components'
 import { ApprovedCheckmarkIcon } from 'nft/components/icons'
+import styled, { CSSProperties } from 'styled-components'
 import { Text } from 'ui/src/components/text/Text'
 import { iconSizes } from 'ui/src/theme'
 import { FORCountry } from 'uniswap/src/features/fiatOnRamp/types'
diff --git a/apps/web/src/pages/Swap/Buy/FiatOnRampCurrencyModal.tsx b/apps/web/src/pages/Swap/Buy/FiatOnRampCurrencyModal.tsx
index 015134a44e1..4e8d27d424a 100644
--- a/apps/web/src/pages/Swap/Buy/FiatOnRampCurrencyModal.tsx
+++ b/apps/web/src/pages/Swap/Buy/FiatOnRampCurrencyModal.tsx
@@ -34,7 +34,7 @@ export function FiatOnRampCurrencyModal({
       <ContentWrapper>
         <PaddedColumn>
           <RowBetween>
-            <Text variant="subheading1">
+            <Text variant="body3">
               <Trans i18nKey="common.selectToken.label" />
             </Text>
             <CloseIcon data-testid="FiatOnRampCurrencyModal-close" onClick={onDismiss} />
diff --git a/apps/web/src/pages/Swap/Buy/PredefinedAmount.tsx b/apps/web/src/pages/Swap/Buy/PredefinedAmount.tsx
index 3f224e21f3d..1bd2d7b0842 100644
--- a/apps/web/src/pages/Swap/Buy/PredefinedAmount.tsx
+++ b/apps/web/src/pages/Swap/Buy/PredefinedAmount.tsx
@@ -1,9 +1,7 @@
-import styled, { css } from 'lib/styled-components'
-import { useBuyFormContext } from 'pages/Swap/Buy/BuyFormContext'
-import { fallbackCurrencyInfo } from 'pages/Swap/Buy/hooks'
-import { formatFiatOnRampFiatAmount } from 'pages/Swap/Buy/shared'
+import styled, { css } from 'styled-components'
 import { useSporeColors } from 'ui/src'
 import { Pill } from 'uniswap/src/components/pill/Pill'
+import { NO_DECIMALS_CURRENCY, useFormatter } from 'utils/formatNumbers'
 
 interface PredefinedAmountProps {
   amount: number
@@ -12,36 +10,39 @@ interface PredefinedAmountProps {
   onClick: () => void
 }
 
-const ClickablePill = styled(Pill)<{ $disabled: boolean; $active: boolean }>`
-  background-color: ${({ $disabled, $active, theme }) =>
-    $disabled ? theme.surface2 : $active ? theme.surface3 : theme.surface1};
-  user-select: none;
-  ${({ $disabled, $active }) =>
-    !$disabled &&
+const ClickablePill = styled(Pill)<{ disabled: boolean }>`
+  ${({ disabled }) =>
+    !disabled &&
     css`
       cursor: pointer;
       &:hover {
-        background-color: ${({ theme }) => ($active ? theme.surface3Hovered : theme.surface1Hovered)};
-        border-color: ${({ theme }) => theme.surface3Hovered};
+        background-color: ${({ theme }) => theme.surface2};
+        border-color: ${({ theme }) => theme.surface3};
       }
     `}
 `
 
 export function PredefinedAmount({ currentAmount, amount, disabled = false, onClick }: PredefinedAmountProps) {
   const colors = useSporeColors()
-  const { derivedBuyFormInfo } = useBuyFormContext()
-  const { meldSupportedFiatCurrency } = derivedBuyFormInfo
+  const { formatFiatPrice } = useFormatter()
 
-  const active = currentAmount === amount.toString()
+  const highlighted = currentAmount === amount.toString()
   return (
     <ClickablePill
       disabled={disabled}
       onPress={onClick}
-      $disabled={disabled}
-      $active={active}
-      customBorderColor={colors.surface3.val}
-      foregroundColor={colors[disabled ? 'neutral3' : active ? 'neutral1' : 'neutral2'].val}
-      label={formatFiatOnRampFiatAmount(amount, meldSupportedFiatCurrency ?? fallbackCurrencyInfo)}
+      backgroundColor={!disabled && highlighted ? '$surface2' : '$surface1'}
+      customBorderColor={disabled ? colors.surface2.val : colors.surface3.val}
+      foregroundColor={colors[disabled ? 'neutral3' : highlighted ? 'neutral1' : 'neutral2'].val}
+      label={formatFiatPrice({
+        price: amount,
+        type: [
+          {
+            upperBound: Number.MAX_SAFE_INTEGER,
+            formatterOptions: { ...NO_DECIMALS_CURRENCY, useGrouping: false },
+          },
+        ],
+      })}
       px="$spacing16"
       textVariant="buttonLabel3"
     />
diff --git a/apps/web/src/pages/Swap/Buy/ProviderConnectedView.tsx b/apps/web/src/pages/Swap/Buy/ProviderConnectedView.tsx
index 976dce96acc..17c4cd5aea3 100644
--- a/apps/web/src/pages/Swap/Buy/ProviderConnectedView.tsx
+++ b/apps/web/src/pages/Swap/Buy/ProviderConnectedView.tsx
@@ -1,18 +1,10 @@
-import { t } from 'i18next'
-import styled, { useTheme } from 'lib/styled-components'
 import { ConnectingViewWrapper } from 'pages/Swap/Buy/shared'
 import { Trans } from 'react-i18next'
-import { ExternalLink } from 'theme/components'
 import { Flex, Text, useIsDarkMode } from 'ui/src'
 import { ServiceProviderLogoStyles } from 'uniswap/src/features/fiatOnRamp/constants'
 import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
 import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
 
-const StyledLink = styled(ExternalLink)`
-  font-weight: 535;
-  color: ${({ theme }) => theme.neutral3};
-`
-
 interface ProviderConnectedViewProps {
   closeModal: () => void
   selectedServiceProvider: FORServiceProvider
@@ -20,50 +12,25 @@ interface ProviderConnectedViewProps {
 
 export function ProviderConnectedView({ closeModal, selectedServiceProvider }: ProviderConnectedViewProps) {
   const isDarkMode = useIsDarkMode()
-  const theme = useTheme()
 
   return (
     <ConnectingViewWrapper closeModal={closeModal}>
-      <Flex alignItems="center" gap="$spacing48">
-        <Flex alignItems="center" gap="$spacing24">
-          <img
-            style={ServiceProviderLogoStyles.uniswapLogoWrapper}
-            height={120}
-            src={getOptionalServiceProviderLogo(selectedServiceProvider?.logos, isDarkMode)}
-            width={120}
-          />
-          <Flex alignItems="center" gap="$spacing8">
-            <Text variant="subheading1">
-              <Trans
-                i18nKey="fiatOnRamp.completeTransactionHeader"
-                values={{ serviceProvider: selectedServiceProvider.name }}
-              />
-            </Text>
-            <Text variant="body2" textAlign="center" color="$neutral2">
-              <Trans i18nKey="fiatOnRamp.continueInTab" values={{ serviceProvider: selectedServiceProvider.name }} />
-            </Text>
-          </Flex>
-        </Flex>
-        <Text variant="body4" textAlign="center" color="$neutral3">
+      <img
+        style={ServiceProviderLogoStyles.uniswapLogoWrapper}
+        height={120}
+        src={getOptionalServiceProviderLogo(selectedServiceProvider?.logos, isDarkMode)}
+        width={120}
+      />
+      <Flex flexDirection="column" alignItems="center">
+        <Text variant="subheading1">
           <Trans
-            i18nKey="fiatOnRamp.disclaimer"
-            values={{
-              serviceProvider: selectedServiceProvider.name,
-            }}
-            components={{
-              tosLink: (
-                <StyledLink color={theme.neutral3} href="https://uniswap.org/terms-of-service/">
-                  {t('common.termsOfService')}
-                </StyledLink>
-              ),
-              privacyLink: (
-                <StyledLink color={theme.neutral3} href="https://uniswap.org/privacy-policy">
-                  {t('common.privacyPolicy')}
-                </StyledLink>
-              ),
-            }}
+            i18nKey="fiatOnRamp.completeTransactionHeader"
+            values={{ serviceProvider: selectedServiceProvider.name }}
           />
         </Text>
+        <Text variant="body2" textAlign="center" color="$neutral2">
+          <Trans i18nKey="fiatOnRamp.continueInTab" values={{ serviceProvider: selectedServiceProvider.name }} />
+        </Text>
       </Flex>
     </ConnectingViewWrapper>
   )
diff --git a/apps/web/src/pages/Swap/Buy/ProviderConnectingView.tsx b/apps/web/src/pages/Swap/Buy/ProviderConnectingView.tsx
new file mode 100644
index 00000000000..1fbafd9e8fe
--- /dev/null
+++ b/apps/web/src/pages/Swap/Buy/ProviderConnectingView.tsx
@@ -0,0 +1,40 @@
+import { useBuyFormContext } from 'pages/Swap/Buy/BuyFormContext'
+import { ConnectingViewWrapper } from 'pages/Swap/Buy/shared'
+import { Trans } from 'react-i18next'
+import { Text, useIsDarkMode } from 'ui/src'
+import { FiatOnRampConnectingView } from 'uniswap/src/features/fiatOnRamp/FiatOnRampConnectingView'
+import { ServiceProviderLogoStyles } from 'uniswap/src/features/fiatOnRamp/constants'
+import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
+import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
+
+interface ProviderConnectingViewProps {
+  closeModal: () => void
+  selectedServiceProvider: FORServiceProvider
+}
+
+export function ProviderConnectingView({ closeModal, selectedServiceProvider }: ProviderConnectingViewProps) {
+  const isDarkMode = useIsDarkMode()
+  const { derivedBuyFormInfo, buyFormState } = useBuyFormContext()
+  const { quoteCurrency, inputAmount } = buyFormState
+  const { meldSupportedFiatCurrency } = derivedBuyFormInfo
+  return (
+    <ConnectingViewWrapper closeModal={closeModal}>
+      <FiatOnRampConnectingView
+        serviceProviderName={selectedServiceProvider.name}
+        amount={(meldSupportedFiatCurrency?.symbol ?? '$') + parseFloat(inputAmount).toFixed(2)}
+        quoteCurrencyCode={quoteCurrency.currencyInfo?.currency.symbol}
+        serviceProviderLogo={
+          <img
+            style={ServiceProviderLogoStyles.uniswapLogoWrapper}
+            height={ServiceProviderLogoStyles.icon.height}
+            src={getOptionalServiceProviderLogo(selectedServiceProvider?.logos, isDarkMode)}
+            width={ServiceProviderLogoStyles.icon.height}
+          />
+        }
+      />
+      <Text variant="body3" textAlign="center" color="$neutral2">
+        <Trans i18nKey="fiatOnRamp.disclaimer" values={{ serviceProvider: selectedServiceProvider.name }} />
+      </Text>
+    </ConnectingViewWrapper>
+  )
+}
diff --git a/apps/web/src/pages/Swap/Buy/ProviderConnectionError.tsx b/apps/web/src/pages/Swap/Buy/ProviderConnectionError.tsx
index 9cf150470b1..840599851b2 100644
--- a/apps/web/src/pages/Swap/Buy/ProviderConnectionError.tsx
+++ b/apps/web/src/pages/Swap/Buy/ProviderConnectionError.tsx
@@ -1,6 +1,6 @@
 import { ConnectingViewWrapper } from 'pages/Swap/Buy/shared'
 import { Trans } from 'react-i18next'
-import { Button, Flex, Image, Text, useIsDarkMode } from 'ui/src'
+import { Flex, Image, Text, useIsDarkMode } from 'ui/src'
 import { UNISWAP_LOGO_LARGE } from 'ui/src/assets'
 import { iconSizes } from 'ui/src/theme'
 import { ServiceProviderLogoStyles } from 'uniswap/src/features/fiatOnRamp/constants'
@@ -18,41 +18,27 @@ export function ProviderConnectionError({ onBack, closeModal, selectedServicePro
 
   return (
     <ConnectingViewWrapper closeModal={closeModal} onBack={onBack}>
-      <Flex alignItems="center" gap="$spacing36">
-        <Flex row gap="$spacing16">
-          <Flex alignItems="center" justifyContent="center" style={ServiceProviderLogoStyles.uniswapLogoWrapper}>
-            <Image height={iconSizes.icon64} source={UNISWAP_LOGO_LARGE} width={iconSizes.icon64} />
-          </Flex>
-          <img
-            style={ServiceProviderLogoStyles.uniswapLogoWrapper}
-            height={120}
-            src={getOptionalServiceProviderLogo(selectedServiceProvider?.logos, isDarkMode)}
-            width={120}
-          />
-        </Flex>
-        <Flex centered gap="$spacing8">
-          <Text variant="subheading1" color="$statusCritical">
-            <Trans i18nKey="fiatOnRamp.connection.error" />
-          </Text>
-          <Text color="$neutral2" variant="body2" textAlign="center">
-            <Trans
-              i18nKey="fiatOnRamp.connection.errorDescription"
-              values={{ serviceProvider: selectedServiceProvider.name }}
-            />
-          </Text>
+      <Flex row gap="$spacing16" pb="$spacing16">
+        <Flex alignItems="center" justifyContent="center" style={ServiceProviderLogoStyles.uniswapLogoWrapper}>
+          <Image height={iconSizes.icon64} source={UNISWAP_LOGO_LARGE} width={iconSizes.icon64} />
         </Flex>
-        <Button
-          size="medium"
-          backgroundColor="$accent3"
-          color="$primary"
-          hoverStyle={{
-            backgroundColor: '$accent3Hovered',
-          }}
-          width="100%"
-          onPress={onBack}
-        >
-          <Trans i18nKey="common.tryAgain.error" />
-        </Button>
+        <img
+          style={ServiceProviderLogoStyles.uniswapLogoWrapper}
+          height={120}
+          src={getOptionalServiceProviderLogo(selectedServiceProvider?.logos, isDarkMode)}
+          width={120}
+        />
+      </Flex>
+      <Flex centered gap="$spacing8">
+        <Text variant="subheading1" color="$statusCritical">
+          <Trans i18nKey="fiatOnRamp.connection.error" />
+        </Text>
+        <Text color="$neutral2" variant="body2">
+          <Trans
+            i18nKey="fiatOnRamp.connection.errorDescription"
+            values={{ serviceProvider: selectedServiceProvider.name }}
+          />
+        </Text>
       </Flex>
     </ConnectingViewWrapper>
   )
diff --git a/apps/web/src/pages/Swap/Buy/ProviderOption.tsx b/apps/web/src/pages/Swap/Buy/ProviderOption.tsx
deleted file mode 100644
index 262aafee1e9..00000000000
--- a/apps/web/src/pages/Swap/Buy/ProviderOption.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useMemo } from 'react'
-import { useAddFiatOnRampTransaction } from 'state/fiatOnRampTransactions/hooks'
-import { FiatOnRampTransactionStatus, FiatOnRampTransactionType } from 'state/fiatOnRampTransactions/types'
-import { ExternalLink } from 'ui/src/components/icons'
-import { UNISWAP_WEB_URL } from 'uniswap/src/constants/urls'
-import { FORQuoteItem } from 'uniswap/src/features/fiatOnRamp/FORQuoteItem'
-import { useFiatOnRampAggregatorWidgetQuery } from 'uniswap/src/features/fiatOnRamp/api'
-import { FORCountry, FORQuote, FORServiceProvider, FiatCurrencyInfo } from 'uniswap/src/features/fiatOnRamp/types'
-import { createOnRampTransactionId } from 'uniswap/src/features/fiatOnRamp/utils'
-import { FiatOnRampEventName } from 'uniswap/src/features/telemetry/constants'
-import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-
-interface ProviderOptionProps {
-  quote: FORQuote
-  selectedCountry: FORCountry
-  quoteCurrencyCode: string
-  inputAmount: string
-  meldSupportedFiatCurrency: FiatCurrencyInfo
-  walletAddress: string
-  setConnectedProvider: (provider: FORServiceProvider) => void
-  setErrorProvider: (provider: FORServiceProvider) => void
-}
-
-export function ProviderOption({
-  quote,
-  selectedCountry,
-  quoteCurrencyCode,
-  inputAmount,
-  meldSupportedFiatCurrency,
-  walletAddress,
-  setConnectedProvider,
-  setErrorProvider,
-}: ProviderOptionProps) {
-  const addFiatOnRampTransaction = useAddFiatOnRampTransaction()
-
-  const widgetQueryParams = useMemo(() => {
-    return {
-      serviceProvider: quote.serviceProviderDetails.serviceProvider,
-      countryCode: selectedCountry.countryCode,
-      destinationCurrencyCode: quoteCurrencyCode,
-      sourceAmount: parseFloat(inputAmount),
-      sourceCurrencyCode: meldSupportedFiatCurrency.code,
-      walletAddress,
-      externalSessionId: createOnRampTransactionId(quote.serviceProviderDetails.serviceProvider),
-      redirectUrl: `${UNISWAP_WEB_URL}/buy`,
-    }
-  }, [
-    inputAmount,
-    meldSupportedFiatCurrency.code,
-    quote.serviceProviderDetails.serviceProvider,
-    quoteCurrencyCode,
-    selectedCountry.countryCode,
-    walletAddress,
-  ])
-
-  // TODO(WEB-4417): use the widgetUrl from the /quote response instead of prefetching for every provider.
-  const { data, error, isLoading } = useFiatOnRampAggregatorWidgetQuery(widgetQueryParams)
-
-  return (
-    <FORQuoteItem
-      key={quote.serviceProviderDetails.serviceProvider}
-      serviceProvider={quote.serviceProviderDetails}
-      hoverIcon={<ExternalLink position="absolute" right="$spacing12" size={20} />}
-      isLoading={isLoading}
-      onPress={async () => {
-        if (data) {
-          window.open(data.widgetUrl, '_blank')
-          setConnectedProvider(quote.serviceProviderDetails)
-          addFiatOnRampTransaction({
-            externalSessionId: widgetQueryParams.externalSessionId,
-            account: walletAddress,
-            status: FiatOnRampTransactionStatus.INITIATED,
-            forceFetched: false,
-            addedAt: Date.now(),
-            type: FiatOnRampTransactionType.BUY,
-            syncedWithBackend: false,
-            provider: quote.serviceProviderDetails.serviceProvider,
-          })
-          sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampWidgetOpened, {
-            countryCode: selectedCountry.countryCode,
-            countryState: selectedCountry.state,
-            cryptoCurrency: quoteCurrencyCode,
-            externalTransactionId: widgetQueryParams.externalSessionId,
-            fiatCurrency: meldSupportedFiatCurrency.code,
-            serviceProvider: quote.serviceProviderDetails.serviceProvider,
-          })
-        } else if (error) {
-          setErrorProvider(quote.serviceProviderDetails)
-        }
-      }}
-    />
-  )
-}
diff --git a/apps/web/src/pages/Swap/Buy/__snapshots__/PredefinedAmount.test.tsx.snap b/apps/web/src/pages/Swap/Buy/__snapshots__/PredefinedAmount.test.tsx.snap
index 8026c5cf9ca..1951aa9de8e 100644
--- a/apps/web/src/pages/Swap/Buy/__snapshots__/PredefinedAmount.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Buy/__snapshots__/PredefinedAmount.test.tsx.snap
@@ -2,17 +2,12 @@
 
 exports[`PredefinedAmount renders correctly with amount= 100 , currentAmount= "1000" , disabled= false 1`] = `
 .c0 {
-  background-color: #FFFFFF;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
   cursor: pointer;
 }
 
 .c0:hover {
-  background-color: #F5F5F5;
-  border-color: rgba(34,34,34,0.12));
+  background-color: #F9F9F9;
+  border-color: #22222212;
 }
 
 <span
@@ -22,7 +17,7 @@ exports[`PredefinedAmount renders correctly with amount= 100 , currentAmount= "1
     class=" t_light _dsp_contents is_Theme"
   >
     <div
-      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
+      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _backgroundColor-568007324 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
       style="border-color: #2222220d;"
     >
       <span
@@ -38,14 +33,6 @@ exports[`PredefinedAmount renders correctly with amount= 100 , currentAmount= "1
 `;
 
 exports[`PredefinedAmount renders correctly with amount= 300 , currentAmount= "1000" , disabled= true 1`] = `
-.c0 {
-  background-color: #F9F9F9;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
 <span
   class=" _dsp_contents"
 >
@@ -54,8 +41,8 @@ exports[`PredefinedAmount renders correctly with amount= 300 , currentAmount= "1
   >
     <div
       aria-disabled="true"
-      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
-      style="border-color: #2222220d;"
+      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _backgroundColor-568007324 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid "
+      style="border-color: #f9f9f9;"
     >
       <span
         class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500"
@@ -71,17 +58,12 @@ exports[`PredefinedAmount renders correctly with amount= 300 , currentAmount= "1
 
 exports[`PredefinedAmount renders correctly with amount= 1000 , currentAmount= "1000" , disabled= false 1`] = `
 .c0 {
-  background-color: #22222212;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
   cursor: pointer;
 }
 
 .c0:hover {
-  background-color: rgba(34,34,34,0.12));
-  border-color: rgba(34,34,34,0.12));
+  background-color: #F9F9F9;
+  border-color: #22222212;
 }
 
 <span
@@ -91,7 +73,7 @@ exports[`PredefinedAmount renders correctly with amount= 1000 , currentAmount= "
     class=" t_light _dsp_contents is_Theme"
   >
     <div
-      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
+      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _backgroundColor-568007293 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
       style="border-color: #2222220d;"
     >
       <span
@@ -107,14 +89,6 @@ exports[`PredefinedAmount renders correctly with amount= 1000 , currentAmount= "
 `;
 
 exports[`PredefinedAmount renders correctly with amount= 1000 , currentAmount= "1000" , disabled= true 1`] = `
-.c0 {
-  background-color: #F9F9F9;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
 <span
   class=" _dsp_contents"
 >
@@ -123,8 +97,8 @@ exports[`PredefinedAmount renders correctly with amount= 1000 , currentAmount= "
   >
     <div
       aria-disabled="true"
-      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid c0"
-      style="border-color: #2222220d;"
+      class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _borderTopLeftRadius-1307610122 _borderTopRightRadius-1307610122 _borderBottomRightRadius-1307610122 _borderBottomLeftRadius-1307610122 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _flexDirection-row _gap-1481558276 _justifyContent-center _pr-1481558214 _pl-1481558214 _pt-1481558276 _pb-1481558276 _backgroundColor-568007324 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid "
+      style="border-color: #f9f9f9;"
     >
       <span
         class="font_button _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-500"
diff --git a/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectedView.test.tsx.snap b/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectedView.test.tsx.snap
index 451a4238066..bbcef50af2d 100644
--- a/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectedView.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectedView.test.tsx.snap
@@ -1,19 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ProviderConnectedView should render the component and call callbacks 1`] = `
+.c7 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 44px;
+}
+
 .c0 {
   display: grid;
   grid-auto-rows: auto;
   grid-row-gap: 16px;
 }
 
-.c4 {
+.c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c5 {
+.c4 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -30,7 +45,7 @@ exports[`ProviderConnectedView should render the component and call callbacks 1`
   justify-content: flex-start;
 }
 
-.c7 {
+.c6 {
   color: #7D7D7D;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -40,60 +55,38 @@ exports[`ProviderConnectedView should render the component and call callbacks 1`
   transition-duration: 125ms;
 }
 
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c9 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c9:hover {
+.c6:hover {
   opacity: 0.6;
 }
 
-.c9:active {
+.c6:active {
   opacity: 0.4;
 }
 
-.c1 {
-  position: relative;
-}
-
 .c2 {
+  pointer-events: none;
   position: absolute;
+  width: 100%;
+  height: 100%;
   z-index: 0;
+  box-shadow: 0 0 12px 12px transparent inset;
 }
 
-.c3 {
-  position: absolute;
-  z-index: 1;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background: radial-gradient(70% 50% at center,transparent 0%,#FFFFFF 100%);
+.c1 {
+  position: relative;
+  padding: 16px 24px 80px 24px;
 }
 
 .c8 {
-  margin: 40px 0 0 0;
-  z-index: 2;
-  height: 100%;
-  width: 100%;
+  margin: 64px 0 0 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  z-index: 1;
 }
 
-.c6 {
+.c5 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -102,17 +95,12 @@ exports[`ProviderConnectedView should render the component and call callbacks 1`
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
-  z-index: 2;
+  z-index: 1;
   -webkit-flex-direction: row-reverse;
   -ms-flex-direction: row-reverse;
   flex-direction: row-reverse;
 }
 
-.c10 {
-  font-weight: 535;
-  color: #CECECE;
-}
-
 <span
   class="t_light is_inversed _dsp_contents"
 >
@@ -122,20 +110,15 @@ exports[`ProviderConnectedView should render the component and call callbacks 1`
     <div
       class="c0 c1"
     >
-      <svg
+      <img
         class="c2"
-        color="#7D7D7D"
-      >
-        for-connecting-v2.svg
-      </svg>
-      <div
-        class="c3"
+        src="for-connecting-light.png"
       />
       <div
-        class="c4 c5 c6"
+        class="c3 c4 c5"
       >
         <svg
-          class="c7"
+          class="c6"
           data-testid="ConnectingViewWrapper-close"
           fill="none"
           height="24"
@@ -162,62 +145,28 @@ exports[`ProviderConnectedView should render the component and call callbacks 1`
         </svg>
       </div>
       <div
-        class="c8"
+        class="c7 c8"
       >
+        <img
+          height="120"
+          src="test-provider-logo-light"
+          style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
+          width="120"
+        />
         <div
-          class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _gap-1316330207"
+          class="_display-flex _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _flexDirection-column _alignItems-center"
         >
-          <div
-            class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _gap-1481558152"
+          <span
+            class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
+            data-disable-theme="true"
           >
-            <img
-              height="120"
-              src="test-provider-logo-light"
-              style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
-              width="120"
-            />
-            <div
-              class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _gap-1481558276"
-            >
-              <span
-                class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-18px _lineHeight-24px _fontWeight-400"
-                data-disable-theme="true"
-              >
-                Complete transaction with Test Provider
-              </span>
-              <span
-                class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400 _textAlign-center"
-                data-disable-theme="true"
-              >
-                Go to the Test Provider tab to continue. It’s safe to close this modal now.
-              </span>
-            </div>
-          </div>
+            Complete transaction with Test Provider
+          </span>
           <span
-            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135036 _fontSize-12px _lineHeight-16px _fontWeight-400 _textAlign-center"
+            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400 _textAlign-center"
             data-disable-theme="true"
           >
-            By continuing, you acknowledge that you’ll be subject to the 
-            <a
-              class="c9 c10"
-              color="#CECECE"
-              href="https://uniswap.org/terms-of-service/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              Terms of Service
-            </a>
-             and 
-            <a
-              class="c9 c10"
-              color="#CECECE"
-              href="https://uniswap.org/privacy-policy"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              Privacy Policy
-            </a>
-             with Test Provider, as applicable.
+            Go to the Test Provider tab to continue. It’s safe to close this modal now.
           </span>
         </div>
       </div>
diff --git a/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectionError.test.tsx.snap b/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectionError.test.tsx.snap
index 2cb6b60f9c2..f78b34d4982 100644
--- a/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectionError.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Buy/__snapshots__/ProviderConnectionError.test.tsx.snap
@@ -1,19 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ProviderConnectionError should render the component and call callbacks 1`] = `
+.c8 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  gap: 44px;
+}
+
 .c0 {
   display: grid;
   grid-auto-rows: auto;
   grid-row-gap: 16px;
 }
 
-.c4 {
+.c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c5 {
+.c4 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -30,7 +45,7 @@ exports[`ProviderConnectionError should render the component and call callbacks
   justify-content: flex-start;
 }
 
-.c7 {
+.c6 {
   color: #7D7D7D;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -40,45 +55,42 @@ exports[`ProviderConnectionError should render the component and call callbacks
   transition-duration: 125ms;
 }
 
-.c7:hover {
+.c6:hover {
   opacity: 0.6;
 }
 
-.c7:active {
+.c6:active {
   opacity: 0.4;
 }
 
-.c1 {
-  position: relative;
-}
-
 .c2 {
+  pointer-events: none;
   position: absolute;
+  width: 100%;
+  height: 100%;
   z-index: 0;
+  box-shadow: 0 0 12px 12px transparent inset;
 }
 
-.c3 {
-  position: absolute;
-  z-index: 1;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background: radial-gradient(70% 50% at center,transparent 0%,#FFFFFF 100%);
+.c1 {
+  position: relative;
+  padding: 16px 24px 80px 24px;
 }
 
 .c9 {
-  margin: 40px 0 0 0;
-  z-index: 2;
-  height: 100%;
-  width: 100%;
+  margin: 64px 0 0 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  z-index: 1;
 }
 
-.c8 {
+.c7 {
   cursor: pointer;
 }
 
-.c6 {
+.c5 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -87,7 +99,7 @@ exports[`ProviderConnectionError should render the component and call callbacks
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
-  z-index: 2;
+  z-index: 1;
   -webkit-flex-direction: row-reverse;
   -ms-flex-direction: row-reverse;
   flex-direction: row-reverse;
@@ -102,20 +114,15 @@ exports[`ProviderConnectionError should render the component and call callbacks
     <div
       class="c0 c1"
     >
-      <svg
+      <img
         class="c2"
-        color="#7D7D7D"
-      >
-        for-connecting-v2.svg
-      </svg>
-      <div
-        class="c3"
+        src="for-connecting-light.png"
       />
       <div
-        class="c4 c5 c6"
+        class="c3 c4 c5"
       >
         <svg
-          class="c7"
+          class="c6"
           data-testid="ConnectingViewWrapper-close"
           fill="none"
           height="24"
@@ -141,7 +148,7 @@ exports[`ProviderConnectionError should render the component and call callbacks
           />
         </svg>
         <svg
-          class="c8"
+          class="c7"
           data-testid="ConnectingViewWrapper-back"
           fill="#7D7D7D"
           height="28"
@@ -155,70 +162,56 @@ exports[`ProviderConnectionError should render the component and call callbacks
         </svg>
       </div>
       <div
-        class="c9"
+        class="c8 c9"
       >
         <div
-          class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _gap-1316330176"
+          class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _gap-1481558214 _pb-1481558214"
         >
           <div
-            class="_display-flex _alignItems-stretch _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _gap-1481558214"
+            class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _justifyContent-center"
+            style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
           >
-            <div
-              class="_display-flex _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _alignItems-center _justifyContent-center"
-              style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
+            <span
+              class="_dsp_contents"
             >
-              <span
-                class="_dsp_contents"
+              <div
+                class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
+                style="height: 64px; width: 64px;"
               >
                 <div
-                  class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010 is_Image "
-                  style="height: 64px; width: 64px;"
-                >
-                  <div
-                    class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-4gszlv"
-                    style="background-image: url(uniswap-logo-large.png);"
-                  />
-                  <img
-                    alt=""
-                    class="css-accessibilityImage-9pa8cd"
-                    draggable="false"
-                    src="uniswap-logo-large.png"
-                  />
-                </div>
-              </span>
-            </div>
-            <img
-              height="120"
-              src="test-provider-logo-light"
-              style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
-              width="120"
-            />
-          </div>
-          <div
-            class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558276"
-          >
-            <span
-              class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1640242377 _fontSize-18px _lineHeight-24px _fontWeight-400"
-              data-disable-theme="true"
-            >
-              Connection failed
-            </span>
-            <span
-              class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400 _textAlign-center"
-              data-disable-theme="true"
-            >
-              Something went wrong connecting with Test Provider.
+                  class="css-view-175oi2r r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw r-backgroundSize-4gszlv"
+                  style="background-image: url(uniswap-logo-large.png);"
+                />
+                <img
+                  alt=""
+                  class="css-accessibilityImage-9pa8cd"
+                  draggable="false"
+                  src="uniswap-logo-large.png"
+                />
+              </div>
             </span>
           </div>
+          <img
+            height="120"
+            src="test-provider-logo-light"
+            style="background-color: rgb(255, 239, 248); border-radius: 20px; height: 90px; width: 90px;"
+            width="120"
+          />
+        </div>
+        <div
+          class="_display-flex _alignItems-center _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-center _gap-1481558276"
+        >
           <span
-            class="t_sub_theme t_primary_Button _dsp_contents is_Theme"
+            class="font_subHeading _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-1640242377 _fontSize-18px _lineHeight-24px _fontWeight-400"
+            data-disable-theme="true"
           >
-            <button
-              class="is_Button _backgroundColor-0active-744986709 _opacity-0active-0d0t746 _display-flex _alignItems-center _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _borderTopWidth-1px _borderRightWidth-1px _borderBottomWidth-1px _borderLeftWidth-1px _justifyContent-center _borderTopColor-2122800589 _borderRightColor-2122800589 _borderBottomColor-2122800589 _borderLeftColor-2122800589 _cursor-pointer _height-auto _pt-1481558245 _pr-1481558245 _pb-1481558245 _pl-1481558245 _borderTopLeftRadius-1307609998 _borderTopRightRadius-1307609998 _borderBottomRightRadius-1307609998 _borderBottomLeftRadius-1307609998 _gap-1481558276 _width-10037 _borderBottomStyle-solid _borderTopStyle-solid _borderLeftStyle-solid _borderRightStyle-solid"
-              data-disable-theme="true"
-            >
-              Try again
-            </button>
+            Connection failed
+          </span>
+          <span
+            class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843135005 _fontSize-16px _lineHeight-24px _fontWeight-400"
+            data-disable-theme="true"
+          >
+            Something went wrong connecting with Test Provider.
           </span>
         </div>
       </div>
diff --git a/apps/web/src/pages/Swap/Buy/hooks.ts b/apps/web/src/pages/Swap/Buy/hooks.ts
index b5c167a9605..8b3704d514b 100644
--- a/apps/web/src/pages/Swap/Buy/hooks.ts
+++ b/apps/web/src/pages/Swap/Buy/hooks.ts
@@ -16,7 +16,7 @@ type FiatOnRampCurrencyInfo = {
   notAvailableInThisRegion: boolean
 }
 
-export const fallbackCurrencyInfo: FiatCurrencyInfo = {
+const fallbackCurrencyInfo: FiatCurrencyInfo = {
   ...getFiatCurrencyComponents('en-US', 'USD'),
   symbol: '$',
   name: 'United States Dollar',
diff --git a/apps/web/src/pages/Swap/Buy/shared.tsx b/apps/web/src/pages/Swap/Buy/shared.tsx
index 39c7d59ec6e..ab439f35052 100644
--- a/apps/web/src/pages/Swap/Buy/shared.tsx
+++ b/apps/web/src/pages/Swap/Buy/shared.tsx
@@ -1,11 +1,11 @@
 import Column, { AutoColumn } from 'components/Column'
 import Row from 'components/Row'
-import styled, { useTheme } from 'lib/styled-components'
 import { BackArrowIcon } from 'nft/components/icons'
 import { PropsWithChildren } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { CloseIcon } from 'theme/components'
-import { ReactComponent as ForConnectingBackground } from 'ui/src/assets/backgrounds/for-connecting-v2.svg'
-import { FiatCurrencyInfo } from 'uniswap/src/features/fiatOnRamp/types'
+import { useIsDarkMode } from 'ui/src'
+import { FOR_CONNECTING_BACKGROUND_DARK, FOR_CONNECTING_BACKGROUND_LIGHT } from 'ui/src/assets'
 
 export const ContentWrapper = styled(Column)`
   background-color: ${({ theme }) => theme.surface1};
@@ -13,32 +13,27 @@ export const ContentWrapper = styled(Column)`
   overflow: hidden;
   flex: 1 1;
   position: relative;
+  border-radius: 20px;
 `
 
-const ConnectingContainer = styled(AutoColumn)`
-  position: relative;
-`
-
-const ConnectingBackgroundImage = styled(ForConnectingBackground)`
+const ConnectingBackgroundImage = styled.img`
+  pointer-events: none;
   position: absolute;
+  width: 100%;
+  height: 100%;
   z-index: 0;
+  box-shadow: 0 0 12px 12px transparent inset;
 `
 
-const ConnectingBackgroundImageFadeLayer = styled.div`
-  position: absolute;
-  z-index: 1;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  ${({ theme }) => `background: radial-gradient(70% 50% at center, transparent 0%, ${theme.surface1} 100%)`}
+const ConnectedPaddedColumn = styled(AutoColumn)`
+  position: relative;
+  padding: 16px 24px 80px 24px;
 `
 
-const ConnectingViewContent = styled.div`
-  margin: 40px 0 0 0;
-  z-index: 2;
-  height: 100%;
-  width: 100%;
+const ConnectingContainer = styled(Column)`
+  margin: 64px 0 0 0;
+  align-items: center;
+  z-index: 1;
 `
 
 const BackButton = styled(BackArrowIcon)`
@@ -48,7 +43,7 @@ const BackButton = styled(BackArrowIcon)`
 const ConnectingViewHeader = styled(Row)`
   align-items: center;
   justify-content: space-between;
-  z-index: 2;
+  z-index: 1;
   flex-direction: row-reverse;
 `
 
@@ -58,21 +53,16 @@ interface ConnectingViewWrapperProps {
 }
 
 export function ConnectingViewWrapper({ children, closeModal, onBack }: PropsWithChildren<ConnectingViewWrapperProps>) {
+  const isDarkMode = useIsDarkMode()
   const theme = useTheme()
-
   return (
-    <ConnectingContainer gap="16px">
-      <ConnectingBackgroundImage color={theme.neutral2} />
-      <ConnectingBackgroundImageFadeLayer />
+    <ConnectedPaddedColumn gap="16px">
+      <ConnectingBackgroundImage src={isDarkMode ? FOR_CONNECTING_BACKGROUND_DARK : FOR_CONNECTING_BACKGROUND_LIGHT} />
       <ConnectingViewHeader>
         <CloseIcon data-testid="ConnectingViewWrapper-close" onClick={closeModal} $color={theme.neutral2} />
         {onBack && <BackButton data-testid="ConnectingViewWrapper-back" fill={theme.neutral2} onClick={onBack} />}
       </ConnectingViewHeader>
-      <ConnectingViewContent>{children}</ConnectingViewContent>
-    </ConnectingContainer>
+      <ConnectingContainer gap="44px">{children}</ConnectingContainer>
+    </ConnectedPaddedColumn>
   )
 }
-
-export function formatFiatOnRampFiatAmount(amount: number, fiatCurrencyInfo: FiatCurrencyInfo) {
-  return fiatCurrencyInfo.symbolAtFront ? `${fiatCurrencyInfo.symbol}${amount}` : `${amount}${fiatCurrencyInfo.symbol}`
-}
diff --git a/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx b/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx
index 1b903e7fb94..9c162a4f40f 100644
--- a/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx
+++ b/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx
@@ -1,7 +1,7 @@
 import Row from 'components/Row'
 import { Trans, t } from 'i18n'
-import styled from 'lib/styled-components'
 import { useLimitContext } from 'state/limit/LimitContext'
+import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { InterfaceEventNameLocal } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
diff --git a/apps/web/src/pages/Swap/Limit/LimitForm.tsx b/apps/web/src/pages/Swap/Limit/LimitForm.tsx
index db1c21a80ee..332fe7bb938 100644
--- a/apps/web/src/pages/Swap/Limit/LimitForm.tsx
+++ b/apps/web/src/pages/Swap/Limit/LimitForm.tsx
@@ -26,7 +26,6 @@ import { SwapResult, useSwapCallback } from 'hooks/useSwapCallback'
 import { useUSDPrice } from 'hooks/useUSDPrice'
 import { Trans } from 'i18n'
 import { useAtom } from 'jotai'
-import styled, { useTheme } from 'lib/styled-components'
 import { LimitExpirySection } from 'pages/Swap/Limit/LimitExpirySection'
 import { LimitPriceError } from 'pages/Swap/Limit/LimitPriceError'
 import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -38,6 +37,7 @@ import { LimitState } from 'state/limit/types'
 import { LimitOrderTrade, TradeFillType } from 'state/routing/types'
 import { useSwapActionHandlers, useSwapAndLimitContext } from 'state/swap/hooks'
 import { CurrencyState } from 'state/swap/types'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { AlertTriangle } from 'ui/src/components/icons'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
diff --git a/apps/web/src/pages/Swap/Limit/LimitPriceError.tsx b/apps/web/src/pages/Swap/Limit/LimitPriceError.tsx
index 84104bafecc..9c41b4890e7 100644
--- a/apps/web/src/pages/Swap/Limit/LimitPriceError.tsx
+++ b/apps/web/src/pages/Swap/Limit/LimitPriceError.tsx
@@ -3,9 +3,9 @@ import Column from 'components/Column'
 import { LimitPriceErrorType } from 'components/CurrencyInputPanel/LimitPriceInputPanel/useCurrentPriceAdjustment'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { AlertTriangle } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { FadePresence, FadePresenceAnimationType } from 'theme/components/FadePresence'
 
diff --git a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx b/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx
index 987eb3857a3..7fda5938c93 100644
--- a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx
+++ b/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx
@@ -4,8 +4,8 @@ import { UserIcon } from 'components/Icons/UserIcon'
 import Identicon, { IdenticonType, useIdenticonType } from 'components/Identicon'
 import Row from 'components/Row'
 import { Trans } from 'i18n'
-import styled, { useTheme } from 'lib/styled-components'
 import { useSendContext } from 'state/send/SendContext'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const StyledUserIcon = styled(UserIcon)`
diff --git a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx b/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx
index 90954e77ce7..32744118766 100644
--- a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx
+++ b/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx
@@ -14,7 +14,6 @@ import { useAccount } from 'hooks/useAccount'
 import { useActiveLocalCurrency, useActiveLocalCurrencyComponents } from 'hooks/useActiveLocalCurrency'
 import { useUSDPrice } from 'hooks/useUSDPrice'
 import { Trans } from 'i18n'
-import styled, { css } from 'lib/styled-components'
 import {
   NumericalInputMimic,
   NumericalInputSymbolContainer,
@@ -27,6 +26,7 @@ import { useSendContext } from 'state/send/SendContext'
 import { SendInputError } from 'state/send/hooks'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
 import { CurrencyState } from 'state/swap/types'
+import styled, { css } from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { Text } from 'ui/src'
 import { UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx b/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
index a61275c2ec6..4d7c2090099 100644
--- a/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
+++ b/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
@@ -8,11 +8,11 @@ import { useGroupedRecentTransfers } from 'hooks/useGroupedRecentTransfers'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { useUnmountingAnimation } from 'hooks/useUnmountingAnimation'
 import { Plural, Trans, t } from 'i18n'
-import styled, { css, keyframes } from 'lib/styled-components'
 import { ChangeEvent, ForwardedRef, KeyboardEvent, forwardRef, useCallback, useRef, useState } from 'react'
 import { X } from 'react-feather'
 import { useSendContext } from 'state/send/SendContext'
 import { RecipientData } from 'state/send/hooks'
+import styled, { css, keyframes } from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 import { AnimationType } from 'theme/components/FadePresence'
 import { Text } from 'ui/src'
diff --git a/apps/web/src/pages/Swap/Send/SendReviewModal.tsx b/apps/web/src/pages/Swap/Send/SendReviewModal.tsx
index 45ac05f343f..309ac3173da 100644
--- a/apps/web/src/pages/Swap/Send/SendReviewModal.tsx
+++ b/apps/web/src/pages/Swap/Send/SendReviewModal.tsx
@@ -1,18 +1,18 @@
 import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
 import { ButtonPrimary } from 'components/Button'
+import GetHelp from 'components/Button/GetHelp'
 import Column, { ColumnCenter } from 'components/Column'
 import Identicon from 'components/Identicon'
 import { ChainLogo } from 'components/Logo/ChainLogo'
 import Modal from 'components/Modal'
-import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
 import Row from 'components/Row'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
 import { ReactNode } from 'react'
 import { useSendContext } from 'state/send/SendContext'
 import { useSwapAndLimitContext } from 'state/swap/hooks'
-import { Separator, ThemedText } from 'theme/components'
+import styled from 'styled-components'
+import { ClickableStyle, CloseIcon, Separator, ThemedText } from 'theme/components'
 import { Unitag } from 'ui/src/components/icons'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { shortenAddress } from 'utilities/src/addresses'
@@ -26,8 +26,8 @@ const ModalWrapper = styled(ColumnCenter)`
   padding: 8px;
 `
 
-const ModalHeader = styled(GetHelpHeader)`
-  padding: 8px 12px 4px;
+const StyledReviewCloseIcon = styled(CloseIcon)`
+  ${ClickableStyle}
 `
 
 const ReviewContentContainer = styled(Column)`
@@ -95,7 +95,17 @@ export function SendReviewModal({ onConfirm, onDismiss }: { onConfirm: () => voi
   return (
     <Modal $scrollOverlay isOpen onDismiss={onDismiss} maxHeight="90vh">
       <ModalWrapper data-testid="send-review-modal" gap="md">
-        <ModalHeader title={<Trans i18nKey="sendReviewModal.title" />} closeModal={onDismiss} />
+        <Row width="100%" padding="8px 12px 4px" align="center">
+          <Row justify="left">
+            <ThemedText.SubHeader>
+              <Trans i18nKey="sendReviewModal.title" />
+            </ThemedText.SubHeader>
+          </Row>
+          <Row justify="right" gap="10px">
+            <GetHelp />
+            <StyledReviewCloseIcon onClick={onDismiss} />
+          </Row>
+        </Row>
         <ReviewContentContainer>
           <Column gap="lg">
             <SendModalHeader
diff --git a/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx b/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx
index f8865128f72..1896b8a1247 100644
--- a/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx
+++ b/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx
@@ -1,7 +1,7 @@
 import { Dialog } from 'components/Dialog/Dialog'
 import AlertTriangleFilled from 'components/Icons/AlertTriangleFilled'
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 
 const StyledAlertIcon = styled(AlertTriangleFilled)`
   path {
diff --git a/apps/web/src/pages/Swap/Send/__snapshots__/NewAddressSpeedBump.test.tsx.snap b/apps/web/src/pages/Swap/Send/__snapshots__/NewAddressSpeedBump.test.tsx.snap
index 15a08bcda3f..7c8519a19b6 100644
--- a/apps/web/src/pages/Swap/Send/__snapshots__/NewAddressSpeedBump.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Send/__snapshots__/NewAddressSpeedBump.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 24px;
 }
 
-.c11 {
+.c12 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -31,7 +31,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 16px;
 }
 
-.c13 {
+.c14 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -46,7 +46,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 8px;
 }
 
-.c18 {
+.c19 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -68,13 +68,40 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   align-items: center;
 }
 
-.c8 {
+.c5 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
 .c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
+}
+
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -92,7 +119,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 4px;
 }
 
-.c20 {
+.c21 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -110,7 +137,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 4px;
 }
 
-.c21 {
+.c22 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -128,7 +155,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   gap: 12px;
 }
 
-.c14 {
+.c15 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -136,7 +163,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   letter-spacing: -0.01em;
 }
 
-.c16 {
+.c17 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -144,7 +171,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -154,15 +181,15 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -173,15 +200,15 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c25 {
+.c26 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -195,7 +222,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   width: 100%;
 }
 
-.c22 {
+.c23 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -230,29 +257,53 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   user-select: none;
 }
 
-.c22:active .c24 {
+.c23:active .c25 {
   background-color: #B8C0DC3d;
 }
 
-.c22:focus .c24 {
+.c23:focus .c25 {
   background-color: #B8C0DC3d;
 }
 
-.c22:hover .c24 {
+.c23:hover .c25 {
   background-color: #98A1C014;
 }
 
-.c22:disabled {
+.c23:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c22:disabled:active .c24,
-.c22:disabled:focus .c24,
-.c22:disabled:hover .c24 {
+.c23:disabled:active .c25,
+.c23:disabled:focus .c25,
+.c23:disabled:hover .c25 {
   background-color: transparent;
 }
 
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
 .c0 {
   will-change: transform,opacity;
 }
@@ -296,30 +347,6 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -328,7 +355,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -347,14 +374,14 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   border-radius: 12px;
 }
 
-.c15 {
+.c16 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c17 {
+.c18 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -365,7 +392,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   text-align: center;
 }
 
-.c23 {
+.c24 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -378,11 +405,7 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
-.c19 {
+.c20 {
   padding: 20px 16px;
   border: 1px solid #22222212;
   gap: 8px;
@@ -459,71 +482,68 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <svg
                       fill="none"
@@ -539,26 +559,26 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
                     </svg>
                   </div>
                   <div
-                    class="c13 c3"
+                    class="c14 c3"
                   >
                     <div
-                      class="c14 c15 css-4kpdx7"
+                      class="c15 c16 css-4kpdx7"
                     >
                       New address
                     </div>
                     <div
-                      class="c16 c17 css-1urox24"
+                      class="c17 c18 css-1urox24"
                     >
                       You haven’t transacted with this address before. Make sure it’s the correct address before continuing.
                     </div>
                     <div
-                      class="c18 c3 c19"
+                      class="c19 c3 c20"
                     >
                       <div
-                        class="c8 c20"
+                        class="c9 c21"
                       >
                         <div
-                          class="c14 css-n8z49y"
+                          class="c15 css-n8z49y"
                         >
                           0x9984b4b4E408e8D618A879e5315BD30952c89103
                         </div>
@@ -567,21 +587,21 @@ exports[`NewAddressSpeedBumpModal should not render identicon if account has no
                   </div>
                 </div>
                 <div
-                  class="c8 c21"
+                  class="c9 c22"
                 >
                   <button
-                    class="c22 c23"
+                    class="c23 c24"
                   >
                     <div
-                      class="c24 c25"
+                      class="c25 c26"
                     />
                     Cancel
                   </button>
                   <button
-                    class="c22 c23"
+                    class="c23 c24"
                   >
                     <div
-                      class="c24 c25"
+                      class="c25 c26"
                     />
                     Continue
                   </button>
diff --git a/apps/web/src/pages/Swap/Send/__snapshots__/SendReviewModal.test.tsx.snap b/apps/web/src/pages/Swap/Send/__snapshots__/SendReviewModal.test.tsx.snap
index 8edd037f274..adcc4fd4c64 100644
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SendReviewModal.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Send/__snapshots__/SendReviewModal.test.tsx.snap
@@ -1,20 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
-.c6 {
+.c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 8px 12px 4px;
 }
 
-.c22 {
+.c5 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c26 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
   width: 100%;
 }
 
-.c23 {
+.c27 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -23,7 +31,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   width: min-content;
 }
 
-.c25 {
+.c29 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -46,7 +54,60 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   border-radius: 4px;
 }
 
-.c7 {
+.c4 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  padding: 8px 12px 4px;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: left;
+  -webkit-justify-content: left;
+  -ms-flex-pack: left;
+  justify-content: left;
+}
+
+.c8 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: right;
+  -webkit-justify-content: right;
+  -ms-flex-pack: right;
+  justify-content: right;
+  gap: 10px;
+}
+
+.c11 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -64,7 +125,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   gap: 4px;
 }
 
-.c12 {
+.c17 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -81,7 +142,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   justify-content: space-between;
 }
 
-.c24 {
+.c28 {
   width: -webkit-min-content;
   width: -moz-min-content;
   width: min-content;
@@ -101,23 +162,23 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   gap: 4px;
 }
 
-.c14 {
-  color: #7D7D7D;
+.c7 {
+  color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
   -ms-letter-spacing: -0.01em;
   letter-spacing: -0.01em;
 }
 
-.c15 {
-  color: #222222;
+.c19 {
+  color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
   -ms-letter-spacing: -0.01em;
   letter-spacing: -0.01em;
 }
 
-.c17 {
+.c21 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -128,35 +189,35 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   left: 0;
 }
 
-.c17 img {
+.c21 img {
   width: 36px;
   height: 36px;
   border-radius: 50%;
 }
 
-.c18 {
+.c22 {
   width: 18px;
   height: 36px;
   border-radius: 50%;
 }
 
-.c19 {
+.c23 {
   height: 36px;
   width: 36px;
 }
 
-.c19 path {
+.c23 path {
   stroke: #CECECE;
   background: #7D7D7D;
   fill: #CECECE;
 }
 
-.c20 {
+.c24 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
 
-.c16 {
+.c20 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -170,7 +231,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   left: 0;
 }
 
-.c8 {
+.c12 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -180,15 +241,15 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c12:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c12:active {
   opacity: 0.4;
 }
 
-.c4 {
+.c9 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -199,21 +260,21 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   font-weight: 500;
 }
 
-.c4:hover {
+.c9:hover {
   opacity: 0.6;
 }
 
-.c4:active {
+.c9:active {
   opacity: 0.4;
 }
 
-.c21 {
+.c25 {
   width: 100%;
   height: 1px;
   background-color: #22222212;
 }
 
-.c26 {
+.c30 {
   padding: 16px;
   width: 100%;
   line-height: 24px;
@@ -252,25 +313,25 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   transform: perspective(1px) translateZ(0);
 }
 
-.c26:disabled {
+.c30:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c26 > * {
+.c30 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c26 > a {
+.c30 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c27 {
+.c31 {
   background-color: #FC72FF;
   font-size: 20px;
   font-weight: 535;
@@ -278,21 +339,21 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   color: #FFFFFF;
 }
 
-.c27:focus {
+.c31:focus {
   box-shadow: 0 0 0 1pt #fb58ff;
   background-color: #fb58ff;
 }
 
-.c27:hover {
+.c31:hover {
   background-color: #fb58ff;
 }
 
-.c27:active {
+.c31:active {
   box-shadow: 0 0 0 1pt #fb3fff;
   background-color: #fb3fff;
 }
 
-.c27:disabled {
+.c31:disabled {
   background-color: #22222212;
   color: #7D7D7D;
   cursor: auto;
@@ -301,6 +362,30 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   outline: none;
 }
 
+.c10 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c10:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c10:hover path {
+  fill: #222222;
+}
+
 .c0 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -316,7 +401,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   gap: 12px;
 }
 
-.c9 {
+.c14 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -330,7 +415,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   justify-content: flex-start;
 }
 
-.c11 {
+.c16 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -345,7 +430,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   gap: 24px;
 }
 
-.c13 {
+.c18 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -368,30 +453,6 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   align-items: center;
 }
 
-.c5 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c5:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c5:hover path {
-  fill: #222222;
-}
-
 .c2 {
   background-color: #FFFFFF;
   border-radius: 20px;
@@ -400,11 +461,23 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   padding: 8px;
 }
 
-.c3 {
-  padding: 8px 12px 4px;
+.c13 {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
 }
 
-.c10 {
+.c13:hover {
+  opacity: 0.6;
+}
+
+.c13:active {
+  opacity: 0.4;
+}
+
+.c15 {
   width: 100%;
   padding: 12px 16px;
   gap: 16px;
@@ -427,29 +500,29 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
   data-testid="send-review-modal"
 >
   <div
-    class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c3"
+    class="c3 c4"
+    width="100%"
   >
     <div
-      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+      class="c5 c6"
     >
-      <span
-        class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-400"
-        data-disable-theme="true"
+      <div
+        class="c7 css-n8z49y"
       >
         Review send
-      </span>
+      </div>
     </div>
     <div
-      class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+      class="c5 c8"
     >
       <a
-        class="c4 c5"
+        class="c9 c10"
         href="https://support.uniswap.org/hc/en-us"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c6 c7"
+          class="c5 c11"
         >
           <svg
             fill="none"
@@ -467,7 +540,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
         </div>
       </a>
       <svg
-        class="c8"
+        class="c12 c13"
         fill="none"
         height="24"
         stroke="currentColor"
@@ -494,29 +567,29 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
     </div>
   </div>
   <div
-    class="c9 c10"
+    class="c14 c15"
   >
     <div
-      class="c11"
+      class="c16"
     >
       <div
-        class="c6 c12"
+        class="c5 c17"
       >
         <div
-          class="c13"
+          class="c18"
         >
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             You’re sending
           </div>
           <div
-            class="c15 css-15popx1"
+            class="c7 css-15popx1"
           >
             $1,000.00
           </div>
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             100.00 DAI
           </div>
@@ -525,15 +598,15 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
           style="height: 36px;"
         >
           <div
-            class="c16"
+            class="c20"
           >
             <div
-              class="c17"
+              class="c21"
               size="36"
             >
                
               <img
-                class="c18"
+                class="c22"
                 size="36"
                 src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
               />
@@ -542,31 +615,31 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
         </div>
       </div>
       <div
-        class="c6 c12"
+        class="c5 c17"
       >
         <div
-          class="c13"
+          class="c18"
         >
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             To
           </div>
           <div
-            class="c15 css-15popx1"
+            class="c7 css-15popx1"
           >
             <div
-              class="c6 c7"
+              class="c5 c11"
             >
               <div
-                class="c15 css-15popx1"
+                class="c7 css-15popx1"
               >
                 hayden.eth
               </div>
             </div>
           </div>
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             0x9984...9103
           </div>
@@ -575,7 +648,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
           style="height: 36px;"
         >
           <svg
-            class="c19 c20"
+            class="c23 c24"
             data-testid="IdenticonLoader"
             fill="#CECECE"
             stroke="#CECECE"
@@ -596,19 +669,19 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
       </div>
     </div>
     <div
-      class="c21"
+      class="c25"
     />
     <div
-      class="c22 c12"
+      class="c26 c17"
       width="100%"
     >
       <div
-        class="c14 css-1a4qi6e"
+        class="c19 css-1a4qi6e"
       >
         Network cost
       </div>
       <div
-        class="c23 c24"
+        class="c27 c28"
         width="min-content"
       >
         <img
@@ -620,7 +693,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
           width="16px"
         />
         <div
-          class="c15 css-142zc9n"
+          class="c7 css-142zc9n"
         >
           -
         </div>
@@ -628,7 +701,7 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
     </div>
   </div>
   <button
-    class="c25 c26 c27"
+    class="c29 c30 c31"
   >
     Confirm send
   </button>
@@ -636,20 +709,28 @@ exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
 `;
 
 exports[`SendCurrencyInputform should render input in token amount correctly 1`] = `
-.c6 {
+.c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 8px 12px 4px;
 }
 
-.c22 {
+.c5 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c26 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
   width: 100%;
 }
 
-.c23 {
+.c27 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -658,7 +739,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   width: min-content;
 }
 
-.c25 {
+.c29 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -681,7 +762,60 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   border-radius: 4px;
 }
 
-.c7 {
+.c4 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  padding: 8px 12px 4px;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: left;
+  -webkit-justify-content: left;
+  -ms-flex-pack: left;
+  justify-content: left;
+}
+
+.c8 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: right;
+  -webkit-justify-content: right;
+  -ms-flex-pack: right;
+  justify-content: right;
+  gap: 10px;
+}
+
+.c11 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -699,7 +833,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   gap: 4px;
 }
 
-.c12 {
+.c17 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -716,7 +850,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   justify-content: space-between;
 }
 
-.c24 {
+.c28 {
   width: -webkit-min-content;
   width: -moz-min-content;
   width: min-content;
@@ -736,23 +870,23 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   gap: 4px;
 }
 
-.c14 {
-  color: #7D7D7D;
+.c7 {
+  color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
   -ms-letter-spacing: -0.01em;
   letter-spacing: -0.01em;
 }
 
-.c15 {
-  color: #222222;
+.c19 {
+  color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
   -ms-letter-spacing: -0.01em;
   letter-spacing: -0.01em;
 }
 
-.c17 {
+.c21 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -763,35 +897,35 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   left: 0;
 }
 
-.c17 img {
+.c21 img {
   width: 36px;
   height: 36px;
   border-radius: 50%;
 }
 
-.c18 {
+.c22 {
   width: 18px;
   height: 36px;
   border-radius: 50%;
 }
 
-.c19 {
+.c23 {
   height: 36px;
   width: 36px;
 }
 
-.c19 path {
+.c23 path {
   stroke: #CECECE;
   background: #7D7D7D;
   fill: #CECECE;
 }
 
-.c20 {
+.c24 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
 
-.c16 {
+.c20 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -805,7 +939,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   left: 0;
 }
 
-.c8 {
+.c12 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -815,15 +949,15 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c12:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c12:active {
   opacity: 0.4;
 }
 
-.c4 {
+.c9 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -834,21 +968,21 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   font-weight: 500;
 }
 
-.c4:hover {
+.c9:hover {
   opacity: 0.6;
 }
 
-.c4:active {
+.c9:active {
   opacity: 0.4;
 }
 
-.c21 {
+.c25 {
   width: 100%;
   height: 1px;
   background-color: #22222212;
 }
 
-.c26 {
+.c30 {
   padding: 16px;
   width: 100%;
   line-height: 24px;
@@ -887,25 +1021,25 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   transform: perspective(1px) translateZ(0);
 }
 
-.c26:disabled {
+.c30:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c26 > * {
+.c30 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c26 > a {
+.c30 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c27 {
+.c31 {
   background-color: #FC72FF;
   font-size: 20px;
   font-weight: 535;
@@ -913,21 +1047,21 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   color: #FFFFFF;
 }
 
-.c27:focus {
+.c31:focus {
   box-shadow: 0 0 0 1pt #fb58ff;
   background-color: #fb58ff;
 }
 
-.c27:hover {
+.c31:hover {
   background-color: #fb58ff;
 }
 
-.c27:active {
+.c31:active {
   box-shadow: 0 0 0 1pt #fb3fff;
   background-color: #fb3fff;
 }
 
-.c27:disabled {
+.c31:disabled {
   background-color: #22222212;
   color: #7D7D7D;
   cursor: auto;
@@ -936,6 +1070,30 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   outline: none;
 }
 
+.c10 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c10:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c10:hover path {
+  fill: #222222;
+}
+
 .c0 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -951,7 +1109,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   gap: 12px;
 }
 
-.c9 {
+.c14 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -965,7 +1123,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   justify-content: flex-start;
 }
 
-.c11 {
+.c16 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -980,7 +1138,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   gap: 24px;
 }
 
-.c13 {
+.c18 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1003,30 +1161,6 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   align-items: center;
 }
 
-.c5 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c5:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c5:hover path {
-  fill: #222222;
-}
-
 .c2 {
   background-color: #FFFFFF;
   border-radius: 20px;
@@ -1035,11 +1169,23 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   padding: 8px;
 }
 
-.c3 {
-  padding: 8px 12px 4px;
+.c13 {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
 }
 
-.c10 {
+.c13:hover {
+  opacity: 0.6;
+}
+
+.c13:active {
+  opacity: 0.4;
+}
+
+.c15 {
   width: 100%;
   padding: 12px 16px;
   gap: 16px;
@@ -1062,29 +1208,29 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
   data-testid="send-review-modal"
 >
   <div
-    class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c3"
+    class="c3 c4"
+    width="100%"
   >
     <div
-      class="_display-flex _alignItems-stretch _flexDirection-column _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0"
+      class="c5 c6"
     >
-      <span
-        class="font_body _fontFamily-299667014 _display-inline _boxSizing-border-box _wordWrap-break-word _whiteSpace-pre-wrap _mt-0px _mr-0px _mb-0px _ml-0px _color-843134974 _fontSize-16px _lineHeight-24px _fontWeight-400"
-        data-disable-theme="true"
+      <div
+        class="c7 css-n8z49y"
       >
         Review send
-      </span>
+      </div>
     </div>
     <div
-      class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+      class="c5 c8"
     >
       <a
-        class="c4 c5"
+        class="c9 c10"
         href="https://support.uniswap.org/hc/en-us"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c6 c7"
+          class="c5 c11"
         >
           <svg
             fill="none"
@@ -1102,7 +1248,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
         </div>
       </a>
       <svg
-        class="c8"
+        class="c12 c13"
         fill="none"
         height="24"
         stroke="currentColor"
@@ -1129,29 +1275,29 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
     </div>
   </div>
   <div
-    class="c9 c10"
+    class="c14 c15"
   >
     <div
-      class="c11"
+      class="c16"
     >
       <div
-        class="c6 c12"
+        class="c5 c17"
       >
         <div
-          class="c13"
+          class="c18"
         >
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             You’re sending
           </div>
           <div
-            class="c15 css-15popx1"
+            class="c7 css-15popx1"
           >
             1.00 DAI
           </div>
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             $100.00
           </div>
@@ -1160,15 +1306,15 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
           style="height: 36px;"
         >
           <div
-            class="c16"
+            class="c20"
           >
             <div
-              class="c17"
+              class="c21"
               size="36"
             >
                
               <img
-                class="c18"
+                class="c22"
                 size="36"
                 src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
               />
@@ -1177,31 +1323,31 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
         </div>
       </div>
       <div
-        class="c6 c12"
+        class="c5 c17"
       >
         <div
-          class="c13"
+          class="c18"
         >
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             To
           </div>
           <div
-            class="c15 css-15popx1"
+            class="c7 css-15popx1"
           >
             <div
-              class="c6 c7"
+              class="c5 c11"
             >
               <div
-                class="c15 css-15popx1"
+                class="c7 css-15popx1"
               >
                 hayden.eth
               </div>
             </div>
           </div>
           <div
-            class="c14 css-1a4qi6e"
+            class="c19 css-1a4qi6e"
           >
             0x9984...9103
           </div>
@@ -1210,7 +1356,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
           style="height: 36px;"
         >
           <svg
-            class="c19 c20"
+            class="c23 c24"
             data-testid="IdenticonLoader"
             fill="#CECECE"
             stroke="#CECECE"
@@ -1231,19 +1377,19 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
       </div>
     </div>
     <div
-      class="c21"
+      class="c25"
     />
     <div
-      class="c22 c12"
+      class="c26 c17"
       width="100%"
     >
       <div
-        class="c14 css-1a4qi6e"
+        class="c19 css-1a4qi6e"
       >
         Network cost
       </div>
       <div
-        class="c23 c24"
+        class="c27 c28"
         width="min-content"
       >
         <img
@@ -1255,7 +1401,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
           width="16px"
         />
         <div
-          class="c15 css-142zc9n"
+          class="c7 css-142zc9n"
         >
           -
         </div>
@@ -1263,7 +1409,7 @@ exports[`SendCurrencyInputform should render input in token amount correctly 1`]
     </div>
   </div>
   <button
-    class="c25 c26 c27"
+    class="c29 c30 c31"
   >
     Confirm send
   </button>
diff --git a/apps/web/src/pages/Swap/Send/__snapshots__/SmartContractSpeedbump.test.tsx.snap b/apps/web/src/pages/Swap/Send/__snapshots__/SmartContractSpeedbump.test.tsx.snap
index d3a37e1a813..c4443fcd018 100644
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SmartContractSpeedbump.test.tsx.snap
+++ b/apps/web/src/pages/Swap/Send/__snapshots__/SmartContractSpeedbump.test.tsx.snap
@@ -1,13 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
-.c8 {
+.c5 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
+  width: 100%;
+  padding: 4px 0px;
 }
 
 .c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+}
+
+.c6 {
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 0;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: end;
+  -ms-flex-pack: end;
+  justify-content: end;
+  padding: 4px 0px;
+  gap: 10px;
+}
+
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -25,7 +52,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   gap: 4px;
 }
 
-.c20 {
+.c21 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -43,7 +70,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   gap: 12px;
 }
 
-.c16 {
+.c17 {
   color: #222222;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -51,7 +78,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c18 {
+.c19 {
   color: #7D7D7D;
   -webkit-letter-spacing: -0.01em;
   -moz-letter-spacing: -0.01em;
@@ -59,7 +86,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   letter-spacing: -0.01em;
 }
 
-.c10 {
+.c11 {
   color: #222222;
   cursor: pointer;
   -webkit-text-decoration: none;
@@ -69,15 +96,15 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   transition-duration: 125ms;
 }
 
-.c10:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c10:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c6 {
+.c7 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -88,15 +115,15 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   font-weight: 500;
 }
 
-.c6:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c6:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c24 {
+.c25 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -110,7 +137,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   width: 100%;
 }
 
-.c21 {
+.c22 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -145,29 +172,53 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   user-select: none;
 }
 
-.c21:active .c23 {
+.c22:active .c24 {
   background-color: #B8C0DC3d;
 }
 
-.c21:focus .c23 {
+.c22:focus .c24 {
   background-color: #B8C0DC3d;
 }
 
-.c21:hover .c23 {
+.c22:hover .c24 {
   background-color: #98A1C014;
 }
 
-.c21:disabled {
+.c22:disabled {
   cursor: default;
   opacity: 0.6;
 }
 
-.c21:disabled:active .c23,
-.c21:disabled:focus .c23,
-.c21:disabled:hover .c23 {
+.c22:disabled:active .c24,
+.c22:disabled:focus .c24,
+.c22:disabled:hover .c24 {
   background-color: transparent;
 }
 
+.c8 {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  border-radius: 16px;
+  padding: 4px 8px;
+  font-size: 14px;
+  font-weight: 485;
+  line-height: 20px;
+  background: #F9F9F9;
+  color: #7D7D7D;
+  stroke: none;
+}
+
+.c8:hover {
+  background: #22222212;
+  color: #222222;
+  opacity: unset;
+}
+
+.c8:hover path {
+  fill: #222222;
+}
+
 .c2 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -183,7 +234,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   gap: 24px;
 }
 
-.c11 {
+.c12 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -198,7 +249,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   gap: 16px;
 }
 
-.c15 {
+.c16 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -264,30 +315,6 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   border-radius: 20px;
 }
 
-.c7 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 8px;
-  font-size: 14px;
-  font-weight: 485;
-  line-height: 20px;
-  background: #F9F9F9;
-  color: #7D7D7D;
-  stroke: none;
-}
-
-.c7:hover {
-  background: #22222212;
-  color: #222222;
-  opacity: unset;
-}
-
-.c7:hover path {
-  fill: #222222;
-}
-
 .c4 {
   background-color: #FFFFFF;
   outline: 1px solid #22222212;
@@ -296,7 +323,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   width: 100%;
 }
 
-.c12 {
+.c13 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -315,14 +342,14 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   border-radius: 12px;
 }
 
-.c17 {
+.c18 {
   font-size: 24px;
   line-height: 32px;
   text-align: center;
   font-weight: 500;
 }
 
-.c19 {
+.c20 {
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
@@ -333,7 +360,7 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   text-align: center;
 }
 
-.c22 {
+.c23 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -346,21 +373,17 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
   border-radius: 12px;
 }
 
-.c5 {
-  padding: 4px 0px;
-}
-
-.c13 {
+.c14 {
   height: 28px;
   width: 28px;
 }
 
-.c13 path {
+.c14 path {
   background: #7D7D7D;
   fill: #7D7D7D;
 }
 
-.c14 path {
+.c15 path {
   fill: #7D7D7D;
 }
 
@@ -434,74 +457,71 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
               class="c2 c3 c4"
             >
               <div
-                class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-0 _justifyContent-441309761 _alignItems-center _gap-1481558307 _width-10037 c5"
+                class="c5 c6"
+                width="100%"
               >
-                <div
-                  class="_display-flex _flexDirection-row _flexBasis-auto _boxSizing-border-box _position-relative _minHeight-0px _minWidth-0px _flexShrink-1 _flexGrow-1 _justifyContent-flex-end _alignItems-center _gap-10px"
+                <a
+                  class="c7 c8"
+                  href="https://support.uniswap.org/hc/en-us"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  <a
-                    class="c6 c7"
-                    href="https://support.uniswap.org/hc/en-us"
-                    rel="noopener noreferrer"
-                    target="_blank"
+                  <div
+                    class="c9 c10"
                   >
-                    <div
-                      class="c8 c9"
+                    <svg
+                      fill="none"
+                      height="16"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <svg
-                        fill="none"
-                        height="16"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
-                          fill="#9B9B9B"
-                        />
-                      </svg>
-                      Get help
-                    </div>
-                  </a>
-                  <svg
-                    class="c10"
-                    data-testid="Dialog-closeButton"
-                    fill="none"
-                    height="24"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <line
-                      x1="18"
-                      x2="6"
-                      y1="6"
-                      y2="18"
-                    />
-                    <line
-                      x1="6"
-                      x2="18"
-                      y1="6"
-                      y2="18"
-                    />
-                  </svg>
-                </div>
+                      <path
+                        d="M11.3066 8.66699C11.7132 8.66699 12.0533 8.77366 12.3333 8.94033C12.5626 8.80633 12.8332 8.70966 13.1466 8.67766C13.2506 8.667 13.3333 8.58633 13.3333 8.48233V4.66699C13.3333 3.33366 12.6666 2.66699 11.3333 2.66699H3.33325C1.99992 2.66699 1.33325 3.33366 1.33325 4.66699V10.667C1.33325 12.0003 1.99992 12.667 3.33325 12.667H9.06665C9.25132 12.667 9.29996 12.5023 9.26196 12.4163C9.1733 12.213 9.10664 11.997 9.05998 11.767C8.89331 10.8937 9.0733 10.0603 9.5533 9.46699C9.9733 8.95366 10.5932 8.66699 11.3066 8.66699ZM8.01929 8.11966C7.81395 8.26899 7.57325 8.34366 7.33325 8.34366C7.09325 8.34366 6.85188 8.26899 6.64722 8.12032L3.37264 5.73832C3.14931 5.57632 3.09995 5.263 3.26261 5.03966C3.42461 4.81766 3.73585 4.76632 3.96118 4.92966L7.23592 7.31099C7.29459 7.35299 7.37257 7.35366 7.43123 7.31099L10.706 4.92966C10.9306 4.76632 11.2425 4.817 11.4045 5.03966C11.5672 5.263 11.5178 5.57565 11.2945 5.73832L8.01929 8.11966ZM14.6252 11.5697C14.3212 13.1117 12.3359 14.0003 12.3359 14.0003C12.3359 14.0003 10.3506 13.1123 10.0466 11.5697C9.85996 10.6237 10.2679 9.67166 11.3046 9.66699C12.0766 9.66366 12.3359 10.429 12.3359 10.429C12.3359 10.429 12.5953 9.66366 13.3673 9.66699C14.4066 9.67166 14.8119 10.6237 14.6252 11.5697Z"
+                        fill="#9B9B9B"
+                      />
+                    </svg>
+                    Get help
+                  </div>
+                </a>
+                <svg
+                  class="c11"
+                  data-testid="Dialog-closeButton"
+                  fill="none"
+                  height="24"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <line
+                    x1="18"
+                    x2="6"
+                    y1="6"
+                    y2="18"
+                  />
+                  <line
+                    x1="6"
+                    x2="18"
+                    y1="6"
+                    y2="18"
+                  />
+                </svg>
               </div>
               <div
                 class="c2 c3"
               >
                 <div
-                  class="c11 c3"
+                  class="c12 c3"
                 >
                   <div
-                    class="c12"
+                    class="c13"
                   >
                     <svg
-                      class="c13 c14"
+                      class="c14 c15"
                       fill="#7D7D7D"
                       viewBox="0 0 28 28"
                       xmlns="http://www.w3.org/2000/svg"
@@ -513,36 +533,36 @@ exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
                     </svg>
                   </div>
                   <div
-                    class="c15 c3"
+                    class="c16 c3"
                   >
                     <div
-                      class="c16 c17 css-4kpdx7"
+                      class="c17 c18 css-4kpdx7"
                     >
                       Is this a wallet address?
                     </div>
                     <div
-                      class="c18 c19 css-1urox24"
+                      class="c19 c20 css-1urox24"
                     >
                       You’re about to send tokens to a special type of address - a smart contract. Double-check it’s the address you intended to send to. If it’s wrong, your tokens could be lost forever.
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c8 c20"
+                  class="c9 c21"
                 >
                   <button
-                    class="c21 c22"
+                    class="c22 c23"
                   >
                     <div
-                      class="c23 c24"
+                      class="c24 c25"
                     />
                     Cancel
                   </button>
                   <button
-                    class="c21 c22"
+                    class="c22 c23"
                   >
                     <div
-                      class="c23 c24"
+                      class="c24 c25"
                     />
                     Continue
                   </button>
diff --git a/apps/web/src/pages/Swap/SwapForm.tsx b/apps/web/src/pages/Swap/SwapForm.tsx
index ebda98bc21a..06f1d1994e5 100644
--- a/apps/web/src/pages/Swap/SwapForm.tsx
+++ b/apps/web/src/pages/Swap/SwapForm.tsx
@@ -34,7 +34,6 @@ import { useUSDPrice } from 'hooks/useUSDPrice'
 import useWrapCallback, { WrapErrorText } from 'hooks/useWrapCallback'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
-import { useTheme } from 'lib/styled-components'
 import { formatSwapQuoteReceivedEventProperties } from 'lib/utils/analytics'
 import { getIsReviewableQuote } from 'pages/Swap'
 import { OutputTaxTooltipBody } from 'pages/Swap/TaxTooltipBody'
@@ -47,6 +46,7 @@ import { InterfaceTrade, RouterPreference, TradeState } from 'state/routing/type
 import { isClassicTrade } from 'state/routing/utils'
 import { useSwapActionHandlers, useSwapAndLimitContext, useSwapContext } from 'state/swap/hooks'
 import { CurrencyState } from 'state/swap/types'
+import { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { maybeLogFirstSwapAction } from 'tracing/swapFlowLoggers'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
diff --git a/apps/web/src/pages/Swap/TaxTooltipBody.tsx b/apps/web/src/pages/Swap/TaxTooltipBody.tsx
index b478d5f5718..f9f79fb6432 100644
--- a/apps/web/src/pages/Swap/TaxTooltipBody.tsx
+++ b/apps/web/src/pages/Swap/TaxTooltipBody.tsx
@@ -1,5 +1,5 @@
 import { Trans } from 'i18n'
-import styled from 'lib/styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 
 const Divider = styled.div`
diff --git a/apps/web/src/pages/Swap/common/shared.tsx b/apps/web/src/pages/Swap/common/shared.tsx
index 0cfd72f3a54..e6c773ac1f3 100644
--- a/apps/web/src/pages/Swap/common/shared.tsx
+++ b/apps/web/src/pages/Swap/common/shared.tsx
@@ -1,7 +1,7 @@
 import { Input, InputProps } from 'components/NumericalInput'
 import Row from 'components/Row'
-import styled, { css } from 'lib/styled-components'
 import { useLayoutEffect, useState } from 'react'
+import styled, { css } from 'styled-components'
 
 const NumericalInputFontStyle = css`
   text-align: left;
diff --git a/apps/web/src/pages/Swap/index.tsx b/apps/web/src/pages/Swap/index.tsx
index c4c0f3896da..4b4bb35723a 100644
--- a/apps/web/src/pages/Swap/index.tsx
+++ b/apps/web/src/pages/Swap/index.tsx
@@ -98,6 +98,7 @@ export function Swap({
 }) {
   const isDark = useIsDarkMode()
   const screenSize = useScreenSize()
+  const { isConnected } = useAccount()
   const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregatorWeb)
 
   return (
@@ -121,7 +122,9 @@ export function Swap({
                 {currentTab === SwapTab.Send && (
                   <SendForm disableTokenInputs={disableTokenInputs} onCurrencyChange={onCurrencyChange} />
                 )}
-                {currentTab === SwapTab.Buy && forAggregatorEnabled && <BuyForm disabled={disableTokenInputs} />}
+                {currentTab === SwapTab.Buy && forAggregatorEnabled && (
+                  <BuyForm disabled={disableTokenInputs || !isConnected} />
+                )}
               </SwapWrapper>
               <NetworkAlert />
             </Flex>
diff --git a/apps/web/src/pages/TokenDetails/index.tsx b/apps/web/src/pages/TokenDetails/index.tsx
index 1c424dc10f0..00b32486305 100644
--- a/apps/web/src/pages/TokenDetails/index.tsx
+++ b/apps/web/src/pages/TokenDetails/index.tsx
@@ -10,7 +10,6 @@ import { getSupportedGraphQlChain, gqlToCurrency } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
 import { useAccount } from 'hooks/useAccount'
 import { useSrcColor } from 'hooks/useColor'
-import { useTheme } from 'lib/styled-components'
 import { LoadedTDPContext, MultiChainMap, PendingTDPContext, TDPProvider } from 'pages/TokenDetails/TDPContext'
 import { getTokenPageDescription, getTokenPageTitle } from 'pages/TokenDetails/utils'
 import { useDynamicMetatags } from 'pages/metatags'
@@ -18,6 +17,7 @@ import { useMemo } from 'react'
 import { Helmet } from 'react-helmet-async/lib/index'
 import { useLocation, useParams } from 'react-router-dom'
 import { formatTokenMetatagTitleName } from 'shared-cloud/metatags'
+import { useTheme } from 'styled-components'
 import { ThemeProvider } from 'theme'
 import { useTokenWebQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { InterfaceChainId, UniverseChainId } from 'uniswap/src/types/chains'
diff --git a/apps/web/src/pages/Vote/Landing.tsx b/apps/web/src/pages/Vote/Landing.tsx
index 7994b9890b2..90d17f8a05d 100644
--- a/apps/web/src/pages/Vote/Landing.tsx
+++ b/apps/web/src/pages/Vote/Landing.tsx
@@ -15,7 +15,6 @@ import { UNI } from 'constants/tokens'
 import { useAccount } from 'hooks/useAccount'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
-import styled, { useTheme } from 'lib/styled-components'
 import { ProposalStatus } from 'pages/Vote/styled'
 import { darken } from 'polished'
 import { useState } from 'react'
@@ -25,6 +24,7 @@ import { useModalIsOpen, useToggleDelegateModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import { useTokenBalance } from 'state/connection/hooks'
 import { ProposalData, ProposalState, useAllProposalData, useUserDelegatee, useUserVotes } from 'state/governance/hooks'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { shortenAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/pages/Vote/VotePage.tsx b/apps/web/src/pages/Vote/VotePage.tsx
index 02b537ed281..a8e9b691882 100644
--- a/apps/web/src/pages/Vote/VotePage.tsx
+++ b/apps/web/src/pages/Vote/VotePage.tsx
@@ -25,7 +25,6 @@ import useCurrentBlockTimestamp from 'hooks/useCurrentBlockTimestamp'
 import { Trans } from 'i18n'
 import JSBI from 'jsbi'
 import useBlockNumber from 'lib/hooks/useBlockNumber'
-import styled from 'lib/styled-components'
 import ms from 'ms'
 import { ProposalStatus } from 'pages/Vote/styled'
 import { useState } from 'react'
@@ -50,6 +49,7 @@ import {
   useUserVotesAsOfBlock,
 } from 'state/governance/hooks'
 import { VoteOption } from 'state/governance/types'
+import styled from 'styled-components'
 import { ExternalLink, StyledInternalLink, ThemedText } from 'theme/components'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { isAddress } from 'utilities/src/addresses'
diff --git a/apps/web/src/pages/Vote/styled.tsx b/apps/web/src/pages/Vote/styled.tsx
index 446509cb6a7..e0334b3af97 100644
--- a/apps/web/src/pages/Vote/styled.tsx
+++ b/apps/web/src/pages/Vote/styled.tsx
@@ -1,6 +1,6 @@
 import { Trans } from 'i18n'
-import styled, { DefaultTheme } from 'lib/styled-components'
 import { ProposalState } from 'state/governance/hooks'
+import styled, { DefaultTheme } from 'styled-components'
 
 const handleColorType = (status: ProposalState, theme: DefaultTheme) => {
   switch (status) {
diff --git a/apps/web/src/pages/paths.test.ts b/apps/web/src/pages/paths.test.ts
index 4fd81072cb3..6404d80af15 100644
--- a/apps/web/src/pages/paths.test.ts
+++ b/apps/web/src/pages/paths.test.ts
@@ -77,7 +77,7 @@ describe('positionPage static titles and descriptions', () => {
 
   it('should return the correct description for v3 pools', () => {
     expect(getPositionPageDescription('/pool/512372?chain=optimism')).toBe(
-      'View your active v3 liquidity positions. Add new positions.',
+      'View your active v3 liquidity positions. Add new positions.'
     )
   })
 
diff --git a/apps/web/src/state/activity/polling/retry.test.ts b/apps/web/src/state/activity/polling/retry.test.ts
index 8d4ec585bf9..70cb48cfd1e 100644
--- a/apps/web/src/state/activity/polling/retry.test.ts
+++ b/apps/web/src/state/activity/polling/retry.test.ts
@@ -13,7 +13,7 @@ describe('retry', () => {
 
   it('fails for non-retryable error', async () => {
     await expect(retry(makeFn(1, 'abc', false), { n: 3, maxWait: 0, minWait: 0 }).promise).rejects.toThrow(
-      'bad failure',
+      'bad failure'
     )
   })
 
diff --git a/apps/web/src/state/activity/polling/transactions.test.ts b/apps/web/src/state/activity/polling/transactions.test.ts
index 748e1d7b927..fa02a8237e7 100644
--- a/apps/web/src/state/activity/polling/transactions.test.ts
+++ b/apps/web/src/state/activity/polling/transactions.test.ts
@@ -13,22 +13,22 @@ describe('transactions updater', () => {
     })
     it('returns false if checked in last 3 blocks and greater than 20 minutes old', () => {
       expect(shouldCheck(10, { addedTime: new Date().getTime() - 21 * 60 * 1000, lastCheckedBlockNumber: 8 })).toEqual(
-        false,
+        false
       )
     })
     it('returns true if not checked in last 5 blocks and greater than 20 minutes old', () => {
       expect(shouldCheck(10, { addedTime: new Date().getTime() - 21 * 60 * 1000, lastCheckedBlockNumber: 5 })).toEqual(
-        true,
+        true
       )
     })
     it('returns false if checked in last 10 blocks and greater than 60 minutes old', () => {
       expect(shouldCheck(20, { addedTime: new Date().getTime() - 61 * 60 * 1000, lastCheckedBlockNumber: 11 })).toEqual(
-        false,
+        false
       )
     })
     it('returns true if checked in last 3 blocks and greater than 20 minutes old', () => {
       expect(shouldCheck(20, { addedTime: new Date().getTime() - 61 * 60 * 1000, lastCheckedBlockNumber: 10 })).toEqual(
-        true,
+        true
       )
     })
   })
diff --git a/apps/web/src/state/activity/updater.tsx b/apps/web/src/state/activity/updater.tsx
index c6d082a51f3..370dcf039c4 100644
--- a/apps/web/src/state/activity/updater.tsx
+++ b/apps/web/src/state/activity/updater.tsx
@@ -14,8 +14,8 @@ import { TransactionType } from 'state/transactions/types'
 import { logSwapSuccess, logUniswapXSwapSuccess } from 'tracing/swapFlowLoggers'
 import { UniswapXOrderStatus } from 'types/uniswapx'
 import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
+import { isL2ChainId } from 'utils/chains'
 
 export function ActivityStateUpdater() {
   const onActivityUpdate = useOnActivityUpdate()
diff --git a/apps/web/src/state/application/reducer.ts b/apps/web/src/state/application/reducer.ts
index 3047c817c0a..f4c35598b14 100644
--- a/apps/web/src/state/application/reducer.ts
+++ b/apps/web/src/state/application/reducer.ts
@@ -30,8 +30,6 @@ export enum ApplicationModal {
   EXECUTE,
   FEATURE_FLAGS,
   FIAT_ONRAMP,
-  RECEIVE_CRYPTO,
-  RECEIVE_CRYPTO_QR,
   MENU,
   METAMASK_CONNECTION_ERROR,
   NETWORK_SELECTOR,
diff --git a/apps/web/src/state/fiatOnRampTransactions/hooks.ts b/apps/web/src/state/fiatOnRampTransactions/hooks.ts
index 94d1262cb7c..b3c8e8ab30d 100644
--- a/apps/web/src/state/fiatOnRampTransactions/hooks.ts
+++ b/apps/web/src/state/fiatOnRampTransactions/hooks.ts
@@ -1,22 +1,8 @@
-import { useAccount } from 'hooks/useAccount'
-import { useCallback, useMemo } from 'react'
+import { useCallback } from 'react'
 import { useDispatch } from 'react-redux'
 import { FiatOnRampTransactionDetails, addFiatOnRampTransaction } from 'state/fiatOnRampTransactions/reducer'
-import { useAppSelector } from 'state/hooks'
 
 export function useAddFiatOnRampTransaction() {
   const dispatch = useDispatch()
   return useCallback((payload: FiatOnRampTransactionDetails) => dispatch(addFiatOnRampTransaction(payload)), [dispatch])
 }
-
-export function useFiatOnRampTransactions() {
-  const account = useAccount()
-  const fiatOnRampTransactions = useAppSelector((state) => state.fiatOnRampTransactions)
-  return useMemo(() => {
-    // Only compute the transactions if there's a valid account address
-    if (!account.address || !fiatOnRampTransactions[account.address]) {
-      return {}
-    }
-    return fiatOnRampTransactions[account.address]
-  }, [account.address, fiatOnRampTransactions])
-}
diff --git a/apps/web/src/state/fiatOnRampTransactions/reducer.test.ts b/apps/web/src/state/fiatOnRampTransactions/reducer.test.ts
index 73af8a64a97..6a6952fa186 100644
--- a/apps/web/src/state/fiatOnRampTransactions/reducer.test.ts
+++ b/apps/web/src/state/fiatOnRampTransactions/reducer.test.ts
@@ -2,10 +2,10 @@ import { createStore, Store } from 'redux'
 import reducer, {
   addFiatOnRampTransaction,
   FiatOnRampTransactionDetails,
-  FiatOnRampTransactionsState,
   initialState,
-  removeFiatOnRampTransaction,
+  FiatOnRampTransactionsState,
   updateFiatOnRampTransaction,
+  removeFiatOnRampTransaction,
 } from 'state/fiatOnRampTransactions/reducer'
 import { FiatOnRampTransactionStatus, FiatOnRampTransactionType } from 'state/fiatOnRampTransactions/types'
 
@@ -17,9 +17,7 @@ const transaction: FiatOnRampTransactionDetails = {
   status: FiatOnRampTransactionStatus.INITIATED,
   forceFetched: false,
   addedAt: 1001,
-  type: FiatOnRampTransactionType.BUY,
-  syncedWithBackend: false,
-  provider: 'COINBASE_PAY',
+  type: FiatOnRampTransactionType.BUY
 }
 
 describe('fiatOnRampTransactions reducer', () => {
@@ -65,9 +63,7 @@ describe('fiatOnRampTransactions reducer', () => {
         },
       })
 
-      expect(() =>
-        store.dispatch(updateFiatOnRampTransaction({ ...transaction, externalSessionId: 'non existent id' })),
-      ).toThrow()
+      expect(() => store.dispatch(updateFiatOnRampTransaction({ ...transaction, externalSessionId: 'non existent id' }))).toThrow()
     })
   })
 
diff --git a/apps/web/src/state/fiatOnRampTransactions/reducer.ts b/apps/web/src/state/fiatOnRampTransactions/reducer.ts
index 9b0637d3150..bd838091d7d 100644
--- a/apps/web/src/state/fiatOnRampTransactions/reducer.ts
+++ b/apps/web/src/state/fiatOnRampTransactions/reducer.ts
@@ -8,8 +8,6 @@ export type FiatOnRampTransactionDetails = {
   forceFetched: boolean
   addedAt: number
   type: FiatOnRampTransactionType
-  syncedWithBackend: boolean
-  provider: string
 }
 
 export interface FiatOnRampTransactionsState {
@@ -34,7 +32,7 @@ const fiatOnRampTransactionsSlice = createSlice({
     },
     updateFiatOnRampTransaction(fiatOnRampTransactions, { payload }: { payload: FiatOnRampTransactionDetails }) {
       if (!fiatOnRampTransactions[payload.account]?.[payload.externalSessionId]) {
-        throw Error('Attempted to update non-existent FOR transaction.')
+        throw Error('Attempted to update non-existent signature.')
       }
 
       fiatOnRampTransactions[payload.account][payload.externalSessionId] = payload
diff --git a/apps/web/src/state/fiatOnRampTransactions/types.ts b/apps/web/src/state/fiatOnRampTransactions/types.ts
index fa36557bf9b..3a0d40e1759 100644
--- a/apps/web/src/state/fiatOnRampTransactions/types.ts
+++ b/apps/web/src/state/fiatOnRampTransactions/types.ts
@@ -1,21 +1,7 @@
-import { TransactionStatus } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-
 export enum FiatOnRampTransactionStatus {
   INITIATED = 'INITIATED',
   PENDING = 'PENDING',
   COMPLETE = 'COMPLETE',
-  FAILED = 'FAILED',
-}
-
-export function backendStatusToFiatOnRampStatus(status: TransactionStatus) {
-  switch (status) {
-    case TransactionStatus.Confirmed:
-      return FiatOnRampTransactionStatus.COMPLETE
-    case TransactionStatus.Pending:
-      return FiatOnRampTransactionStatus.PENDING
-    case TransactionStatus.Failed:
-      return FiatOnRampTransactionStatus.FAILED
-  }
 }
 
 export enum FiatOnRampTransactionType {
diff --git a/apps/web/src/state/fiatOnRampTransactions/updater.test.tsx b/apps/web/src/state/fiatOnRampTransactions/updater.test.tsx
deleted file mode 100644
index 1c41ac301f4..00000000000
--- a/apps/web/src/state/fiatOnRampTransactions/updater.test.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { useFiatOnRampTransactions } from 'state/fiatOnRampTransactions/hooks'
-import { FiatOnRampTransactionStatus, FiatOnRampTransactionType } from 'state/fiatOnRampTransactions/types'
-import Updater from 'state/fiatOnRampTransactions/updater'
-import { mocked } from 'test-utils/mocked'
-import { act, render } from 'test-utils/render'
-
-const dispatchMock = jest.fn()
-jest.mock('state/hooks', () => ({
-  ...jest.requireActual('state/hooks'),
-  useAppDispatch: () => dispatchMock,
-}))
-jest.mock('state/fiatOnRampTransactions/hooks')
-
-describe('FiatOnRampTransactions Updater', () => {
-  beforeEach(() => {
-    mocked(useFiatOnRampTransactions).mockReturnValue({
-      '123': {
-        account: '0x123',
-        externalSessionId: '123',
-        status: FiatOnRampTransactionStatus.INITIATED,
-        forceFetched: false,
-        addedAt: Date.now(),
-        type: FiatOnRampTransactionType.BUY,
-        syncedWithBackend: false,
-        provider: 'COINBASE_PAY',
-      },
-      '234': {
-        account: '0x123',
-        externalSessionId: '234',
-        status: FiatOnRampTransactionStatus.INITIATED,
-        forceFetched: false,
-        addedAt: Date.now(),
-        type: FiatOnRampTransactionType.BUY,
-        syncedWithBackend: false,
-        provider: 'COINBASE_PAY',
-      },
-      '345': {
-        account: '0x123',
-        externalSessionId: '345',
-        status: FiatOnRampTransactionStatus.INITIATED,
-        forceFetched: true,
-        addedAt: Date.now(),
-        type: FiatOnRampTransactionType.BUY,
-        syncedWithBackend: false,
-        provider: 'COINBASE_PAY',
-      },
-    })
-  })
-
-  it('should fetch /transaction endpoint for each transaction with forceFetch=false', async () => {
-    const fetchSpy = jest
-      .spyOn(window, 'fetch')
-      .mockResolvedValue({ json: jest.fn().mockReturnValue({ transaction: 'test' }) } as any)
-    const { asFragment } = render(<Updater />)
-    await act(async () => {
-      asFragment()
-    })
-    expect(fetchSpy).toHaveBeenCalledTimes(2)
-    expect(dispatchMock).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/apps/web/src/state/fiatOnRampTransactions/updater.ts b/apps/web/src/state/fiatOnRampTransactions/updater.ts
deleted file mode 100644
index 60ccbce257c..00000000000
--- a/apps/web/src/state/fiatOnRampTransactions/updater.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import useInterval from 'lib/hooks/useInterval'
-import ms from 'ms'
-import { useEffect } from 'react'
-import { useFiatOnRampTransactions } from 'state/fiatOnRampTransactions/hooks'
-import { removeFiatOnRampTransaction, updateFiatOnRampTransaction } from 'state/fiatOnRampTransactions/reducer'
-import { FiatOnRampTransactionStatus, backendStatusToFiatOnRampStatus } from 'state/fiatOnRampTransactions/types'
-import { useAppDispatch } from 'state/hooks'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
-import { useActivityWebLazyQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { objectToQueryString } from 'uniswap/src/data/utils'
-import { FOR_API_HEADERS } from 'uniswap/src/features/fiatOnRamp/constants'
-import { FORTransactionRequest } from 'uniswap/src/features/fiatOnRamp/types'
-import { FiatOnRampEventName } from 'uniswap/src/features/telemetry/constants'
-import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { logger } from 'utilities/src/logger/logger'
-
-export default function Updater(): null {
-  const fiatOnRampTransactions = useFiatOnRampTransactions()
-  const dispatch = useAppDispatch()
-  const [, query] = useActivityWebLazyQuery()
-
-  // Polls the fiat on-ramp API for new FOR transactions, until Meld returns a valid result for each.
-  // Once we find this initial record for a transaction, we start polling the GQL ActivityWeb endpoint
-  // to find it and include it in the assetActivities result.
-  // See the useInterval hook in AssetActivityProvider for the polling logic.
-  useInterval(() => {
-    Object.values(fiatOnRampTransactions).forEach(async (transaction) => {
-      if (!transaction.forceFetched) {
-        const requestParams: FORTransactionRequest = {
-          sessionId: transaction.externalSessionId,
-          forceFetch: true,
-        }
-        const result = await fetch(
-          `${uniswapUrls.fiatOnRampApiUrl}/transaction?${objectToQueryString(requestParams)}`,
-          {
-            headers: FOR_API_HEADERS,
-          },
-        )
-        const data = await result.json()
-        if (data?.transaction) {
-          dispatch(updateFiatOnRampTransaction({ ...transaction, forceFetched: true }))
-          sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampTransactionUpdated, {
-            status: FiatOnRampTransactionStatus.PENDING,
-            externalTransactionId: transaction.externalSessionId,
-            serviceProvider: transaction.provider,
-          })
-        } else if (Date.now() - transaction.addedAt > ms('10m')) {
-          dispatch(removeFiatOnRampTransaction(transaction))
-          sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampTransactionUpdated, {
-            status: FiatOnRampTransactionStatus.FAILED,
-            externalTransactionId: transaction.externalSessionId,
-            serviceProvider: transaction.provider,
-          })
-        }
-      }
-    })
-  }, ms('30s'))
-
-  // Triggers when the ActivityWeb query result changes, and updates the local status.
-  // Once all FOR transactions are syncedWithBackend, we stop polling the GQL server for updates.
-  // See the useInterval hook in AssetActivityProvider for the polling logic.
-  useEffect(() => {
-    query.data?.portfolios?.[0]?.assetActivities?.forEach((activity) => {
-      if (
-        activity?.details?.__typename === 'TransactionDetails' &&
-        activity?.details?.type === 'ON_RAMP' &&
-        activity.details.assetChanges.length > 0
-      ) {
-        const assetChange = activity.details.assetChanges[0]
-        if (assetChange?.__typename !== 'OnRampTransfer') {
-          logger.error('Unexpected asset change type, expected OnRampTransfer', {
-            tags: {
-              file: 'AssetActivityProvider',
-              function: 'useInterval',
-            },
-          })
-          return
-        }
-        const transaction = fiatOnRampTransactions[assetChange.externalSessionId]
-        if (transaction) {
-          dispatch(
-            updateFiatOnRampTransaction({
-              ...transaction,
-              syncedWithBackend: true,
-              status: backendStatusToFiatOnRampStatus(activity.details.status),
-            }),
-          )
-          sendAnalyticsEvent(FiatOnRampEventName.FiatOnRampTransactionUpdated, {
-            status: backendStatusToFiatOnRampStatus(activity.details.status),
-            externalTransactionId: transaction.externalSessionId,
-            serviceProvider: transaction.provider,
-          })
-        }
-      }
-    })
-  }, [dispatch, fiatOnRampTransactions, query.data?.portfolios])
-
-  return null
-}
diff --git a/apps/web/src/state/lists/reducer.test.ts b/apps/web/src/state/lists/reducer.test.ts
index 8ceea5d01ae..c5ad5a444f9 100644
--- a/apps/web/src/state/lists/reducer.test.ts
+++ b/apps/web/src/state/lists/reducer.test.ts
@@ -80,7 +80,7 @@ describe('list reducer', () => {
     describe('fulfilled', () => {
       it('saves the list', () => {
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         expect(store.getState()).toEqual({
           byUrl: {
@@ -97,10 +97,10 @@ describe('list reducer', () => {
 
       it('does not save the list in pending if current is same', () => {
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         expect(store.getState()).toEqual({
           byUrl: {
@@ -117,10 +117,10 @@ describe('list reducer', () => {
 
       it('does not save to current if list is newer patch version', () => {
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: PATCHED_STUB_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: PATCHED_STUB_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         expect(store.getState()).toEqual({
           byUrl: {
@@ -136,10 +136,10 @@ describe('list reducer', () => {
       })
       it('does not save to current if list is newer minor version', () => {
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: MINOR_UPDATED_STUB_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: MINOR_UPDATED_STUB_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         expect(store.getState()).toEqual({
           byUrl: {
@@ -155,10 +155,10 @@ describe('list reducer', () => {
       })
       it('does not save to pending if list is newer major version', () => {
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: STUB_TOKEN_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         store.dispatch(
-          fetchTokenList.fulfilled({ tokenList: MAJOR_UPDATED_STUB_LIST, requestId: 'request-id', url: 'fake-url' }),
+          fetchTokenList.fulfilled({ tokenList: MAJOR_UPDATED_STUB_LIST, requestId: 'request-id', url: 'fake-url' })
         )
         expect(store.getState()).toEqual({
           byUrl: {
@@ -321,7 +321,7 @@ describe('list reducer', () => {
 
       it('clears the current lists', () => {
         expect(
-          store.getState().byUrl['https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json'],
+          store.getState().byUrl['https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json']
         ).toBeUndefined()
         expect(store.getState().byUrl['https://unpkg.com/@uniswap/default-token-list@latest']).toBeUndefined()
       })
@@ -362,7 +362,7 @@ describe('list reducer', () => {
 
       it('does not remove lists not in last initialized list of lists', () => {
         expect(
-          store.getState().byUrl['https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json'],
+          store.getState().byUrl['https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json']
         ).toEqual({
           error: null,
           current: STUB_TOKEN_LIST,
@@ -379,7 +379,7 @@ describe('list reducer', () => {
         Object.entries(byUrl)
           // We don't expect the Uniswap default list to be prepopulated
           .filter(
-            ([url]) => url !== 'https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json',
+            ([url]) => url !== 'https://unpkg.com/@uniswap/default-token-list@latest/uniswap-default.tokenlist.json'
           )
           .forEach(([, state]) => {
             expect(state).toEqual({
diff --git a/apps/web/src/state/migrations.test.ts b/apps/web/src/state/migrations.test.ts
index 1247c0ea4aa..9755c31bccf 100644
--- a/apps/web/src/state/migrations.test.ts
+++ b/apps/web/src/state/migrations.test.ts
@@ -68,11 +68,11 @@ describe('redux migrations', () => {
   it('clears legacy redux_localstorage_simple values during the initial migration', async () => {
     localStorage.setItem(
       'redux_localstorage_simple_transactions',
-      JSON.stringify({ 1: { test: { info: 'transactions' } } }),
+      JSON.stringify({ 1: { test: { info: 'transactions' } } })
     )
     localStorage.setItem(
       'redux_localstorage_simple_user',
-      JSON.stringify({ test: 'user', userRouterPreference: 'auto' }),
+      JSON.stringify({ test: 'user', userRouterPreference: 'auto' })
     )
     localStorage.setItem('redux_localstorage_simple_lists', JSON.stringify({ test: 'lists' }))
     localStorage.setItem('redux_localstorage_simple_signatures', JSON.stringify({ test: 'signatures' }))
@@ -126,7 +126,7 @@ describe('redux migrations', () => {
         lists: initialListsState,
         signatures: initialSignaturesState,
         _persist: { version: -1 },
-      }),
+      })
     )
 
     persistStore(store)
diff --git a/apps/web/src/state/migrations/1.test.ts b/apps/web/src/state/migrations/1.test.ts
index be89f3eadeb..f41448e32a3 100644
--- a/apps/web/src/state/migrations/1.test.ts
+++ b/apps/web/src/state/migrations/1.test.ts
@@ -27,7 +27,7 @@ describe('migration to v1', () => {
       {
         1: migration1,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 1)
     expect(result?.user?.userDeadline).toEqual(600)
@@ -48,7 +48,7 @@ describe('migration to v1', () => {
       {
         1: migration1,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
@@ -58,7 +58,7 @@ describe('migration to v1', () => {
           userDeadline: 300,
         },
       } as PersistAppStateV1,
-      1,
+      1
     )
     expect(result?.user?.userDeadline).toEqual(300)
   })
@@ -68,14 +68,14 @@ describe('migration to v1', () => {
       {
         1: migration1,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
         ...previousState,
         user: undefined,
       } as PersistAppStateV1,
-      1,
+      1
     )
     expect(result?.user?.userDeadline).toBeUndefined()
   })
diff --git a/apps/web/src/state/migrations/11.test.ts b/apps/web/src/state/migrations/11.test.ts
index 7884bd99383..bef6be33b2b 100644
--- a/apps/web/src/state/migrations/11.test.ts
+++ b/apps/web/src/state/migrations/11.test.ts
@@ -62,7 +62,7 @@ describe('migration to v10', () => {
         10: migration10,
         11: migration11,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousStateWithMeta, 11)
 
@@ -84,7 +84,7 @@ describe('migration to v10', () => {
         10: migration10,
         11: migration11,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousStateWithoutMeta, 11)
     expect(Object.keys(result.user)).not.toContain('recentConnectionMeta')
diff --git a/apps/web/src/state/migrations/12.test.ts b/apps/web/src/state/migrations/12.test.ts
index 99019413054..5b880e34583 100644
--- a/apps/web/src/state/migrations/12.test.ts
+++ b/apps/web/src/state/migrations/12.test.ts
@@ -124,7 +124,7 @@ describe('migration to v12', () => {
         11: migration11,
         12: migration12,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 12)
     expect(result.transactions).toMatchObject(newTransactionState)
diff --git a/apps/web/src/state/migrations/2.test.ts b/apps/web/src/state/migrations/2.test.ts
index 738a21c32ae..ae5d78309b6 100644
--- a/apps/web/src/state/migrations/2.test.ts
+++ b/apps/web/src/state/migrations/2.test.ts
@@ -30,7 +30,7 @@ describe('migration to v2', () => {
         1: migration1,
         2: migration2,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 2)
     expect(result?.user?.userRouterPreference).toEqual(RouterPreference.API)
@@ -43,7 +43,7 @@ describe('migration to v2', () => {
         1: migration1,
         2: migration2,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
@@ -53,7 +53,7 @@ describe('migration to v2', () => {
           userRouterPreference: RouterPreference.X,
         },
       } as PersistAppStateV2,
-      2,
+      2
     )
     expect(result?.user?.userRouterPreference).toEqual(RouterPreference.X)
   })
diff --git a/apps/web/src/state/migrations/3.test.ts b/apps/web/src/state/migrations/3.test.ts
index 8558181b10e..5dd639c090d 100644
--- a/apps/web/src/state/migrations/3.test.ts
+++ b/apps/web/src/state/migrations/3.test.ts
@@ -23,7 +23,7 @@ const previousState: PersistAppStateV3 = {
           '0x7F5c764cBc14f9669B88837ca1490cCa17c31607',
           6,
           'USDC',
-          'USD Coin',
+          'USD Coin'
         ),
       },
       [UniverseChainId.Base]: {
@@ -32,7 +32,7 @@ const previousState: PersistAppStateV3 = {
           '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
           6,
           'USDC',
-          'USD Coin',
+          'USD Coin'
         ),
       },
     },
@@ -53,21 +53,21 @@ describe('migration to v3', () => {
         2: migration2,
         3: migration3,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 3)
     expect(Object.keys(result?.user?.tokens).length).toEqual(2)
     expect(
-      result?.user?.tokens[UniverseChainId.Optimism]?.['0x7F5c764cBc14f9669B88837ca1490cCa17c31607'].symbol,
+      result?.user?.tokens[UniverseChainId.Optimism]?.['0x7F5c764cBc14f9669B88837ca1490cCa17c31607'].symbol
     ).toEqual('USDC.e')
     expect(result?.user?.tokens[UniverseChainId.Optimism]?.['0x7F5c764cBc14f9669B88837ca1490cCa17c31607'].name).toEqual(
-      'Bridged USDC',
+      'Bridged USDC'
     )
     expect(result?.user?.tokens[UniverseChainId.Base]?.['0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA'].symbol).toEqual(
-      'USDbC',
+      'USDbC'
     )
     expect(result?.user?.tokens[UniverseChainId.Base]?.['0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA'].name).toEqual(
-      'USD Base Coin',
+      'USD Base Coin'
     )
 
     expect(result?._persist.version).toEqual(3)
diff --git a/apps/web/src/state/migrations/4.test.ts b/apps/web/src/state/migrations/4.test.ts
index fe5da86992f..b6cb1e1ed0c 100644
--- a/apps/web/src/state/migrations/4.test.ts
+++ b/apps/web/src/state/migrations/4.test.ts
@@ -34,7 +34,7 @@ describe('migration to v4', () => {
         3: migration3,
         4: migration4,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 4)
     expect(result.user.userLocale).toEqual(DEFAULT_LOCALE)
diff --git a/apps/web/src/state/migrations/5.test.ts b/apps/web/src/state/migrations/5.test.ts
index ed53d8c5b04..8d7289476da 100644
--- a/apps/web/src/state/migrations/5.test.ts
+++ b/apps/web/src/state/migrations/5.test.ts
@@ -37,7 +37,7 @@ describe('migration to v5', () => {
         4: migration4,
         5: migration5,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 5)
     expect(result?.user?.userRouterPreference).toEqual(RouterPreference.X)
@@ -55,7 +55,7 @@ describe('migration to v5', () => {
         4: migration4,
         5: migration5,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
@@ -65,7 +65,7 @@ describe('migration to v5', () => {
           optedOutOfUniswapX: true,
         },
       } as PersistAppStateV5,
-      5,
+      5
     )
     expect(result?.user?.userRouterPreference).toEqual(RouterPreference.API)
     expect(result?.user?.optedOutOfUniswapX).toBeUndefined()
@@ -81,14 +81,14 @@ describe('migration to v5', () => {
         4: migration4,
         5: migration5,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
         ...previousState,
         user: undefined,
       } as PersistAppStateV5,
-      5,
+      5
     )
     expect(result?.user).toBeUndefined()
     expect(result?._persist.version).toEqual(5)
diff --git a/apps/web/src/state/migrations/6.test.ts b/apps/web/src/state/migrations/6.test.ts
index 4c0484a9f65..ede2cfa7616 100644
--- a/apps/web/src/state/migrations/6.test.ts
+++ b/apps/web/src/state/migrations/6.test.ts
@@ -53,7 +53,7 @@ describe('migration to v6', () => {
         5: migration5,
         6: migration6,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousStateUnselected, 6)
     expect(Object.keys(result)).not.toContain('selectedWallet')
@@ -70,7 +70,7 @@ describe('migration to v6', () => {
         5: migration5,
         6: migration6,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousStateSelected, 6)
     expect(Object.keys(result)).not.toContain('selectedWallet')
diff --git a/apps/web/src/state/migrations/7.test.ts b/apps/web/src/state/migrations/7.test.ts
index 643301189fb..665bd495570 100644
--- a/apps/web/src/state/migrations/7.test.ts
+++ b/apps/web/src/state/migrations/7.test.ts
@@ -40,7 +40,7 @@ describe('migration to v7', () => {
         6: migration6,
         7: migration7,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 7)
     expect(result?.user?.hideAndroidAnnouncementBanner).toBeUndefined()
@@ -59,7 +59,7 @@ describe('migration to v7', () => {
         6: migration6,
         7: migration7,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
@@ -69,7 +69,7 @@ describe('migration to v7', () => {
           hideAndroidAnnouncementBanner: true,
         },
       } as PersistAppStateV7,
-      7,
+      7
     )
     expect(result?.user?.hideAppPromoBanner).toEqual(true)
     expect(result?.user?.hideAndroidAnnouncementBanner).toBeUndefined()
@@ -87,14 +87,14 @@ describe('migration to v7', () => {
         6: migration6,
         7: migration7,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
         ...previousState,
         user: undefined,
       } as PersistAppStateV7,
-      7,
+      7
     )
     expect(result?.user).toBeUndefined()
     expect(result?._persist.version).toEqual(7)
diff --git a/apps/web/src/state/migrations/8.test.ts b/apps/web/src/state/migrations/8.test.ts
index f5d3adf772f..8eaca4d7c27 100644
--- a/apps/web/src/state/migrations/8.test.ts
+++ b/apps/web/src/state/migrations/8.test.ts
@@ -42,7 +42,7 @@ describe('migration to v8', () => {
         7: migration7,
         8: migration8,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 8)
     expect(result?.user?.hideAppPromoBanner).toBeUndefined()
@@ -61,14 +61,14 @@ describe('migration to v8', () => {
         7: migration7,
         8: migration8,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(
       {
         ...previousState,
         user: undefined,
       } as PersistAppStateV8,
-      8,
+      8
     )
     expect(result?.user).toBeUndefined()
     expect(result?._persist.version).toEqual(8)
diff --git a/apps/web/src/state/migrations/9.test.ts b/apps/web/src/state/migrations/9.test.ts
index 6503c1d52fb..b366bf997fc 100644
--- a/apps/web/src/state/migrations/9.test.ts
+++ b/apps/web/src/state/migrations/9.test.ts
@@ -66,7 +66,7 @@ describe('migration to v9', () => {
         8: migration8,
         9: migration9,
       },
-      { debug: false },
+      { debug: false }
     )
     const result: any = await migrator(previousState, 9)
     expect(result?.lists?.byUrl?.[COINGECKO_AVAX_LIST]).toBeDefined()
diff --git a/apps/web/src/state/mint/v3/utils.test.ts b/apps/web/src/state/mint/v3/utils.test.ts
index 53adcb3f97c..e05379a36e0 100644
--- a/apps/web/src/state/mint/v3/utils.test.ts
+++ b/apps/web/src/state/mint/v3/utils.test.ts
@@ -28,11 +28,11 @@ describe('hooks', () => {
         tryParsePrice(
           baseToken,
           quoteToken,
-          (2 ** 128).toLocaleString('fullwide', { useGrouping: false }),
-        )?.toSignificant(6),
+          (2 ** 128).toLocaleString('fullwide', { useGrouping: false })
+        )?.toSignificant(6)
       ).toEqual('340282000000000000000000000000000000000')
       expect(
-        tryParsePrice(baseToken, quoteToken, /* ~2^-128 */ '0.000000000000000000000000000587747')?.toSignificant(6),
+        tryParsePrice(baseToken, quoteToken, /* ~2^-128 */ '0.000000000000000000000000000587747')?.toSignificant(6)
       ).toEqual('0.000000000000000000000000000587747')
     })
 
@@ -49,11 +49,11 @@ describe('hooks', () => {
         tryParsePrice(
           baseToken,
           quoteToken,
-          (2 ** 128).toLocaleString('fullwide', { useGrouping: false }),
-        )?.toSignificant(6),
+          (2 ** 128).toLocaleString('fullwide', { useGrouping: false })
+        )?.toSignificant(6)
       ).toEqual('340282000000000000000000000000000000000')
       expect(
-        tryParsePrice(baseToken, quoteToken, /* ~2^-128 */ '0.000000000000000000000000000587747')?.toSignificant(6),
+        tryParsePrice(baseToken, quoteToken, /* ~2^-128 */ '0.000000000000000000000000000587747')?.toSignificant(6)
       ).toEqual('0.000000000000000000000000000587747')
     })
   })
diff --git a/apps/web/src/state/routing/useRoutingAPITrade.test.ts b/apps/web/src/state/routing/useRoutingAPITrade.test.ts
index 578bc2e3829..ef868e2606a 100644
--- a/apps/web/src/state/routing/useRoutingAPITrade.test.ts
+++ b/apps/web/src/state/routing/useRoutingAPITrade.test.ts
@@ -86,7 +86,7 @@ describe('#useRoutingAPITrade ExactIn', () => {
     mocked(useIsWindowVisible).mockReturnValue(false)
 
     const { result } = renderHook(() =>
-      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, RouterPreference.API),
+      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, RouterPreference.API)
     )
 
     expect(useGetQuoteQuery).toHaveBeenCalledWith(skipToken, {
@@ -113,7 +113,7 @@ describe('#useRoutingAPITrade pricing', () => {
     mocked(useIsWindowVisible).mockReturnValue(false)
 
     const { result } = renderHook(() =>
-      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, INTERNAL_ROUTER_PREFERENCE_PRICE),
+      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, INTERNAL_ROUTER_PREFERENCE_PRICE)
     )
 
     expect(useGetQuoteQuery).toHaveBeenCalledWith(skipToken, {
@@ -127,7 +127,7 @@ describe('#useRoutingAPITrade pricing', () => {
     mocked(useIsWindowVisible).mockReturnValue(true)
 
     renderHook(() =>
-      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, INTERNAL_ROUTER_PREFERENCE_PRICE),
+      useRoutingAPITrade(false, TradeType.EXACT_INPUT, USDCAmount, ETH_MAINNET, INTERNAL_ROUTER_PREFERENCE_PRICE)
     )
 
     expect(useGetQuoteQuery).toHaveBeenCalledWith(
@@ -135,7 +135,7 @@ describe('#useRoutingAPITrade pricing', () => {
       {
         pollingInterval: ms(`1m`),
         refetchOnMountOrArgChange: 2 * 60,
-      },
+      }
     )
   })
 })
diff --git a/apps/web/src/state/send/hooks.tsx b/apps/web/src/state/send/hooks.tsx
index 34e51ec5987..8dacbe024d1 100644
--- a/apps/web/src/state/send/hooks.tsx
+++ b/apps/web/src/state/send/hooks.tsx
@@ -86,11 +86,7 @@ export function useDerivedSendInfo(state: SendState): SendInfo {
     useMemo(() => [inputCurrency, nativeCurrency], [inputCurrency, nativeCurrency]),
   )
 
-  const { formattedAmount: exactAmountOut } = useUSDTokenUpdater(
-    inputInFiat,
-    exactAmountToken ?? exactAmountFiat,
-    inputCurrency,
-  )
+  const exactAmountOut = useUSDTokenUpdater(inputInFiat, exactAmountToken ?? exactAmountFiat, inputCurrency)
   const parsedTokenAmount = useMemo(() => {
     return tryParseCurrencyAmount(inputInFiat ? exactAmountOut : exactAmountToken, inputCurrency)
   }, [exactAmountOut, exactAmountToken, inputCurrency, inputInFiat])
diff --git a/apps/web/src/state/swap/hooks.test.ts b/apps/web/src/state/swap/hooks.test.ts
index 2ffff72db91..127a15101cd 100644
--- a/apps/web/src/state/swap/hooks.test.ts
+++ b/apps/web/src/state/swap/hooks.test.ts
@@ -24,9 +24,9 @@ describe('hooks', () => {
         queryParametersToCurrencyState(
           parse(
             '?inputCurrency=ETH&outputCurrency=0x6b175474e89094c44da98b954eedeac495271d0f&exactAmount=20.5&exactField=output',
-            { parseArrays: false, ignoreQueryPrefix: true },
-          ),
-        ),
+            { parseArrays: false, ignoreQueryPrefix: true }
+          )
+        )
       ).toEqual({
         outputCurrencyId: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
         inputCurrencyId: 'ETH',
@@ -38,9 +38,9 @@ describe('hooks', () => {
         queryParametersToCurrencyState(
           parse(
             '?inputCurrency=ETH&outputCurrency=0x6fd9d7ad17242c41f7131d257212c54a0e816691&exactAmount=20.5&exactField=output&chain=optimism',
-            { parseArrays: false, ignoreQueryPrefix: true },
-          ),
-        ),
+            { parseArrays: false, ignoreQueryPrefix: true }
+          )
+        )
       ).toEqual({
         outputCurrencyId: '0x6fd9d7AD17242c41f7131d257212c54A0e816691',
         inputCurrencyId: 'ETH',
@@ -51,8 +51,8 @@ describe('hooks', () => {
     test('does not duplicate eth for invalid output token', () => {
       expect(
         queryParametersToCurrencyState(
-          parse('?outputCurrency=invalid', { parseArrays: false, ignoreQueryPrefix: true }),
-        ),
+          parse('?outputCurrency=invalid', { parseArrays: false, ignoreQueryPrefix: true })
+        )
       ).toEqual({
         inputCurrencyId: undefined,
         outputCurrencyId: undefined,
@@ -62,8 +62,8 @@ describe('hooks', () => {
     test('output ETH only', () => {
       expect(
         queryParametersToCurrencyState(
-          parse('?outputCurrency=eth&exactAmount=20.5', { parseArrays: false, ignoreQueryPrefix: true }),
-        ),
+          parse('?outputCurrency=eth&exactAmount=20.5', { parseArrays: false, ignoreQueryPrefix: true })
+        )
       ).toEqual({
         outputCurrencyId: 'ETH',
         inputCurrencyId: undefined,
@@ -73,8 +73,8 @@ describe('hooks', () => {
     test('output ETH only, lowercase', () => {
       expect(
         queryParametersToCurrencyState(
-          parse('?outputcurrency=eth&exactAmount=20.5', { parseArrays: false, ignoreQueryPrefix: true }),
-        ),
+          parse('?outputcurrency=eth&exactAmount=20.5', { parseArrays: false, ignoreQueryPrefix: true })
+        )
       ).toEqual({
         outputCurrencyId: 'ETH',
         inputCurrencyId: undefined,
@@ -86,8 +86,8 @@ describe('hooks', () => {
     test('currency amounts', () => {
       expect(
         queryParametersToSwapState(
-          parse('?exactAmount=20.5&exactField=output', { parseArrays: false, ignoreQueryPrefix: true }),
-        ),
+          parse('?exactAmount=20.5&exactField=output', { parseArrays: false, ignoreQueryPrefix: true })
+        )
       ).toEqual({
         typedValue: '20.5',
         independentField: Field.OUTPUT,
diff --git a/apps/web/src/state/transactions/reducer.test.ts b/apps/web/src/state/transactions/reducer.test.ts
index 7bf4598a65c..cd3703bc2d7 100644
--- a/apps/web/src/state/transactions/reducer.test.ts
+++ b/apps/web/src/state/transactions/reducer.test.ts
@@ -34,7 +34,7 @@ describe('transaction reducer', () => {
             spender: 'def',
             amount: '10000',
           },
-        }),
+        })
       )
       const txs = store.getState()
       expect(txs[1]).toBeTruthy()
@@ -60,7 +60,7 @@ describe('transaction reducer', () => {
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           status: TransactionStatus.Failed,
-        }),
+        })
       )
       expect(store.getState()).toEqual({})
     })
@@ -77,7 +77,7 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: '0x0',
-        }),
+        })
       )
       const beforeTime = new Date().getTime()
       store.dispatch(
@@ -85,7 +85,7 @@ describe('transaction reducer', () => {
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           status: TransactionStatus.Confirmed,
-        }),
+        })
       )
       const tx = store.getState()[UniverseChainId.Mainnet]?.['0x0'] as ConfirmedTransactionDetails
       expect(tx.status).toBe(TransactionStatus.Confirmed)
@@ -100,7 +100,7 @@ describe('transaction reducer', () => {
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           blockNumber: 1,
-        }),
+        })
       )
       expect(store.getState()).toEqual({})
     })
@@ -117,14 +117,14 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: '0x0',
-        }),
+        })
       )
       store.dispatch(
         checkedTransaction({
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           blockNumber: 1,
-        }),
+        })
       )
       const tx = store.getState()[UniverseChainId.Mainnet]?.['0x0'] as PendingTransactionDetails
       expect(tx.lastCheckedBlockNumber).toEqual(1)
@@ -142,21 +142,21 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: '0x0',
-        }),
+        })
       )
       store.dispatch(
         checkedTransaction({
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           blockNumber: 3,
-        }),
+        })
       )
       store.dispatch(
         checkedTransaction({
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           blockNumber: 1,
-        }),
+        })
       )
       const tx = store.getState()[UniverseChainId.Mainnet]?.['0x0'] as PendingTransactionDetails
       expect(tx.lastCheckedBlockNumber).toEqual(3)
@@ -177,7 +177,7 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: 'abc',
-        }),
+        })
       )
       store.dispatch(
         addTransaction({
@@ -191,7 +191,7 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: 'abc',
-        }),
+        })
       )
       expect(Object.keys(store.getState())).toHaveLength(2)
       expect(Object.keys(store.getState())).toEqual([String(UniverseChainId.Mainnet), String(UniverseChainId.Optimism)])
@@ -219,7 +219,7 @@ describe('transaction reducer', () => {
             amount: '10000',
           },
           from: 'abc',
-        }),
+        })
       )
       const originalTx = store.getState()[UniverseChainId.Mainnet]?.['0x0']
       store.dispatch(
@@ -227,7 +227,7 @@ describe('transaction reducer', () => {
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           cancelHash: '0x1',
-        }),
+        })
       )
       expect(Object.keys(store.getState())).toHaveLength(1)
       expect(Object.keys(store.getState())).toEqual([String(UniverseChainId.Mainnet)])
@@ -243,7 +243,7 @@ describe('transaction reducer', () => {
           chainId: UniverseChainId.Mainnet,
           hash: '0x0',
           cancelHash: '0x1',
-        }),
+        })
       )
       expect(Object.keys(store.getState())).toHaveLength(0)
       expect(Object.keys(store.getState())).toEqual([])
diff --git a/apps/web/src/state/user/hooks.tsx b/apps/web/src/state/user/hooks.tsx
index c5866138665..5b4c0909528 100644
--- a/apps/web/src/state/user/hooks.tsx
+++ b/apps/web/src/state/user/hooks.tsx
@@ -1,6 +1,6 @@
 import { Percent, Token, V2_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
 import { Pair, computePairAddress } from '@uniswap/v2-sdk'
-import { chainIdToBackendChain, useSupportedChainId } from 'constants/chains'
+import { L2_CHAIN_IDS, chainIdToBackendChain, useSupportedChainId } from 'constants/chains'
 import { SupportedLocale } from 'constants/locales'
 import { L2_DEADLINE_FROM_NOW } from 'constants/misc'
 import { BASES_TO_TRACK_LIQUIDITY_FOR, PINNED_PAIRS } from 'constants/routing'
@@ -26,7 +26,6 @@ import {
   TokenSortableField,
   useTopTokensQuery,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { isL2ChainId } from 'uniswap/src/features/chains/utils'
 
 export function useUserLocale(): SupportedLocale | null {
   return useAppSelector((state) => state.user.userLocale)
@@ -133,7 +132,7 @@ export function useUserTransactionTTL(): [number, (slippage: number) => void] {
   const { chainId } = useAccount()
   const dispatch = useAppDispatch()
   const userDeadline = useAppSelector((state) => state.user.userDeadline)
-  const onL2 = isL2ChainId(chainId)
+  const onL2 = Boolean(chainId && L2_CHAIN_IDS.includes(chainId))
   const deadline = onL2 ? L2_DEADLINE_FROM_NOW : userDeadline
 
   const setUserDeadline = useCallback(
diff --git a/apps/web/src/state/user/reducer.test.ts b/apps/web/src/state/user/reducer.test.ts
index dd5f1e7c3eb..7bfaeee75d8 100644
--- a/apps/web/src/state/user/reducer.test.ts
+++ b/apps/web/src/state/user/reducer.test.ts
@@ -79,7 +79,7 @@ describe('swap reducer', () => {
             chainId: 1,
             address: '0x123',
           },
-        }),
+        })
       )
       expect(store.getState().tokens).toEqual({ 1: { '0x123': { address: '0x123', chainId: 1 } } })
     })
@@ -109,7 +109,7 @@ describe('swap reducer', () => {
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 1),
-        }),
+        })
       )
       expect(store.getState().pairs).toEqual({
         1: { '0x123;0x456': buildSerializedPair('0x123', '0x456', 1) },
@@ -120,12 +120,12 @@ describe('swap reducer', () => {
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 1),
-        }),
+        })
       )
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 1),
-        }),
+        })
       )
       expect(store.getState().pairs).toEqual({
         1: { '0x123;0x456': buildSerializedPair('0x123', '0x456', 1) },
@@ -136,12 +136,12 @@ describe('swap reducer', () => {
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 1),
-        }),
+        })
       )
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x789', 1),
-        }),
+        })
       )
       expect(store.getState().pairs).toEqual({
         1: {
@@ -155,12 +155,12 @@ describe('swap reducer', () => {
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 1),
-        }),
+        })
       )
       store.dispatch(
         addSerializedPair({
           serializedPair: buildSerializedPair('0x123', '0x456', 5),
-        }),
+        })
       )
       expect(store.getState().pairs).toEqual({
         1: {
diff --git a/apps/web/src/theme/colors.ts b/apps/web/src/theme/colors.ts
index b326c0a2423..6c0ed7852f4 100644
--- a/apps/web/src/theme/colors.ts
+++ b/apps/web/src/theme/colors.ts
@@ -106,9 +106,7 @@ export const colors = {
   surface1_dark: '#131313',
   surface1_hovered_dark: '#181818',
   surface2_dark: '#1B1B1B',
-  surface2_hovered_dark: '#242424',
   surface3_dark: '#FFFFFF12',
-  surface3_hovered_dark: 'rgba(255, 255, 255, 0.16))',
   surface4_dark: '#FFFFFF20',
   surface5_dark: '#00000004',
   accent1_dark: '#FC72FF',
@@ -120,9 +118,7 @@ export const colors = {
   surface1_light: '#FFFFFF',
   surface1_hovered_light: '#F5F5F5',
   surface2_light: '#F9F9F9',
-  surface2_hovered_light: '#F2F2F2',
   surface3_light: '#22222212',
-  surface3_hovered_light: 'rgba(34, 34, 34, 0.12))',
   surface4_light: '#FFFFFF64',
   surface5_light: '#00000004',
   accent1_light: '#FC72FF',
@@ -182,9 +178,7 @@ export const darkTheme = {
   surface1: colors.surface1_dark,
   surface1Hovered: colors.surface1_hovered_dark,
   surface2: colors.surface2_dark,
-  surface2Hovered: colors.surface2_hovered_dark,
   surface3: colors.surface3_dark,
-  surface3Hovered: colors.surface3_hovered_dark,
   surface4: colors.surface4_dark,
   surface5: colors.surface5_dark,
 
@@ -216,9 +210,7 @@ export const lightTheme: ThemeColors = {
   surface1: colors.surface1_light,
   surface1Hovered: colors.surface1_hovered_light,
   surface2: colors.surface2_light,
-  surface2Hovered: colors.surface2_hovered_light,
   surface3: colors.surface3_light,
-  surface3Hovered: colors.surface3_hovered_light,
   surface4: colors.surface4_light,
   surface5: colors.surface5_light,
 
diff --git a/apps/web/src/theme/components/FadePresence.tsx b/apps/web/src/theme/components/FadePresence.tsx
index 930f1f584cd..44e76393c36 100644
--- a/apps/web/src/theme/components/FadePresence.tsx
+++ b/apps/web/src/theme/components/FadePresence.tsx
@@ -1,6 +1,6 @@
 import { useUnmountingAnimation } from 'hooks/useUnmountingAnimation'
-import styled, { css, keyframes } from 'lib/styled-components'
 import { useRef } from 'react'
+import styled, { css, keyframes } from 'styled-components'
 
 const fadeIn = keyframes`
   from { opacity: 0;}
diff --git a/apps/web/src/theme/components/ThemeToggle.tsx b/apps/web/src/theme/components/ThemeToggle.tsx
index 14f1b076349..22dad735b83 100644
--- a/apps/web/src/theme/components/ThemeToggle.tsx
+++ b/apps/web/src/theme/components/ThemeToggle.tsx
@@ -3,10 +3,10 @@ import PillMultiToggle from 'components/Toggle/PillMultiToggle'
 import { Trans } from 'i18n'
 import { atom, useAtom } from 'jotai'
 import { atomWithStorage, useAtomValue, useUpdateAtom } from 'jotai/utils'
-import styled, { useTheme } from 'lib/styled-components'
 import ms from 'ms'
 import { useCallback, useEffect, useMemo } from 'react'
 import { Moon, Sun } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components/text'
 import { Moon as MoonFilled, Sun as SunFilled } from 'ui/src/components/icons'
 import { addMediaQueryListener, removeMediaQueryListener } from 'utils/matchMedia'
diff --git a/apps/web/src/theme/components/index.tsx b/apps/web/src/theme/components/index.tsx
index d01ffc73089..47ca7b4fd9d 100644
--- a/apps/web/src/theme/components/index.tsx
+++ b/apps/web/src/theme/components/index.tsx
@@ -2,12 +2,11 @@ import { ReactComponent as TooltipTriangle } from 'assets/svg/tooltip_triangle.s
 import { outboundLink } from 'components/analytics'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import { Trans } from 'i18n'
-import styled, { css, keyframes } from 'lib/styled-components'
 import React, {
+  forwardRef,
   HTMLProps,
   PropsWithChildren,
   ReactNode,
-  forwardRef,
   useCallback,
   useImperativeHandle,
   useRef,
@@ -15,6 +14,7 @@ import React, {
 } from 'react'
 import { AlertTriangle, ArrowLeft, CheckCircle, Copy, Icon, X } from 'react-feather'
 import { Link } from 'react-router-dom'
+import styled, { css, keyframes } from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 import { anonymizeLink } from 'utils/anonymizeLink'
 
diff --git a/apps/web/src/theme/components/text.tsx b/apps/web/src/theme/components/text.tsx
index eb3704bb048..7a28f5b64ac 100644
--- a/apps/web/src/theme/components/text.tsx
+++ b/apps/web/src/theme/components/text.tsx
@@ -2,8 +2,8 @@
  * Preset styles of the Rebass Text component
  */
 
-import styled from 'lib/styled-components'
 import { Text, TextProps as TextPropsOriginal } from 'rebass'
+import styled from 'styled-components'
 
 const TextWrapper = styled(Text).withConfig({
   shouldForwardProp: (prop) => prop !== 'color',
diff --git a/apps/web/src/theme/index.tsx b/apps/web/src/theme/index.tsx
index 4d7b0c84974..c2793c8ee06 100644
--- a/apps/web/src/theme/index.tsx
+++ b/apps/web/src/theme/index.tsx
@@ -1,10 +1,10 @@
 import { useConnectorWithId } from 'components/WalletModal/useOrderedConnections'
 import { CONNECTION } from 'components/Web3Provider/constants'
 import { WalletConnectConnector } from 'components/Web3Provider/walletConnect'
-import { ThemeProvider as StyledComponentsThemeProvider, createGlobalStyle, css } from 'lib/styled-components'
 import { rootCssString } from 'nft/css/cssStringFromTheme'
 import { navDimensions } from 'nft/css/sprinkles.css'
 import { PropsWithChildren, useEffect, useMemo } from 'react'
+import { ThemeProvider as StyledComponentsThemeProvider, createGlobalStyle, css } from 'styled-components'
 import { ThemeColors, darkTheme, lightTheme } from 'theme/colors'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 import { darkDeprecatedTheme, lightDeprecatedTheme } from 'theme/deprecatedColors'
diff --git a/apps/web/src/theme/styles.ts b/apps/web/src/theme/styles.ts
index edb0fc4ed3c..4fec6e2f166 100644
--- a/apps/web/src/theme/styles.ts
+++ b/apps/web/src/theme/styles.ts
@@ -1,4 +1,4 @@
-import { css, keyframes } from 'lib/styled-components'
+import { css, keyframes } from 'styled-components'
 
 export const flexColumnNoWrap = css`
   display: flex;
diff --git a/apps/web/src/tracing/SwapEventTimestampTracker.test.ts b/apps/web/src/tracing/SwapEventTimestampTracker.test.ts
index 12b8e355670..4e1e41e175d 100644
--- a/apps/web/src/tracing/SwapEventTimestampTracker.test.ts
+++ b/apps/web/src/tracing/SwapEventTimestampTracker.test.ts
@@ -26,7 +26,7 @@ describe('SwapEventTimestampTracker', () => {
     expect(swapSuccessTime).toBeDefined()
     expect(swapActionTime).toBeDefined()
     expect(instance.getElapsedTime(SwapEventType.FIRST_SWAP_SUCCESS, SwapEventType.FIRST_SWAP_ACTION)).toEqual(
-      (swapSuccessTime as number) - (swapActionTime as number),
+      (swapSuccessTime as number) - (swapActionTime as number)
     )
   })
 
diff --git a/apps/web/src/tracing/errors.test.ts b/apps/web/src/tracing/errors.test.ts
index 110180e6f52..aadf5d8fdd8 100644
--- a/apps/web/src/tracing/errors.test.ts
+++ b/apps/web/src/tracing/errors.test.ts
@@ -134,14 +134,14 @@ describe('beforeSend', () => {
   describe('Content Security Policy', () => {
     it('filters unsafe-eval evaluate errors', () => {
       const originalException = new Error(
-        "Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: \"script-src 'self' https://www.google-analytics.com https://www.googletagmanager.com 'unsafe-inlin...",
+        "Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: \"script-src 'self' https://www.google-analytics.com https://www.googletagmanager.com 'unsafe-inlin..."
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
 
     it('filters blocked frame errors', () => {
       const originalException = new Error(
-        'Blocked a frame with origin "https://app.uniswap.org" from accessing a cross-origin frame.',
+        'Blocked a frame with origin "https://app.uniswap.org" from accessing a cross-origin frame.'
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
@@ -153,14 +153,14 @@ describe('beforeSend', () => {
 
     it('filters CSP unsafe-eval compile/instatiate errors', () => {
       const originalException = new Error(
-        "Refused to compile or instantiate WebAssembly module because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: \"script-src 'self' https://www.google-a...",
+        "Refused to compile or instantiate WebAssembly module because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: \"script-src 'self' https://www.google-a..."
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
 
     it('filters WebAssembly compilation errors', () => {
       const originalException = new Error(
-        'Aborted(CompileError: WebAssembly.instantiate(): Wasm code generation disallowed by embedder). Build with -sASSERTIONS for more info.',
+        'Aborted(CompileError: WebAssembly.instantiate(): Wasm code generation disallowed by embedder). Build with -sASSERTIONS for more info.'
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
@@ -174,14 +174,14 @@ describe('beforeSend', () => {
   describe('meta tags', () => {
     it('filters apple-mobile-web-app-title errors', () => {
       const originalException = new TypeError(
-        "null is not an object (evaluating 'document.querySelector('meta[name=\"apple-mobile-web-app-title\"]').content')",
+        "null is not an object (evaluating 'document.querySelector('meta[name=\"apple-mobile-web-app-title\"]').content')"
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
 
     it('filters og:site_name errors', () => {
       const originalException = new TypeError(
-        "null is not an object (evaluating 'document.querySelector('meta[name=\"og:site_name\"]').content')",
+        "null is not an object (evaluating 'document.querySelector('meta[name=\"og:site_name\"]').content')"
       )
       expect(beforeSend(ERROR, { originalException })).toBeNull()
     })
diff --git a/apps/web/src/tracing/trace.test.ts b/apps/web/src/tracing/trace.test.ts
index 80beb9e4628..be7cc0ff85c 100644
--- a/apps/web/src/tracing/trace.test.ts
+++ b/apps/web/src/tracing/trace.test.ts
@@ -79,7 +79,7 @@ describe('trace', () => {
       await expect(
         trace(CONTEXT, () => {
           throw error
-        }),
+        })
       ).rejects.toBe(error)
       expect(span!.status).toBe('unknown_error')
       expect(span!.data).toEqual({ error })
@@ -150,7 +150,7 @@ describe('trace', () => {
         trace(CONTEXT, ({ setError }) => {
           setError(error)
           return Promise.reject(error)
-        }),
+        })
       ).rejects.toBeDefined()
       expect(span!.status).toEqual('internal_error')
       expect(span!.data).toEqual({ error })
@@ -162,7 +162,7 @@ describe('trace', () => {
         trace(CONTEXT, ({ setError }) => {
           setError(error, 'aborted')
           return Promise.reject(error)
-        }),
+        })
       ).rejects.toBeDefined()
       expect(span!.status).toEqual('aborted')
       expect(span!.data).toEqual({ error })
diff --git a/apps/web/src/utils/addressesAreEquivalent.test.ts b/apps/web/src/utils/addressesAreEquivalent.test.ts
index 074c40df336..17d705944a9 100644
--- a/apps/web/src/utils/addressesAreEquivalent.test.ts
+++ b/apps/web/src/utils/addressesAreEquivalent.test.ts
@@ -8,16 +8,13 @@ describe('addressesAreEquivalent', () => {
     expect(
       addressesAreEquivalent(
         '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78',
-        '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78'.toLowerCase(),
-      ),
+        '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78'.toLowerCase()
+      )
     ).toBe(true)
   })
   it('should return true for simple equivalence', () => {
     expect(
-      addressesAreEquivalent(
-        '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78',
-        '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78',
-      ),
+      addressesAreEquivalent('0x48c89D77ae34Ae475e4523b25aB01e363dce5A78', '0x48c89D77ae34Ae475e4523b25aB01e363dce5A78')
     ).toBe(true)
   })
 })
diff --git a/apps/web/src/utils/anonymizeLink.test.ts b/apps/web/src/utils/anonymizeLink.test.ts
index 8f7621a9685..60d9b7f600f 100644
--- a/apps/web/src/utils/anonymizeLink.test.ts
+++ b/apps/web/src/utils/anonymizeLink.test.ts
@@ -9,17 +9,17 @@ describe('#anonymizeLink', () => {
   })
   it('anonymizes any addresses in testnet etherscan urls', () => {
     expect(anonymizeLink('https://goerli.etherscan.io/address/0xabcd')).toEqual(
-      'https://goerli.etherscan.io/address/***',
+      'https://goerli.etherscan.io/address/***'
     )
   })
   it('anonymizes hashes in the middle of the url', () => {
     expect(anonymizeLink('https://goerli.etherscan.io/address/0xabcd/test')).toEqual(
-      'https://goerli.etherscan.io/address/***/test',
+      'https://goerli.etherscan.io/address/***/test'
     )
   })
   it('does not anonymize 0x', () => {
     expect(anonymizeLink('https://goerli.etherscan.io/address/0x/test')).toEqual(
-      'https://goerli.etherscan.io/address/0x/test',
+      'https://goerli.etherscan.io/address/0x/test'
     )
   })
   it('works for arbitrum urls', () => {
diff --git a/apps/web/src/utils/chains.tsx b/apps/web/src/utils/chains.tsx
index 5bb86f45347..55790567b17 100644
--- a/apps/web/src/utils/chains.tsx
+++ b/apps/web/src/utils/chains.tsx
@@ -1,5 +1,12 @@
-import { CHAIN_IDS_TO_NAMES } from 'constants/chains'
+import { CHAIN_IDS_TO_NAMES, SupportedInterfaceChainId } from 'constants/chains'
 import { ParsedQs } from 'qs'
+import { L2ChainId, UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { NetworkLayer } from 'uniswap/src/types/chains'
+
+export function isL2ChainId(chainId: SupportedInterfaceChainId): chainId is L2ChainId {
+  const chainInfo = UNIVERSE_CHAIN_INFO[chainId]
+  return chainInfo.networkLayer === NetworkLayer.L2
+}
 
 function getChainIdFromName(name: string) {
   const entry = Object.entries(CHAIN_IDS_TO_NAMES).find(([, n]) => n === name)
diff --git a/apps/web/src/utils/computeUniCirculation.test.ts b/apps/web/src/utils/computeUniCirculation.test.ts
index 649f455851e..8e18a0f759d 100644
--- a/apps/web/src/utils/computeUniCirculation.test.ts
+++ b/apps/web/src/utils/computeUniCirculation.test.ts
@@ -21,17 +21,17 @@ describe('computeUniCirculation', () => {
   })
   it('mid staking', () => {
     expect(computeUniCirculation(token, BigNumber.from(1600387200 + 15 * 24 * 60 * 60), undefined)).toEqual(
-      tokenAmount(155_000_000),
+      tokenAmount(155_000_000)
     )
   })
   it('after staking and treasury vesting cliff', () => {
     expect(computeUniCirculation(token, BigNumber.from(1600387200 + 60 * 24 * 60 * 60), undefined)).toEqual(
-      tokenAmount(224_575_341),
+      tokenAmount(224_575_341)
     )
   })
   it('subtracts unclaimed uni', () => {
     expect(computeUniCirculation(token, BigNumber.from(1600387200 + 15 * 24 * 60 * 60), tokenAmount(1000))).toEqual(
-      tokenAmount(154_999_000),
+      tokenAmount(154_999_000)
     )
   })
 })
diff --git a/apps/web/src/utils/formatNumbers.test.ts b/apps/web/src/utils/formatNumbers.test.ts
index 7de9fbf7e52..1de5c1311ac 100644
--- a/apps/web/src/utils/formatNumbers.test.ts
+++ b/apps/web/src/utils/formatNumbers.test.ts
@@ -132,7 +132,7 @@ describe('formatNumber', () => {
     expect(formatNumber({ input: 0.0000001234, type: NumberType.FiatTokenPrice })).toBe('$0.000000123')
     expect(formatNumber({ input: 0.000000009876, type: NumberType.FiatTokenPrice })).toBe('<$0.00000001')
     expect(formatNumber({ input: 10000000000000000000000000000000, type: NumberType.FiatTokenPrice })).toBe(
-      '$1.000000E31',
+      '$1.000000E31'
     )
   })
 
@@ -152,7 +152,7 @@ describe('formatNumber', () => {
     expect(formatNumber({ input: 0.0000001234, type: NumberType.FiatTokenPrice })).toBe('0,000000123\xa0¥')
     expect(formatNumber({ input: 0.000000009876, type: NumberType.FiatTokenPrice })).toBe('<0,00000001\xa0¥')
     expect(formatNumber({ input: 10000000000000000000000000000000, type: NumberType.FiatTokenPrice })).toBe(
-      '1,000000E31\xa0¥',
+      '1,000000E31\xa0¥'
     )
   })
 
diff --git a/apps/web/src/utils/formatNumbers.ts b/apps/web/src/utils/formatNumbers.ts
index 37fadec4e9a..ce48a193621 100644
--- a/apps/web/src/utils/formatNumbers.ts
+++ b/apps/web/src/utils/formatNumbers.ts
@@ -41,7 +41,7 @@ const NO_DECIMALS: NumberFormatOptions = {
   minimumFractionDigits: 0,
 }
 
-const NO_DECIMALS_CURRENCY: NumberFormatOptions = {
+export const NO_DECIMALS_CURRENCY: NumberFormatOptions = {
   notation: 'standard',
   maximumFractionDigits: 0,
   minimumFractionDigits: 0,
diff --git a/apps/web/src/utils/getExplorerLink.test.ts b/apps/web/src/utils/getExplorerLink.test.ts
index 934cfcc81e8..1a0f1f3d0f7 100644
--- a/apps/web/src/utils/getExplorerLink.test.ts
+++ b/apps/web/src/utils/getExplorerLink.test.ts
@@ -19,7 +19,7 @@ describe('#getExplorerLink', () => {
   })
   it('bnb chain', () => {
     expect(getExplorerLink(UniverseChainId.Bnb, 'abc', ExplorerDataType.ADDRESS)).toEqual(
-      'https://bscscan.com/address/abc',
+      'https://bscscan.com/address/abc'
     )
   })
   it('polygon', () => {
@@ -33,17 +33,17 @@ describe('#getExplorerLink', () => {
   })
   it('avalanche', () => {
     expect(getExplorerLink(UniverseChainId.Avalanche, 'abc', ExplorerDataType.ADDRESS)).toEqual(
-      'https://snowtrace.io/address/abc',
+      'https://snowtrace.io/address/abc'
     )
   })
   it('base', () => {
     expect(getExplorerLink(UniverseChainId.Base, 'abc', ExplorerDataType.ADDRESS)).toEqual(
-      'https://basescan.org/address/abc',
+      'https://basescan.org/address/abc'
     )
   })
   it('blast', () => {
     expect(getExplorerLink(UniverseChainId.Blast, 'abc', ExplorerDataType.ADDRESS)).toEqual(
-      'https://blastscan.io/address/abc',
+      'https://blastscan.io/address/abc'
     )
   })
 })
diff --git a/apps/web/src/utils/prices.test.ts b/apps/web/src/utils/prices.test.ts
index 8ef267b492e..de34ec0a449 100644
--- a/apps/web/src/utils/prices.test.ts
+++ b/apps/web/src/utils/prices.test.ts
@@ -15,11 +15,11 @@ import { computeRealizedLPFeeAmount, warningSeverity } from 'utils/prices'
 
 const pair12 = new Pair(
   CurrencyAmount.fromRawAmount(TEST_TOKEN_1, JSBI.BigInt(10000)),
-  CurrencyAmount.fromRawAmount(TEST_TOKEN_2, JSBI.BigInt(20000)),
+  CurrencyAmount.fromRawAmount(TEST_TOKEN_2, JSBI.BigInt(20000))
 )
 const pair23 = new Pair(
   CurrencyAmount.fromRawAmount(TEST_TOKEN_2, JSBI.BigInt(20000)),
-  CurrencyAmount.fromRawAmount(TEST_TOKEN_3, JSBI.BigInt(30000)),
+  CurrencyAmount.fromRawAmount(TEST_TOKEN_3, JSBI.BigInt(30000))
 )
 
 describe('prices', () => {
@@ -42,8 +42,8 @@ describe('prices', () => {
             ],
             v3Routes: [],
             tradeType: TradeType.EXACT_INPUT,
-          }),
-        ),
+          })
+        )
       ).toEqual(toCurrencyAmount(TEST_TOKEN_1, 3)) // 3% realized fee
     })
 
@@ -61,8 +61,8 @@ describe('prices', () => {
             ],
             v2Routes: [],
             tradeType: TradeType.EXACT_INPUT,
-          }),
-        ),
+          })
+        )
       ).toEqual(toCurrencyAmount(TEST_TOKEN_1, 10)) // 3% realized fee
     })
 
@@ -79,8 +79,8 @@ describe('prices', () => {
             ],
             v3Routes: [],
             tradeType: TradeType.EXACT_INPUT,
-          }),
-        ),
+          })
+        )
       ).toEqual(toCurrencyAmount(TEST_TOKEN_1, 5))
     })
 
@@ -103,8 +103,8 @@ describe('prices', () => {
               },
             ],
             tradeType: TradeType.EXACT_INPUT,
-          }),
-        ),
+          })
+        )
       ).toEqual(toCurrencyAmount(TEST_TOKEN_1, 8))
     })
   })
diff --git a/apps/web/src/utils/prices.ts b/apps/web/src/utils/prices.ts
index b5af386ab6a..eec456e7773 100644
--- a/apps/web/src/utils/prices.ts
+++ b/apps/web/src/utils/prices.ts
@@ -11,7 +11,7 @@ import {
   ONE_HUNDRED_PERCENT,
   ZERO_PERCENT,
 } from 'constants/misc'
-import { DefaultTheme } from 'lib/styled-components'
+import { DefaultTheme } from 'styled-components'
 
 const THIRTY_BIPS_FEE = new Percent(30, BIPS_BASE)
 const INPUT_FRACTION_AFTER_FEE = ONE_HUNDRED_PERCENT.subtract(THIRTY_BIPS_FEE)
diff --git a/apps/web/src/utils/signing.test.ts b/apps/web/src/utils/signing.test.ts
index c0a16e5ed3d..46dd4556aa5 100644
--- a/apps/web/src/utils/signing.test.ts
+++ b/apps/web/src/utils/signing.test.ts
@@ -66,7 +66,7 @@ describe('signing', () => {
           expect.anything(),
           expect.anything(),
           expect.stringContaining('signTypedData: wallet does not implement EIP-712, falling back to eth_sign'),
-          expect.anything(),
+          expect.anything()
         )
         expect(send).toHaveBeenCalledTimes(2)
         expect(send).toHaveBeenCalledWith(signingMethod, [wallet, expect.anything()])
diff --git a/config/jest-presets/jest/globals.js b/config/jest-presets/jest/globals.js
index 9002282bb2e..30039b051bf 100644
--- a/config/jest-presets/jest/globals.js
+++ b/config/jest-presets/jest/globals.js
@@ -1,4 +1,4 @@
-process.env.TZ = 'America/New_York'
+process.env.TZ = 'America/New_York';
 
 module.exports = {
   globals: {
@@ -6,6 +6,9 @@ module.exports = {
     AMPLITUDE_EXPERIMENTS_DEPLOYMENT_KEY: 'key',
     APPSFLYER_API_KEY: 'key',
     APPSFLYER_APP_ID: 123,
+    MOONPAY_API_KEY: 'key',
+    MOONPAY_API_URL: 'https://api.moonpay.com',
+    MOONPAY_WIDGET_API_URL: 'https://api.moonpay.com',
     INFURA_KEY: 'key',
     INFURA_PROJECT_ID: 123,
     ONESIGNAL_APP_ID: 123,
@@ -23,6 +26,6 @@ module.exports = {
     TRADING_API_KEY: 'key',
     UNISWAP_API_KEY: 'key',
     WALLETCONNECT_PROJECT_ID: 123,
-    FIREBASE_APP_CHECK_DEBUG_TOKEN: 'token',
+    FIREBASE_APP_CHECK_DEBUG_TOKEN: 'token'
   },
-}
+};
diff --git a/package.json b/package.json
index 335c2507ce1..22a2e333513 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "moti": "0.27.2",
     "yaml": "2.2.2",
     "multiformats@^9.4.2": "patch:multiformats@npm%3A9.4.2#./.yarn/patches/multiformats-npm-9.4.2-44b8a13c1d.patch",
+    "detox@20.18.1": "patch:detox@npm%3A20.18.1#./.yarn/patches/detox-npm-20.18.1-b532b310b4.patch",
     "@vercel/og@0.5.8": "patch:@vercel/og@npm%3A0.5.8#./.yarn/patches/@vercel-og-npm-0.5.8-83a79f2744.patch",
     "@web3-react/coinbase-wallet@8.2.3": "patch:@web3-react/coinbase-wallet@npm%3A8.2.3#./.yarn/patches/@web3-react-coinbase-wallet-npm-8.2.3-9c7073f079.patch",
     "@web3-react/gnosis-safe@8.2.4": "patch:@web3-react/gnosis-safe@npm%3A8.2.4#./.yarn/patches/@web3-react-gnosis-safe-npm-8.2.4-a7e2850335.patch",
@@ -82,8 +83,7 @@
     "@tamagui/animations-moti@1.92.0": "patch:@tamagui/animations-moti@npm%3A1.92.0#./.yarn/patches/@tamagui-animations-moti-npm-1.92.0-a8dde990ec.patch",
     "cypress-hardhat@2.5.0": "patch:cypress-hardhat@npm%3A2.5.0#./.yarn/patches/cypress-hardhat-npm-2.5.0-9b9b7d7a28.patch",
     "react-native-wagmi-charts@2.5.1": "patch:react-native-wagmi-charts@npm%3A2.5.1#./.yarn/patches/react-native-wagmi-charts-npm-2.5.1-c9e2637be7.patch",
-    "react-native-context-menu-view@1.15.0": "patch:react-native-context-menu-view@npm%3A1.15.0#./.yarn/patches/react-native-context-menu-view-npm-1.15.0-c8a9d10d8c.patch",
-    "detox@20.23.0": "patch:detox@npm%3A20.23.0#./.yarn/patches/detox-npm-20.23.0-6d61110e63.patch"
+    "react-native-context-menu-view@1.15.0": "patch:react-native-context-menu-view@npm%3A1.15.0#./.yarn/patches/react-native-context-menu-view-npm-1.15.0-c8a9d10d8c.patch"
   },
   "scripts": {
     "extension": "yarn workspace @uniswap/extension",
diff --git a/packages/eslint-config/__snapshots__/preset.test.ts.snap b/packages/eslint-config/__snapshots__/preset.test.ts.snap
index 9f4a82aa7ba..43cfba8c99d 100644
--- a/packages/eslint-config/__snapshots__/preset.test.ts.snap
+++ b/packages/eslint-config/__snapshots__/preset.test.ts.snap
@@ -849,7 +849,6 @@ exports[`should have a correct configuration for a React file 1`] = `
               "*react-native*",
               "!react-native-reanimated",
               "!react-native-image-colors",
-              "!@testing-library/react-native",
             ],
             "message": "React Native modules should not be imported outside of .native.ts files. If this is a .native.ts file, add an ignore comment to the top of the file. If you're trying to import a cross-platform module, add it to the whitelist in crossPlatform.js.",
           },
diff --git a/packages/eslint-config/restrictedImports.js b/packages/eslint-config/restrictedImports.js
index 96c2a11503f..b32c3f82785 100644
--- a/packages/eslint-config/restrictedImports.js
+++ b/packages/eslint-config/restrictedImports.js
@@ -43,7 +43,6 @@ exports.crossPlatform = {
         // The following are allowed to be imported in cross-platform code.
         '!react-native-reanimated',
         '!react-native-image-colors',
-        '!@testing-library/react-native',
       ],
       message:
         "React Native modules should not be imported outside of .native.ts files. If this is a .native.ts file, add an ignore comment to the top of the file. If you're trying to import a cross-platform module, add it to the whitelist in crossPlatform.js.",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 5da25eafb5d..6fc09017428 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -15,7 +15,6 @@
     "expo-haptics": "12.8.1",
     "expo-linear-gradient": "12.7.2",
     "i18next": "23.10.0",
-    "qrcode": "1.5.1",
     "react": "18.2.0",
     "react-native": "0.73.6",
     "react-native-fast-image": "8.6.3",
diff --git a/packages/ui/src/assets/backgrounds/for-connecting-v2.svg b/packages/ui/src/assets/backgrounds/for-connecting-v2.svg
deleted file mode 100644
index c8738847d7f..00000000000
--- a/packages/ui/src/assets/backgrounds/for-connecting-v2.svg
+++ /dev/null
@@ -1,1857 +0,0 @@
-<svg width="420" height="432" viewBox="0 0 420 432" fill="none" xmlns="http://www.w3.org/2000/svg">
-	<g clip-path="url(#clip0_2770_96012)">
-		<rect x="416" width="2" height="2" transform="rotate(90 416 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" width="2" height="2" transform="rotate(90 406 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" width="2" height="2" transform="rotate(90 396 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" width="2" height="2" transform="rotate(90 386 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" width="2" height="2" transform="rotate(90 376 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" width="2" height="2" transform="rotate(90 366 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" width="2" height="2" transform="rotate(90 356 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" width="2" height="2" transform="rotate(90 346 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" width="2" height="2" transform="rotate(90 336 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" width="2" height="2" transform="rotate(90 326 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" width="2" height="2" transform="rotate(90 316 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" width="2" height="2" transform="rotate(90 306 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" width="2" height="2" transform="rotate(90 296 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" width="2" height="2" transform="rotate(90 286 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" width="2" height="2" transform="rotate(90 276 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" width="2" height="2" transform="rotate(90 266 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" width="2" height="2" transform="rotate(90 256 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" width="2" height="2" transform="rotate(90 246 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" width="2" height="2" transform="rotate(90 236 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" width="2" height="2" transform="rotate(90 226 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" width="2" height="2" transform="rotate(90 216 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" width="2" height="2" transform="rotate(90 206 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" width="2" height="2" transform="rotate(90 196 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" width="2" height="2" transform="rotate(90 186 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" width="2" height="2" transform="rotate(90 176 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" width="2" height="2" transform="rotate(90 166 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" width="2" height="2" transform="rotate(90 156 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" width="2" height="2" transform="rotate(90 146 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" width="2" height="2" transform="rotate(90 136 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" width="2" height="2" transform="rotate(90 126 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" width="2" height="2" transform="rotate(90 116 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" width="2" height="2" transform="rotate(90 106 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" width="2" height="2" transform="rotate(90 96 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" width="2" height="2" transform="rotate(90 86 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" width="2" height="2" transform="rotate(90 76 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" width="2" height="2" transform="rotate(90 66 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" width="2" height="2" transform="rotate(90 56 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" width="2" height="2" transform="rotate(90 46 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" width="2" height="2" transform="rotate(90 36 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" width="2" height="2" transform="rotate(90 26 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" width="2" height="2" transform="rotate(90 16 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" width="2" height="2" transform="rotate(90 6 0)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="10" width="2" height="2" transform="rotate(90 416 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="10" width="2" height="2" transform="rotate(90 406 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="10" width="2" height="2" transform="rotate(90 396 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="10" width="2" height="2" transform="rotate(90 386 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="10" width="2" height="2" transform="rotate(90 376 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="10" width="2" height="2" transform="rotate(90 366 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="10" width="2" height="2" transform="rotate(90 356 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="10" width="2" height="2" transform="rotate(90 346 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="10" width="2" height="2" transform="rotate(90 336 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="10" width="2" height="2" transform="rotate(90 326 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="10" width="2" height="2" transform="rotate(90 316 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="10" width="2" height="2" transform="rotate(90 306 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="10" width="2" height="2" transform="rotate(90 296 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="10" width="2" height="2" transform="rotate(90 286 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="10" width="2" height="2" transform="rotate(90 276 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="10" width="2" height="2" transform="rotate(90 266 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="10" width="2" height="2" transform="rotate(90 256 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="10" width="2" height="2" transform="rotate(90 246 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="10" width="2" height="2" transform="rotate(90 236 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="10" width="2" height="2" transform="rotate(90 226 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="10" width="2" height="2" transform="rotate(90 216 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="10" width="2" height="2" transform="rotate(90 206 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="10" width="2" height="2" transform="rotate(90 196 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="10" width="2" height="2" transform="rotate(90 186 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="10" width="2" height="2" transform="rotate(90 176 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="10" width="2" height="2" transform="rotate(90 166 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="10" width="2" height="2" transform="rotate(90 156 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="10" width="2" height="2" transform="rotate(90 146 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="10" width="2" height="2" transform="rotate(90 136 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="10" width="2" height="2" transform="rotate(90 126 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="10" width="2" height="2" transform="rotate(90 116 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="10" width="2" height="2" transform="rotate(90 106 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="10" width="2" height="2" transform="rotate(90 96 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="10" width="2" height="2" transform="rotate(90 86 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="10" width="2" height="2" transform="rotate(90 76 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="10" width="2" height="2" transform="rotate(90 66 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="10" width="2" height="2" transform="rotate(90 56 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="10" width="2" height="2" transform="rotate(90 46 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="10" width="2" height="2" transform="rotate(90 36 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="10" width="2" height="2" transform="rotate(90 26 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="10" width="2" height="2" transform="rotate(90 16 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="10" width="2" height="2" transform="rotate(90 6 10)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="20" width="2" height="2" transform="rotate(90 416 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="20" width="2" height="2" transform="rotate(90 406 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="20" width="2" height="2" transform="rotate(90 396 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="20" width="2" height="2" transform="rotate(90 386 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="20" width="2" height="2" transform="rotate(90 376 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="20" width="2" height="2" transform="rotate(90 366 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="20" width="2" height="2" transform="rotate(90 356 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="20" width="2" height="2" transform="rotate(90 346 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="20" width="2" height="2" transform="rotate(90 336 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="20" width="2" height="2" transform="rotate(90 326 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="20" width="2" height="2" transform="rotate(90 316 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="20" width="2" height="2" transform="rotate(90 306 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="20" width="2" height="2" transform="rotate(90 296 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="20" width="2" height="2" transform="rotate(90 286 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="20" width="2" height="2" transform="rotate(90 276 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="20" width="2" height="2" transform="rotate(90 266 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="20" width="2" height="2" transform="rotate(90 256 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="20" width="2" height="2" transform="rotate(90 246 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="20" width="2" height="2" transform="rotate(90 236 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="20" width="2" height="2" transform="rotate(90 226 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="20" width="2" height="2" transform="rotate(90 216 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="20" width="2" height="2" transform="rotate(90 206 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="20" width="2" height="2" transform="rotate(90 196 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="20" width="2" height="2" transform="rotate(90 186 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="20" width="2" height="2" transform="rotate(90 176 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="20" width="2" height="2" transform="rotate(90 166 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="20" width="2" height="2" transform="rotate(90 156 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="20" width="2" height="2" transform="rotate(90 146 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="20" width="2" height="2" transform="rotate(90 136 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="20" width="2" height="2" transform="rotate(90 126 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="20" width="2" height="2" transform="rotate(90 116 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="20" width="2" height="2" transform="rotate(90 106 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="20" width="2" height="2" transform="rotate(90 96 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="20" width="2" height="2" transform="rotate(90 86 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="20" width="2" height="2" transform="rotate(90 76 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="20" width="2" height="2" transform="rotate(90 66 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="20" width="2" height="2" transform="rotate(90 56 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="20" width="2" height="2" transform="rotate(90 46 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="20" width="2" height="2" transform="rotate(90 36 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="20" width="2" height="2" transform="rotate(90 26 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="20" width="2" height="2" transform="rotate(90 16 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="20" width="2" height="2" transform="rotate(90 6 20)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="30" width="2" height="2" transform="rotate(90 416 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="30" width="2" height="2" transform="rotate(90 406 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="30" width="2" height="2" transform="rotate(90 396 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="30" width="2" height="2" transform="rotate(90 386 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="30" width="2" height="2" transform="rotate(90 376 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="30" width="2" height="2" transform="rotate(90 366 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="30" width="2" height="2" transform="rotate(90 356 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="30" width="2" height="2" transform="rotate(90 346 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="30" width="2" height="2" transform="rotate(90 336 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="30" width="2" height="2" transform="rotate(90 326 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="30" width="2" height="2" transform="rotate(90 316 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="30" width="2" height="2" transform="rotate(90 306 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="30" width="2" height="2" transform="rotate(90 296 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="30" width="2" height="2" transform="rotate(90 286 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="30" width="2" height="2" transform="rotate(90 276 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="30" width="2" height="2" transform="rotate(90 266 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="30" width="2" height="2" transform="rotate(90 256 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="30" width="2" height="2" transform="rotate(90 246 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="30" width="2" height="2" transform="rotate(90 236 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="30" width="2" height="2" transform="rotate(90 226 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="30" width="2" height="2" transform="rotate(90 216 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="30" width="2" height="2" transform="rotate(90 206 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="30" width="2" height="2" transform="rotate(90 196 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="30" width="2" height="2" transform="rotate(90 186 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="30" width="2" height="2" transform="rotate(90 176 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="30" width="2" height="2" transform="rotate(90 166 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="30" width="2" height="2" transform="rotate(90 156 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="30" width="2" height="2" transform="rotate(90 146 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="30" width="2" height="2" transform="rotate(90 136 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="30" width="2" height="2" transform="rotate(90 126 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="30" width="2" height="2" transform="rotate(90 116 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="30" width="2" height="2" transform="rotate(90 106 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="30" width="2" height="2" transform="rotate(90 96 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="30" width="2" height="2" transform="rotate(90 86 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="30" width="2" height="2" transform="rotate(90 76 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="30" width="2" height="2" transform="rotate(90 66 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="30" width="2" height="2" transform="rotate(90 56 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="30" width="2" height="2" transform="rotate(90 46 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="30" width="2" height="2" transform="rotate(90 36 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="30" width="2" height="2" transform="rotate(90 26 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="30" width="2" height="2" transform="rotate(90 16 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="30" width="2" height="2" transform="rotate(90 6 30)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="40" width="2" height="2" transform="rotate(90 416 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="40" width="2" height="2" transform="rotate(90 406 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="40" width="2" height="2" transform="rotate(90 396 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="40" width="2" height="2" transform="rotate(90 386 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="40" width="2" height="2" transform="rotate(90 376 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="40" width="2" height="2" transform="rotate(90 366 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="40" width="2" height="2" transform="rotate(90 356 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="40" width="2" height="2" transform="rotate(90 346 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="40" width="2" height="2" transform="rotate(90 336 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="40" width="2" height="2" transform="rotate(90 326 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="40" width="2" height="2" transform="rotate(90 316 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="40" width="2" height="2" transform="rotate(90 306 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="40" width="2" height="2" transform="rotate(90 296 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="40" width="2" height="2" transform="rotate(90 286 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="40" width="2" height="2" transform="rotate(90 276 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="40" width="2" height="2" transform="rotate(90 266 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="40" width="2" height="2" transform="rotate(90 256 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="40" width="2" height="2" transform="rotate(90 246 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="40" width="2" height="2" transform="rotate(90 236 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="40" width="2" height="2" transform="rotate(90 226 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="40" width="2" height="2" transform="rotate(90 216 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="40" width="2" height="2" transform="rotate(90 206 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="40" width="2" height="2" transform="rotate(90 196 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="40" width="2" height="2" transform="rotate(90 186 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="40" width="2" height="2" transform="rotate(90 176 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="40" width="2" height="2" transform="rotate(90 166 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="40" width="2" height="2" transform="rotate(90 156 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="40" width="2" height="2" transform="rotate(90 146 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="40" width="2" height="2" transform="rotate(90 136 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="40" width="2" height="2" transform="rotate(90 126 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="40" width="2" height="2" transform="rotate(90 116 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="40" width="2" height="2" transform="rotate(90 106 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="40" width="2" height="2" transform="rotate(90 96 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="40" width="2" height="2" transform="rotate(90 86 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="40" width="2" height="2" transform="rotate(90 76 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="40" width="2" height="2" transform="rotate(90 66 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="40" width="2" height="2" transform="rotate(90 56 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="40" width="2" height="2" transform="rotate(90 46 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="40" width="2" height="2" transform="rotate(90 36 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="40" width="2" height="2" transform="rotate(90 26 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="40" width="2" height="2" transform="rotate(90 16 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="40" width="2" height="2" transform="rotate(90 6 40)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="50" width="2" height="2" transform="rotate(90 416 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="50" width="2" height="2" transform="rotate(90 406 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="50" width="2" height="2" transform="rotate(90 396 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="50" width="2" height="2" transform="rotate(90 386 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="50" width="2" height="2" transform="rotate(90 376 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="50" width="2" height="2" transform="rotate(90 366 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="50" width="2" height="2" transform="rotate(90 356 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="50" width="2" height="2" transform="rotate(90 346 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="50" width="2" height="2" transform="rotate(90 336 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="50" width="2" height="2" transform="rotate(90 326 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="50" width="2" height="2" transform="rotate(90 316 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="50" width="2" height="2" transform="rotate(90 306 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="50" width="2" height="2" transform="rotate(90 296 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="50" width="2" height="2" transform="rotate(90 286 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="50" width="2" height="2" transform="rotate(90 276 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="50" width="2" height="2" transform="rotate(90 266 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="50" width="2" height="2" transform="rotate(90 256 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="50" width="2" height="2" transform="rotate(90 246 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="50" width="2" height="2" transform="rotate(90 236 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="50" width="2" height="2" transform="rotate(90 226 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="50" width="2" height="2" transform="rotate(90 216 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="50" width="2" height="2" transform="rotate(90 206 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="50" width="2" height="2" transform="rotate(90 196 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="50" width="2" height="2" transform="rotate(90 186 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="50" width="2" height="2" transform="rotate(90 176 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="50" width="2" height="2" transform="rotate(90 166 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="50" width="2" height="2" transform="rotate(90 156 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="50" width="2" height="2" transform="rotate(90 146 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="50" width="2" height="2" transform="rotate(90 136 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="50" width="2" height="2" transform="rotate(90 126 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="50" width="2" height="2" transform="rotate(90 116 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="50" width="2" height="2" transform="rotate(90 106 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="50" width="2" height="2" transform="rotate(90 96 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="50" width="2" height="2" transform="rotate(90 86 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="50" width="2" height="2" transform="rotate(90 76 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="50" width="2" height="2" transform="rotate(90 66 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="50" width="2" height="2" transform="rotate(90 56 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="50" width="2" height="2" transform="rotate(90 46 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="50" width="2" height="2" transform="rotate(90 36 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="50" width="2" height="2" transform="rotate(90 26 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="50" width="2" height="2" transform="rotate(90 16 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="50" width="2" height="2" transform="rotate(90 6 50)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="60" width="2" height="2" transform="rotate(90 416 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="60" width="2" height="2" transform="rotate(90 406 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="60" width="2" height="2" transform="rotate(90 396 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="60" width="2" height="2" transform="rotate(90 386 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="60" width="2" height="2" transform="rotate(90 376 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="60" width="2" height="2" transform="rotate(90 366 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="60" width="2" height="2" transform="rotate(90 356 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="60" width="2" height="2" transform="rotate(90 346 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="60" width="2" height="2" transform="rotate(90 336 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="60" width="2" height="2" transform="rotate(90 326 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="60" width="2" height="2" transform="rotate(90 316 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="60" width="2" height="2" transform="rotate(90 306 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="60" width="2" height="2" transform="rotate(90 296 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="60" width="2" height="2" transform="rotate(90 286 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="60" width="2" height="2" transform="rotate(90 276 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="60" width="2" height="2" transform="rotate(90 266 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="60" width="2" height="2" transform="rotate(90 256 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="60" width="2" height="2" transform="rotate(90 246 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="60" width="2" height="2" transform="rotate(90 236 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="60" width="2" height="2" transform="rotate(90 226 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="60" width="2" height="2" transform="rotate(90 216 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="60" width="2" height="2" transform="rotate(90 206 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="60" width="2" height="2" transform="rotate(90 196 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="60" width="2" height="2" transform="rotate(90 186 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="60" width="2" height="2" transform="rotate(90 176 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="60" width="2" height="2" transform="rotate(90 166 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="60" width="2" height="2" transform="rotate(90 156 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="60" width="2" height="2" transform="rotate(90 146 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="60" width="2" height="2" transform="rotate(90 136 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="60" width="2" height="2" transform="rotate(90 126 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="60" width="2" height="2" transform="rotate(90 116 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="60" width="2" height="2" transform="rotate(90 106 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="60" width="2" height="2" transform="rotate(90 96 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="60" width="2" height="2" transform="rotate(90 86 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="60" width="2" height="2" transform="rotate(90 76 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="60" width="2" height="2" transform="rotate(90 66 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="60" width="2" height="2" transform="rotate(90 56 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="60" width="2" height="2" transform="rotate(90 46 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="60" width="2" height="2" transform="rotate(90 36 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="60" width="2" height="2" transform="rotate(90 26 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="60" width="2" height="2" transform="rotate(90 16 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="60" width="2" height="2" transform="rotate(90 6 60)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="70" width="2" height="2" transform="rotate(90 416 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="70" width="2" height="2" transform="rotate(90 406 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="70" width="2" height="2" transform="rotate(90 396 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="70" width="2" height="2" transform="rotate(90 386 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="70" width="2" height="2" transform="rotate(90 376 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="70" width="2" height="2" transform="rotate(90 366 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="70" width="2" height="2" transform="rotate(90 356 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="70" width="2" height="2" transform="rotate(90 346 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="70" width="2" height="2" transform="rotate(90 336 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="70" width="2" height="2" transform="rotate(90 326 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="70" width="2" height="2" transform="rotate(90 316 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="70" width="2" height="2" transform="rotate(90 306 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="70" width="2" height="2" transform="rotate(90 296 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="70" width="2" height="2" transform="rotate(90 286 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="70" width="2" height="2" transform="rotate(90 276 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="70" width="2" height="2" transform="rotate(90 266 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="70" width="2" height="2" transform="rotate(90 256 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="70" width="2" height="2" transform="rotate(90 246 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="70" width="2" height="2" transform="rotate(90 236 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="70" width="2" height="2" transform="rotate(90 226 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="70" width="2" height="2" transform="rotate(90 216 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="70" width="2" height="2" transform="rotate(90 206 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="70" width="2" height="2" transform="rotate(90 196 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="70" width="2" height="2" transform="rotate(90 186 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="70" width="2" height="2" transform="rotate(90 176 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="70" width="2" height="2" transform="rotate(90 166 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="70" width="2" height="2" transform="rotate(90 156 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="70" width="2" height="2" transform="rotate(90 146 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="70" width="2" height="2" transform="rotate(90 136 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="70" width="2" height="2" transform="rotate(90 126 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="70" width="2" height="2" transform="rotate(90 116 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="70" width="2" height="2" transform="rotate(90 106 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="70" width="2" height="2" transform="rotate(90 96 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="70" width="2" height="2" transform="rotate(90 86 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="70" width="2" height="2" transform="rotate(90 76 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="70" width="2" height="2" transform="rotate(90 66 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="70" width="2" height="2" transform="rotate(90 56 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="70" width="2" height="2" transform="rotate(90 46 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="70" width="2" height="2" transform="rotate(90 36 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="70" width="2" height="2" transform="rotate(90 26 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="70" width="2" height="2" transform="rotate(90 16 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="70" width="2" height="2" transform="rotate(90 6 70)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="80" width="2" height="2" transform="rotate(90 416 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="80" width="2" height="2" transform="rotate(90 406 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="80" width="2" height="2" transform="rotate(90 396 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="80" width="2" height="2" transform="rotate(90 386 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="80" width="2" height="2" transform="rotate(90 376 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="80" width="2" height="2" transform="rotate(90 366 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="80" width="2" height="2" transform="rotate(90 356 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="80" width="2" height="2" transform="rotate(90 346 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="80" width="2" height="2" transform="rotate(90 336 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="80" width="2" height="2" transform="rotate(90 326 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="80" width="2" height="2" transform="rotate(90 316 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="80" width="2" height="2" transform="rotate(90 306 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="80" width="2" height="2" transform="rotate(90 296 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="80" width="2" height="2" transform="rotate(90 286 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="80" width="2" height="2" transform="rotate(90 276 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="80" width="2" height="2" transform="rotate(90 266 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="80" width="2" height="2" transform="rotate(90 256 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="80" width="2" height="2" transform="rotate(90 246 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="80" width="2" height="2" transform="rotate(90 236 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="80" width="2" height="2" transform="rotate(90 226 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="80" width="2" height="2" transform="rotate(90 216 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="80" width="2" height="2" transform="rotate(90 206 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="80" width="2" height="2" transform="rotate(90 196 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="80" width="2" height="2" transform="rotate(90 186 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="80" width="2" height="2" transform="rotate(90 176 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="80" width="2" height="2" transform="rotate(90 166 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="80" width="2" height="2" transform="rotate(90 156 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="80" width="2" height="2" transform="rotate(90 146 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="80" width="2" height="2" transform="rotate(90 136 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="80" width="2" height="2" transform="rotate(90 126 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="80" width="2" height="2" transform="rotate(90 116 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="80" width="2" height="2" transform="rotate(90 106 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="80" width="2" height="2" transform="rotate(90 96 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="80" width="2" height="2" transform="rotate(90 86 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="80" width="2" height="2" transform="rotate(90 76 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="80" width="2" height="2" transform="rotate(90 66 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="80" width="2" height="2" transform="rotate(90 56 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="80" width="2" height="2" transform="rotate(90 46 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="80" width="2" height="2" transform="rotate(90 36 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="80" width="2" height="2" transform="rotate(90 26 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="80" width="2" height="2" transform="rotate(90 16 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="80" width="2" height="2" transform="rotate(90 6 80)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="90" width="2" height="2" transform="rotate(90 416 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="90" width="2" height="2" transform="rotate(90 406 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="90" width="2" height="2" transform="rotate(90 396 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="90" width="2" height="2" transform="rotate(90 386 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="90" width="2" height="2" transform="rotate(90 376 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="90" width="2" height="2" transform="rotate(90 366 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="90" width="2" height="2" transform="rotate(90 356 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="90" width="2" height="2" transform="rotate(90 346 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="90" width="2" height="2" transform="rotate(90 336 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="90" width="2" height="2" transform="rotate(90 326 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="90" width="2" height="2" transform="rotate(90 316 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="90" width="2" height="2" transform="rotate(90 306 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="90" width="2" height="2" transform="rotate(90 296 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="90" width="2" height="2" transform="rotate(90 286 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="90" width="2" height="2" transform="rotate(90 276 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="90" width="2" height="2" transform="rotate(90 266 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="90" width="2" height="2" transform="rotate(90 256 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="90" width="2" height="2" transform="rotate(90 246 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="90" width="2" height="2" transform="rotate(90 236 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="90" width="2" height="2" transform="rotate(90 226 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="90" width="2" height="2" transform="rotate(90 216 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="90" width="2" height="2" transform="rotate(90 206 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="90" width="2" height="2" transform="rotate(90 196 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="90" width="2" height="2" transform="rotate(90 186 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="90" width="2" height="2" transform="rotate(90 176 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="90" width="2" height="2" transform="rotate(90 166 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="90" width="2" height="2" transform="rotate(90 156 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="90" width="2" height="2" transform="rotate(90 146 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="90" width="2" height="2" transform="rotate(90 136 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="90" width="2" height="2" transform="rotate(90 126 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="90" width="2" height="2" transform="rotate(90 116 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="90" width="2" height="2" transform="rotate(90 106 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="90" width="2" height="2" transform="rotate(90 96 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="90" width="2" height="2" transform="rotate(90 86 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="90" width="2" height="2" transform="rotate(90 76 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="90" width="2" height="2" transform="rotate(90 66 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="90" width="2" height="2" transform="rotate(90 56 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="90" width="2" height="2" transform="rotate(90 46 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="90" width="2" height="2" transform="rotate(90 36 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="90" width="2" height="2" transform="rotate(90 26 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="90" width="2" height="2" transform="rotate(90 16 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="90" width="2" height="2" transform="rotate(90 6 90)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="100" width="2" height="2" transform="rotate(90 416 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="100" width="2" height="2" transform="rotate(90 406 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="100" width="2" height="2" transform="rotate(90 396 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="100" width="2" height="2" transform="rotate(90 386 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="100" width="2" height="2" transform="rotate(90 376 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="100" width="2" height="2" transform="rotate(90 366 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="100" width="2" height="2" transform="rotate(90 356 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="100" width="2" height="2" transform="rotate(90 346 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="100" width="2" height="2" transform="rotate(90 336 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="100" width="2" height="2" transform="rotate(90 326 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="100" width="2" height="2" transform="rotate(90 316 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="100" width="2" height="2" transform="rotate(90 306 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="100" width="2" height="2" transform="rotate(90 296 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="100" width="2" height="2" transform="rotate(90 286 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="100" width="2" height="2" transform="rotate(90 276 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="100" width="2" height="2" transform="rotate(90 266 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="100" width="2" height="2" transform="rotate(90 256 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="100" width="2" height="2" transform="rotate(90 246 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="100" width="2" height="2" transform="rotate(90 236 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="100" width="2" height="2" transform="rotate(90 226 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="100" width="2" height="2" transform="rotate(90 216 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="100" width="2" height="2" transform="rotate(90 206 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="100" width="2" height="2" transform="rotate(90 196 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="100" width="2" height="2" transform="rotate(90 186 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="100" width="2" height="2" transform="rotate(90 176 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="100" width="2" height="2" transform="rotate(90 166 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="100" width="2" height="2" transform="rotate(90 156 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="100" width="2" height="2" transform="rotate(90 146 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="100" width="2" height="2" transform="rotate(90 136 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="100" width="2" height="2" transform="rotate(90 126 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="100" width="2" height="2" transform="rotate(90 116 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="100" width="2" height="2" transform="rotate(90 106 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="100" width="2" height="2" transform="rotate(90 96 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="100" width="2" height="2" transform="rotate(90 86 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="100" width="2" height="2" transform="rotate(90 76 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="100" width="2" height="2" transform="rotate(90 66 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="100" width="2" height="2" transform="rotate(90 56 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="100" width="2" height="2" transform="rotate(90 46 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="100" width="2" height="2" transform="rotate(90 36 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="100" width="2" height="2" transform="rotate(90 26 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="100" width="2" height="2" transform="rotate(90 16 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="100" width="2" height="2" transform="rotate(90 6 100)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="110" width="2" height="2" transform="rotate(90 416 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="110" width="2" height="2" transform="rotate(90 406 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="110" width="2" height="2" transform="rotate(90 396 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="110" width="2" height="2" transform="rotate(90 386 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="110" width="2" height="2" transform="rotate(90 376 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="110" width="2" height="2" transform="rotate(90 366 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="110" width="2" height="2" transform="rotate(90 356 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="110" width="2" height="2" transform="rotate(90 346 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="110" width="2" height="2" transform="rotate(90 336 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="110" width="2" height="2" transform="rotate(90 326 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="110" width="2" height="2" transform="rotate(90 316 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="110" width="2" height="2" transform="rotate(90 306 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="110" width="2" height="2" transform="rotate(90 296 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="110" width="2" height="2" transform="rotate(90 286 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="110" width="2" height="2" transform="rotate(90 276 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="110" width="2" height="2" transform="rotate(90 266 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="110" width="2" height="2" transform="rotate(90 256 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="110" width="2" height="2" transform="rotate(90 246 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="110" width="2" height="2" transform="rotate(90 236 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="110" width="2" height="2" transform="rotate(90 226 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="110" width="2" height="2" transform="rotate(90 216 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="110" width="2" height="2" transform="rotate(90 206 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="110" width="2" height="2" transform="rotate(90 196 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="110" width="2" height="2" transform="rotate(90 186 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="110" width="2" height="2" transform="rotate(90 176 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="110" width="2" height="2" transform="rotate(90 166 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="110" width="2" height="2" transform="rotate(90 156 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="110" width="2" height="2" transform="rotate(90 146 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="110" width="2" height="2" transform="rotate(90 136 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="110" width="2" height="2" transform="rotate(90 126 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="110" width="2" height="2" transform="rotate(90 116 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="110" width="2" height="2" transform="rotate(90 106 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="110" width="2" height="2" transform="rotate(90 96 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="110" width="2" height="2" transform="rotate(90 86 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="110" width="2" height="2" transform="rotate(90 76 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="110" width="2" height="2" transform="rotate(90 66 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="110" width="2" height="2" transform="rotate(90 56 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="110" width="2" height="2" transform="rotate(90 46 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="110" width="2" height="2" transform="rotate(90 36 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="110" width="2" height="2" transform="rotate(90 26 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="110" width="2" height="2" transform="rotate(90 16 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="110" width="2" height="2" transform="rotate(90 6 110)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="120" width="2" height="2" transform="rotate(90 416 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="120" width="2" height="2" transform="rotate(90 406 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="120" width="2" height="2" transform="rotate(90 396 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="120" width="2" height="2" transform="rotate(90 386 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="120" width="2" height="2" transform="rotate(90 376 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="120" width="2" height="2" transform="rotate(90 366 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="120" width="2" height="2" transform="rotate(90 356 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="120" width="2" height="2" transform="rotate(90 346 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="120" width="2" height="2" transform="rotate(90 336 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="120" width="2" height="2" transform="rotate(90 326 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="120" width="2" height="2" transform="rotate(90 316 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="120" width="2" height="2" transform="rotate(90 306 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="120" width="2" height="2" transform="rotate(90 296 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="120" width="2" height="2" transform="rotate(90 286 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="120" width="2" height="2" transform="rotate(90 276 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="120" width="2" height="2" transform="rotate(90 266 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="120" width="2" height="2" transform="rotate(90 256 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="120" width="2" height="2" transform="rotate(90 246 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="120" width="2" height="2" transform="rotate(90 236 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="120" width="2" height="2" transform="rotate(90 226 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="120" width="2" height="2" transform="rotate(90 216 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="120" width="2" height="2" transform="rotate(90 206 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="120" width="2" height="2" transform="rotate(90 196 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="120" width="2" height="2" transform="rotate(90 186 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="120" width="2" height="2" transform="rotate(90 176 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="120" width="2" height="2" transform="rotate(90 166 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="120" width="2" height="2" transform="rotate(90 156 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="120" width="2" height="2" transform="rotate(90 146 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="120" width="2" height="2" transform="rotate(90 136 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="120" width="2" height="2" transform="rotate(90 126 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="120" width="2" height="2" transform="rotate(90 116 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="120" width="2" height="2" transform="rotate(90 106 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="120" width="2" height="2" transform="rotate(90 96 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="120" width="2" height="2" transform="rotate(90 86 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="120" width="2" height="2" transform="rotate(90 76 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="120" width="2" height="2" transform="rotate(90 66 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="120" width="2" height="2" transform="rotate(90 56 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="120" width="2" height="2" transform="rotate(90 46 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="120" width="2" height="2" transform="rotate(90 36 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="120" width="2" height="2" transform="rotate(90 26 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="120" width="2" height="2" transform="rotate(90 16 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="120" width="2" height="2" transform="rotate(90 6 120)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="130" width="2" height="2" transform="rotate(90 416 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="130" width="2" height="2" transform="rotate(90 406 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="130" width="2" height="2" transform="rotate(90 396 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="130" width="2" height="2" transform="rotate(90 386 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="130" width="2" height="2" transform="rotate(90 376 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="130" width="2" height="2" transform="rotate(90 366 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="130" width="2" height="2" transform="rotate(90 356 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="130" width="2" height="2" transform="rotate(90 346 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="130" width="2" height="2" transform="rotate(90 336 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="130" width="2" height="2" transform="rotate(90 326 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="130" width="2" height="2" transform="rotate(90 316 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="130" width="2" height="2" transform="rotate(90 306 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="130" width="2" height="2" transform="rotate(90 296 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="130" width="2" height="2" transform="rotate(90 286 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="130" width="2" height="2" transform="rotate(90 276 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="130" width="2" height="2" transform="rotate(90 266 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="130" width="2" height="2" transform="rotate(90 256 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="130" width="2" height="2" transform="rotate(90 246 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="130" width="2" height="2" transform="rotate(90 236 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="130" width="2" height="2" transform="rotate(90 226 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="130" width="2" height="2" transform="rotate(90 216 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="130" width="2" height="2" transform="rotate(90 206 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="130" width="2" height="2" transform="rotate(90 196 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="130" width="2" height="2" transform="rotate(90 186 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="130" width="2" height="2" transform="rotate(90 176 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="130" width="2" height="2" transform="rotate(90 166 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="130" width="2" height="2" transform="rotate(90 156 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="130" width="2" height="2" transform="rotate(90 146 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="130" width="2" height="2" transform="rotate(90 136 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="130" width="2" height="2" transform="rotate(90 126 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="130" width="2" height="2" transform="rotate(90 116 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="130" width="2" height="2" transform="rotate(90 106 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="130" width="2" height="2" transform="rotate(90 96 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="130" width="2" height="2" transform="rotate(90 86 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="130" width="2" height="2" transform="rotate(90 76 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="130" width="2" height="2" transform="rotate(90 66 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="130" width="2" height="2" transform="rotate(90 56 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="130" width="2" height="2" transform="rotate(90 46 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="130" width="2" height="2" transform="rotate(90 36 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="130" width="2" height="2" transform="rotate(90 26 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="130" width="2" height="2" transform="rotate(90 16 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="130" width="2" height="2" transform="rotate(90 6 130)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="140" width="2" height="2" transform="rotate(90 416 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="140" width="2" height="2" transform="rotate(90 406 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="140" width="2" height="2" transform="rotate(90 396 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="140" width="2" height="2" transform="rotate(90 386 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="140" width="2" height="2" transform="rotate(90 376 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="140" width="2" height="2" transform="rotate(90 366 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="140" width="2" height="2" transform="rotate(90 356 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="140" width="2" height="2" transform="rotate(90 346 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="140" width="2" height="2" transform="rotate(90 336 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="140" width="2" height="2" transform="rotate(90 326 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="140" width="2" height="2" transform="rotate(90 316 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="140" width="2" height="2" transform="rotate(90 306 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="140" width="2" height="2" transform="rotate(90 296 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="140" width="2" height="2" transform="rotate(90 286 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="140" width="2" height="2" transform="rotate(90 276 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="140" width="2" height="2" transform="rotate(90 266 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="140" width="2" height="2" transform="rotate(90 256 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="140" width="2" height="2" transform="rotate(90 246 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="140" width="2" height="2" transform="rotate(90 236 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="140" width="2" height="2" transform="rotate(90 226 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="140" width="2" height="2" transform="rotate(90 216 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="140" width="2" height="2" transform="rotate(90 206 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="140" width="2" height="2" transform="rotate(90 196 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="140" width="2" height="2" transform="rotate(90 186 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="140" width="2" height="2" transform="rotate(90 176 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="140" width="2" height="2" transform="rotate(90 166 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="140" width="2" height="2" transform="rotate(90 156 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="140" width="2" height="2" transform="rotate(90 146 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="140" width="2" height="2" transform="rotate(90 136 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="140" width="2" height="2" transform="rotate(90 126 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="140" width="2" height="2" transform="rotate(90 116 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="140" width="2" height="2" transform="rotate(90 106 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="140" width="2" height="2" transform="rotate(90 96 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="140" width="2" height="2" transform="rotate(90 86 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="140" width="2" height="2" transform="rotate(90 76 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="140" width="2" height="2" transform="rotate(90 66 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="140" width="2" height="2" transform="rotate(90 56 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="140" width="2" height="2" transform="rotate(90 46 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="140" width="2" height="2" transform="rotate(90 36 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="140" width="2" height="2" transform="rotate(90 26 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="140" width="2" height="2" transform="rotate(90 16 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="140" width="2" height="2" transform="rotate(90 6 140)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="150" width="2" height="2" transform="rotate(90 416 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="150" width="2" height="2" transform="rotate(90 406 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="150" width="2" height="2" transform="rotate(90 396 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="150" width="2" height="2" transform="rotate(90 386 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="150" width="2" height="2" transform="rotate(90 376 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="150" width="2" height="2" transform="rotate(90 366 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="150" width="2" height="2" transform="rotate(90 356 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="150" width="2" height="2" transform="rotate(90 346 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="150" width="2" height="2" transform="rotate(90 336 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="150" width="2" height="2" transform="rotate(90 326 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="150" width="2" height="2" transform="rotate(90 316 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="150" width="2" height="2" transform="rotate(90 306 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="150" width="2" height="2" transform="rotate(90 296 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="150" width="2" height="2" transform="rotate(90 286 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="150" width="2" height="2" transform="rotate(90 276 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="150" width="2" height="2" transform="rotate(90 266 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="150" width="2" height="2" transform="rotate(90 256 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="150" width="2" height="2" transform="rotate(90 246 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="150" width="2" height="2" transform="rotate(90 236 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="150" width="2" height="2" transform="rotate(90 226 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="150" width="2" height="2" transform="rotate(90 216 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="150" width="2" height="2" transform="rotate(90 206 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="150" width="2" height="2" transform="rotate(90 196 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="150" width="2" height="2" transform="rotate(90 186 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="150" width="2" height="2" transform="rotate(90 176 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="150" width="2" height="2" transform="rotate(90 166 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="150" width="2" height="2" transform="rotate(90 156 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="150" width="2" height="2" transform="rotate(90 146 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="150" width="2" height="2" transform="rotate(90 136 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="150" width="2" height="2" transform="rotate(90 126 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="150" width="2" height="2" transform="rotate(90 116 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="150" width="2" height="2" transform="rotate(90 106 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="150" width="2" height="2" transform="rotate(90 96 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="150" width="2" height="2" transform="rotate(90 86 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="150" width="2" height="2" transform="rotate(90 76 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="150" width="2" height="2" transform="rotate(90 66 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="150" width="2" height="2" transform="rotate(90 56 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="150" width="2" height="2" transform="rotate(90 46 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="150" width="2" height="2" transform="rotate(90 36 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="150" width="2" height="2" transform="rotate(90 26 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="150" width="2" height="2" transform="rotate(90 16 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="150" width="2" height="2" transform="rotate(90 6 150)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="160" width="2" height="2" transform="rotate(90 416 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="160" width="2" height="2" transform="rotate(90 406 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="160" width="2" height="2" transform="rotate(90 396 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="160" width="2" height="2" transform="rotate(90 386 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="160" width="2" height="2" transform="rotate(90 376 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="160" width="2" height="2" transform="rotate(90 366 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="160" width="2" height="2" transform="rotate(90 356 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="160" width="2" height="2" transform="rotate(90 346 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="160" width="2" height="2" transform="rotate(90 336 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="160" width="2" height="2" transform="rotate(90 326 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="160" width="2" height="2" transform="rotate(90 316 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="160" width="2" height="2" transform="rotate(90 306 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="160" width="2" height="2" transform="rotate(90 296 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="160" width="2" height="2" transform="rotate(90 286 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="160" width="2" height="2" transform="rotate(90 276 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="160" width="2" height="2" transform="rotate(90 266 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="160" width="2" height="2" transform="rotate(90 256 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="160" width="2" height="2" transform="rotate(90 246 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="160" width="2" height="2" transform="rotate(90 236 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="160" width="2" height="2" transform="rotate(90 226 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="160" width="2" height="2" transform="rotate(90 216 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="160" width="2" height="2" transform="rotate(90 206 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="160" width="2" height="2" transform="rotate(90 196 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="160" width="2" height="2" transform="rotate(90 186 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="160" width="2" height="2" transform="rotate(90 176 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="160" width="2" height="2" transform="rotate(90 166 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="160" width="2" height="2" transform="rotate(90 156 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="160" width="2" height="2" transform="rotate(90 146 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="160" width="2" height="2" transform="rotate(90 136 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="160" width="2" height="2" transform="rotate(90 126 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="160" width="2" height="2" transform="rotate(90 116 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="160" width="2" height="2" transform="rotate(90 106 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="160" width="2" height="2" transform="rotate(90 96 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="160" width="2" height="2" transform="rotate(90 86 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="160" width="2" height="2" transform="rotate(90 76 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="160" width="2" height="2" transform="rotate(90 66 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="160" width="2" height="2" transform="rotate(90 56 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="160" width="2" height="2" transform="rotate(90 46 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="160" width="2" height="2" transform="rotate(90 36 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="160" width="2" height="2" transform="rotate(90 26 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="160" width="2" height="2" transform="rotate(90 16 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="160" width="2" height="2" transform="rotate(90 6 160)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="170" width="2" height="2" transform="rotate(90 416 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="170" width="2" height="2" transform="rotate(90 406 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="170" width="2" height="2" transform="rotate(90 396 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="170" width="2" height="2" transform="rotate(90 386 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="170" width="2" height="2" transform="rotate(90 376 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="170" width="2" height="2" transform="rotate(90 366 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="170" width="2" height="2" transform="rotate(90 356 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="170" width="2" height="2" transform="rotate(90 346 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="170" width="2" height="2" transform="rotate(90 336 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="170" width="2" height="2" transform="rotate(90 326 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="170" width="2" height="2" transform="rotate(90 316 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="170" width="2" height="2" transform="rotate(90 306 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="170" width="2" height="2" transform="rotate(90 296 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="170" width="2" height="2" transform="rotate(90 286 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="170" width="2" height="2" transform="rotate(90 276 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="170" width="2" height="2" transform="rotate(90 266 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="170" width="2" height="2" transform="rotate(90 256 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="170" width="2" height="2" transform="rotate(90 246 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="170" width="2" height="2" transform="rotate(90 236 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="170" width="2" height="2" transform="rotate(90 226 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="170" width="2" height="2" transform="rotate(90 216 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="170" width="2" height="2" transform="rotate(90 206 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="170" width="2" height="2" transform="rotate(90 196 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="170" width="2" height="2" transform="rotate(90 186 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="170" width="2" height="2" transform="rotate(90 176 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="170" width="2" height="2" transform="rotate(90 166 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="170" width="2" height="2" transform="rotate(90 156 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="170" width="2" height="2" transform="rotate(90 146 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="170" width="2" height="2" transform="rotate(90 136 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="170" width="2" height="2" transform="rotate(90 126 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="170" width="2" height="2" transform="rotate(90 116 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="170" width="2" height="2" transform="rotate(90 106 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="170" width="2" height="2" transform="rotate(90 96 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="170" width="2" height="2" transform="rotate(90 86 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="170" width="2" height="2" transform="rotate(90 76 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="170" width="2" height="2" transform="rotate(90 66 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="170" width="2" height="2" transform="rotate(90 56 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="170" width="2" height="2" transform="rotate(90 46 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="170" width="2" height="2" transform="rotate(90 36 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="170" width="2" height="2" transform="rotate(90 26 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="170" width="2" height="2" transform="rotate(90 16 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="170" width="2" height="2" transform="rotate(90 6 170)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="180" width="2" height="2" transform="rotate(90 416 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="180" width="2" height="2" transform="rotate(90 406 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="180" width="2" height="2" transform="rotate(90 396 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="180" width="2" height="2" transform="rotate(90 386 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="180" width="2" height="2" transform="rotate(90 376 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="180" width="2" height="2" transform="rotate(90 366 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="180" width="2" height="2" transform="rotate(90 356 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="180" width="2" height="2" transform="rotate(90 346 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="180" width="2" height="2" transform="rotate(90 336 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="180" width="2" height="2" transform="rotate(90 326 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="180" width="2" height="2" transform="rotate(90 316 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="180" width="2" height="2" transform="rotate(90 306 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="180" width="2" height="2" transform="rotate(90 296 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="180" width="2" height="2" transform="rotate(90 286 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="180" width="2" height="2" transform="rotate(90 276 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="180" width="2" height="2" transform="rotate(90 266 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="180" width="2" height="2" transform="rotate(90 256 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="180" width="2" height="2" transform="rotate(90 246 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="180" width="2" height="2" transform="rotate(90 236 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="180" width="2" height="2" transform="rotate(90 226 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="180" width="2" height="2" transform="rotate(90 216 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="180" width="2" height="2" transform="rotate(90 206 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="180" width="2" height="2" transform="rotate(90 196 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="180" width="2" height="2" transform="rotate(90 186 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="180" width="2" height="2" transform="rotate(90 176 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="180" width="2" height="2" transform="rotate(90 166 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="180" width="2" height="2" transform="rotate(90 156 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="180" width="2" height="2" transform="rotate(90 146 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="180" width="2" height="2" transform="rotate(90 136 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="180" width="2" height="2" transform="rotate(90 126 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="180" width="2" height="2" transform="rotate(90 116 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="180" width="2" height="2" transform="rotate(90 106 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="180" width="2" height="2" transform="rotate(90 96 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="180" width="2" height="2" transform="rotate(90 86 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="180" width="2" height="2" transform="rotate(90 76 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="180" width="2" height="2" transform="rotate(90 66 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="180" width="2" height="2" transform="rotate(90 56 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="180" width="2" height="2" transform="rotate(90 46 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="180" width="2" height="2" transform="rotate(90 36 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="180" width="2" height="2" transform="rotate(90 26 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="180" width="2" height="2" transform="rotate(90 16 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="180" width="2" height="2" transform="rotate(90 6 180)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="190" width="2" height="2" transform="rotate(90 416 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="190" width="2" height="2" transform="rotate(90 406 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="190" width="2" height="2" transform="rotate(90 396 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="190" width="2" height="2" transform="rotate(90 386 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="190" width="2" height="2" transform="rotate(90 376 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="190" width="2" height="2" transform="rotate(90 366 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="190" width="2" height="2" transform="rotate(90 356 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="190" width="2" height="2" transform="rotate(90 346 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="190" width="2" height="2" transform="rotate(90 336 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="190" width="2" height="2" transform="rotate(90 326 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="190" width="2" height="2" transform="rotate(90 316 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="190" width="2" height="2" transform="rotate(90 306 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="190" width="2" height="2" transform="rotate(90 296 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="190" width="2" height="2" transform="rotate(90 286 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="190" width="2" height="2" transform="rotate(90 276 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="190" width="2" height="2" transform="rotate(90 266 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="190" width="2" height="2" transform="rotate(90 256 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="190" width="2" height="2" transform="rotate(90 246 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="190" width="2" height="2" transform="rotate(90 236 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="190" width="2" height="2" transform="rotate(90 226 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="190" width="2" height="2" transform="rotate(90 216 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="190" width="2" height="2" transform="rotate(90 206 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="190" width="2" height="2" transform="rotate(90 196 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="190" width="2" height="2" transform="rotate(90 186 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="190" width="2" height="2" transform="rotate(90 176 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="190" width="2" height="2" transform="rotate(90 166 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="190" width="2" height="2" transform="rotate(90 156 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="190" width="2" height="2" transform="rotate(90 146 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="190" width="2" height="2" transform="rotate(90 136 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="190" width="2" height="2" transform="rotate(90 126 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="190" width="2" height="2" transform="rotate(90 116 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="190" width="2" height="2" transform="rotate(90 106 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="190" width="2" height="2" transform="rotate(90 96 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="190" width="2" height="2" transform="rotate(90 86 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="190" width="2" height="2" transform="rotate(90 76 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="190" width="2" height="2" transform="rotate(90 66 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="190" width="2" height="2" transform="rotate(90 56 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="190" width="2" height="2" transform="rotate(90 46 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="190" width="2" height="2" transform="rotate(90 36 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="190" width="2" height="2" transform="rotate(90 26 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="190" width="2" height="2" transform="rotate(90 16 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="190" width="2" height="2" transform="rotate(90 6 190)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="200" width="2" height="2" transform="rotate(90 416 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="200" width="2" height="2" transform="rotate(90 406 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="200" width="2" height="2" transform="rotate(90 396 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="200" width="2" height="2" transform="rotate(90 386 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="200" width="2" height="2" transform="rotate(90 376 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="200" width="2" height="2" transform="rotate(90 366 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="200" width="2" height="2" transform="rotate(90 356 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="200" width="2" height="2" transform="rotate(90 346 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="200" width="2" height="2" transform="rotate(90 336 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="200" width="2" height="2" transform="rotate(90 326 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="200" width="2" height="2" transform="rotate(90 316 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="200" width="2" height="2" transform="rotate(90 306 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="200" width="2" height="2" transform="rotate(90 296 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="200" width="2" height="2" transform="rotate(90 286 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="200" width="2" height="2" transform="rotate(90 276 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="200" width="2" height="2" transform="rotate(90 266 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="200" width="2" height="2" transform="rotate(90 256 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="200" width="2" height="2" transform="rotate(90 246 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="200" width="2" height="2" transform="rotate(90 236 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="200" width="2" height="2" transform="rotate(90 226 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="200" width="2" height="2" transform="rotate(90 216 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="200" width="2" height="2" transform="rotate(90 206 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="200" width="2" height="2" transform="rotate(90 196 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="200" width="2" height="2" transform="rotate(90 186 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="200" width="2" height="2" transform="rotate(90 176 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="200" width="2" height="2" transform="rotate(90 166 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="200" width="2" height="2" transform="rotate(90 156 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="200" width="2" height="2" transform="rotate(90 146 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="200" width="2" height="2" transform="rotate(90 136 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="200" width="2" height="2" transform="rotate(90 126 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="200" width="2" height="2" transform="rotate(90 116 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="200" width="2" height="2" transform="rotate(90 106 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="200" width="2" height="2" transform="rotate(90 96 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="200" width="2" height="2" transform="rotate(90 86 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="200" width="2" height="2" transform="rotate(90 76 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="200" width="2" height="2" transform="rotate(90 66 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="200" width="2" height="2" transform="rotate(90 56 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="200" width="2" height="2" transform="rotate(90 46 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="200" width="2" height="2" transform="rotate(90 36 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="200" width="2" height="2" transform="rotate(90 26 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="200" width="2" height="2" transform="rotate(90 16 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="200" width="2" height="2" transform="rotate(90 6 200)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="210" width="2" height="2" transform="rotate(90 416 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="210" width="2" height="2" transform="rotate(90 406 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="210" width="2" height="2" transform="rotate(90 396 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="210" width="2" height="2" transform="rotate(90 386 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="210" width="2" height="2" transform="rotate(90 376 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="210" width="2" height="2" transform="rotate(90 366 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="210" width="2" height="2" transform="rotate(90 356 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="210" width="2" height="2" transform="rotate(90 346 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="210" width="2" height="2" transform="rotate(90 336 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="210" width="2" height="2" transform="rotate(90 326 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="210" width="2" height="2" transform="rotate(90 316 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="210" width="2" height="2" transform="rotate(90 306 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="210" width="2" height="2" transform="rotate(90 296 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="210" width="2" height="2" transform="rotate(90 286 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="210" width="2" height="2" transform="rotate(90 276 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="210" width="2" height="2" transform="rotate(90 266 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="210" width="2" height="2" transform="rotate(90 256 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="210" width="2" height="2" transform="rotate(90 246 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="210" width="2" height="2" transform="rotate(90 236 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="210" width="2" height="2" transform="rotate(90 226 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="210" width="2" height="2" transform="rotate(90 216 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="210" width="2" height="2" transform="rotate(90 206 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="210" width="2" height="2" transform="rotate(90 196 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="210" width="2" height="2" transform="rotate(90 186 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="210" width="2" height="2" transform="rotate(90 176 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="210" width="2" height="2" transform="rotate(90 166 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="210" width="2" height="2" transform="rotate(90 156 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="210" width="2" height="2" transform="rotate(90 146 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="210" width="2" height="2" transform="rotate(90 136 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="210" width="2" height="2" transform="rotate(90 126 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="210" width="2" height="2" transform="rotate(90 116 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="210" width="2" height="2" transform="rotate(90 106 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="210" width="2" height="2" transform="rotate(90 96 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="210" width="2" height="2" transform="rotate(90 86 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="210" width="2" height="2" transform="rotate(90 76 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="210" width="2" height="2" transform="rotate(90 66 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="210" width="2" height="2" transform="rotate(90 56 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="210" width="2" height="2" transform="rotate(90 46 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="210" width="2" height="2" transform="rotate(90 36 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="210" width="2" height="2" transform="rotate(90 26 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="210" width="2" height="2" transform="rotate(90 16 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="210" width="2" height="2" transform="rotate(90 6 210)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="220" width="2" height="2" transform="rotate(90 416 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="220" width="2" height="2" transform="rotate(90 406 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="220" width="2" height="2" transform="rotate(90 396 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="220" width="2" height="2" transform="rotate(90 386 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="220" width="2" height="2" transform="rotate(90 376 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="220" width="2" height="2" transform="rotate(90 366 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="220" width="2" height="2" transform="rotate(90 356 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="220" width="2" height="2" transform="rotate(90 346 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="220" width="2" height="2" transform="rotate(90 336 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="220" width="2" height="2" transform="rotate(90 326 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="220" width="2" height="2" transform="rotate(90 316 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="220" width="2" height="2" transform="rotate(90 306 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="220" width="2" height="2" transform="rotate(90 296 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="220" width="2" height="2" transform="rotate(90 286 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="220" width="2" height="2" transform="rotate(90 276 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="220" width="2" height="2" transform="rotate(90 266 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="220" width="2" height="2" transform="rotate(90 256 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="220" width="2" height="2" transform="rotate(90 246 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="220" width="2" height="2" transform="rotate(90 236 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="220" width="2" height="2" transform="rotate(90 226 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="220" width="2" height="2" transform="rotate(90 216 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="220" width="2" height="2" transform="rotate(90 206 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="220" width="2" height="2" transform="rotate(90 196 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="220" width="2" height="2" transform="rotate(90 186 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="220" width="2" height="2" transform="rotate(90 176 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="220" width="2" height="2" transform="rotate(90 166 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="220" width="2" height="2" transform="rotate(90 156 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="220" width="2" height="2" transform="rotate(90 146 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="220" width="2" height="2" transform="rotate(90 136 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="220" width="2" height="2" transform="rotate(90 126 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="220" width="2" height="2" transform="rotate(90 116 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="220" width="2" height="2" transform="rotate(90 106 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="220" width="2" height="2" transform="rotate(90 96 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="220" width="2" height="2" transform="rotate(90 86 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="220" width="2" height="2" transform="rotate(90 76 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="220" width="2" height="2" transform="rotate(90 66 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="220" width="2" height="2" transform="rotate(90 56 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="220" width="2" height="2" transform="rotate(90 46 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="220" width="2" height="2" transform="rotate(90 36 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="220" width="2" height="2" transform="rotate(90 26 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="220" width="2" height="2" transform="rotate(90 16 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="220" width="2" height="2" transform="rotate(90 6 220)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="230" width="2" height="2" transform="rotate(90 416 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="230" width="2" height="2" transform="rotate(90 406 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="230" width="2" height="2" transform="rotate(90 396 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="230" width="2" height="2" transform="rotate(90 386 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="230" width="2" height="2" transform="rotate(90 376 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="230" width="2" height="2" transform="rotate(90 366 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="230" width="2" height="2" transform="rotate(90 356 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="230" width="2" height="2" transform="rotate(90 346 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="230" width="2" height="2" transform="rotate(90 336 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="230" width="2" height="2" transform="rotate(90 326 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="230" width="2" height="2" transform="rotate(90 316 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="230" width="2" height="2" transform="rotate(90 306 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="230" width="2" height="2" transform="rotate(90 296 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="230" width="2" height="2" transform="rotate(90 286 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="230" width="2" height="2" transform="rotate(90 276 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="230" width="2" height="2" transform="rotate(90 266 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="230" width="2" height="2" transform="rotate(90 256 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="230" width="2" height="2" transform="rotate(90 246 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="230" width="2" height="2" transform="rotate(90 236 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="230" width="2" height="2" transform="rotate(90 226 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="230" width="2" height="2" transform="rotate(90 216 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="230" width="2" height="2" transform="rotate(90 206 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="230" width="2" height="2" transform="rotate(90 196 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="230" width="2" height="2" transform="rotate(90 186 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="230" width="2" height="2" transform="rotate(90 176 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="230" width="2" height="2" transform="rotate(90 166 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="230" width="2" height="2" transform="rotate(90 156 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="230" width="2" height="2" transform="rotate(90 146 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="230" width="2" height="2" transform="rotate(90 136 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="230" width="2" height="2" transform="rotate(90 126 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="230" width="2" height="2" transform="rotate(90 116 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="230" width="2" height="2" transform="rotate(90 106 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="230" width="2" height="2" transform="rotate(90 96 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="230" width="2" height="2" transform="rotate(90 86 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="230" width="2" height="2" transform="rotate(90 76 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="230" width="2" height="2" transform="rotate(90 66 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="230" width="2" height="2" transform="rotate(90 56 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="230" width="2" height="2" transform="rotate(90 46 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="230" width="2" height="2" transform="rotate(90 36 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="230" width="2" height="2" transform="rotate(90 26 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="230" width="2" height="2" transform="rotate(90 16 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="230" width="2" height="2" transform="rotate(90 6 230)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="240" width="2" height="2" transform="rotate(90 416 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="240" width="2" height="2" transform="rotate(90 406 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="240" width="2" height="2" transform="rotate(90 396 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="240" width="2" height="2" transform="rotate(90 386 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="240" width="2" height="2" transform="rotate(90 376 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="240" width="2" height="2" transform="rotate(90 366 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="240" width="2" height="2" transform="rotate(90 356 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="240" width="2" height="2" transform="rotate(90 346 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="240" width="2" height="2" transform="rotate(90 336 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="240" width="2" height="2" transform="rotate(90 326 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="240" width="2" height="2" transform="rotate(90 316 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="240" width="2" height="2" transform="rotate(90 306 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="240" width="2" height="2" transform="rotate(90 296 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="240" width="2" height="2" transform="rotate(90 286 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="240" width="2" height="2" transform="rotate(90 276 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="240" width="2" height="2" transform="rotate(90 266 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="240" width="2" height="2" transform="rotate(90 256 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="240" width="2" height="2" transform="rotate(90 246 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="240" width="2" height="2" transform="rotate(90 236 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="240" width="2" height="2" transform="rotate(90 226 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="240" width="2" height="2" transform="rotate(90 216 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="240" width="2" height="2" transform="rotate(90 206 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="240" width="2" height="2" transform="rotate(90 196 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="240" width="2" height="2" transform="rotate(90 186 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="240" width="2" height="2" transform="rotate(90 176 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="240" width="2" height="2" transform="rotate(90 166 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="240" width="2" height="2" transform="rotate(90 156 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="240" width="2" height="2" transform="rotate(90 146 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="240" width="2" height="2" transform="rotate(90 136 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="240" width="2" height="2" transform="rotate(90 126 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="240" width="2" height="2" transform="rotate(90 116 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="240" width="2" height="2" transform="rotate(90 106 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="240" width="2" height="2" transform="rotate(90 96 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="240" width="2" height="2" transform="rotate(90 86 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="240" width="2" height="2" transform="rotate(90 76 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="240" width="2" height="2" transform="rotate(90 66 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="240" width="2" height="2" transform="rotate(90 56 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="240" width="2" height="2" transform="rotate(90 46 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="240" width="2" height="2" transform="rotate(90 36 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="240" width="2" height="2" transform="rotate(90 26 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="240" width="2" height="2" transform="rotate(90 16 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="240" width="2" height="2" transform="rotate(90 6 240)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="250" width="2" height="2" transform="rotate(90 416 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="250" width="2" height="2" transform="rotate(90 406 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="250" width="2" height="2" transform="rotate(90 396 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="250" width="2" height="2" transform="rotate(90 386 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="250" width="2" height="2" transform="rotate(90 376 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="250" width="2" height="2" transform="rotate(90 366 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="250" width="2" height="2" transform="rotate(90 356 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="250" width="2" height="2" transform="rotate(90 346 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="250" width="2" height="2" transform="rotate(90 336 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="250" width="2" height="2" transform="rotate(90 326 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="250" width="2" height="2" transform="rotate(90 316 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="250" width="2" height="2" transform="rotate(90 306 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="250" width="2" height="2" transform="rotate(90 296 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="250" width="2" height="2" transform="rotate(90 286 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="250" width="2" height="2" transform="rotate(90 276 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="250" width="2" height="2" transform="rotate(90 266 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="250" width="2" height="2" transform="rotate(90 256 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="250" width="2" height="2" transform="rotate(90 246 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="250" width="2" height="2" transform="rotate(90 236 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="250" width="2" height="2" transform="rotate(90 226 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="250" width="2" height="2" transform="rotate(90 216 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="250" width="2" height="2" transform="rotate(90 206 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="250" width="2" height="2" transform="rotate(90 196 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="250" width="2" height="2" transform="rotate(90 186 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="250" width="2" height="2" transform="rotate(90 176 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="250" width="2" height="2" transform="rotate(90 166 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="250" width="2" height="2" transform="rotate(90 156 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="250" width="2" height="2" transform="rotate(90 146 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="250" width="2" height="2" transform="rotate(90 136 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="250" width="2" height="2" transform="rotate(90 126 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="250" width="2" height="2" transform="rotate(90 116 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="250" width="2" height="2" transform="rotate(90 106 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="250" width="2" height="2" transform="rotate(90 96 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="250" width="2" height="2" transform="rotate(90 86 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="250" width="2" height="2" transform="rotate(90 76 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="250" width="2" height="2" transform="rotate(90 66 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="250" width="2" height="2" transform="rotate(90 56 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="250" width="2" height="2" transform="rotate(90 46 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="250" width="2" height="2" transform="rotate(90 36 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="250" width="2" height="2" transform="rotate(90 26 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="250" width="2" height="2" transform="rotate(90 16 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="250" width="2" height="2" transform="rotate(90 6 250)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="260" width="2" height="2" transform="rotate(90 416 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="260" width="2" height="2" transform="rotate(90 406 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="260" width="2" height="2" transform="rotate(90 396 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="260" width="2" height="2" transform="rotate(90 386 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="260" width="2" height="2" transform="rotate(90 376 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="260" width="2" height="2" transform="rotate(90 366 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="260" width="2" height="2" transform="rotate(90 356 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="260" width="2" height="2" transform="rotate(90 346 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="260" width="2" height="2" transform="rotate(90 336 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="260" width="2" height="2" transform="rotate(90 326 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="260" width="2" height="2" transform="rotate(90 316 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="260" width="2" height="2" transform="rotate(90 306 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="260" width="2" height="2" transform="rotate(90 296 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="260" width="2" height="2" transform="rotate(90 286 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="260" width="2" height="2" transform="rotate(90 276 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="260" width="2" height="2" transform="rotate(90 266 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="260" width="2" height="2" transform="rotate(90 256 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="260" width="2" height="2" transform="rotate(90 246 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="260" width="2" height="2" transform="rotate(90 236 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="260" width="2" height="2" transform="rotate(90 226 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="260" width="2" height="2" transform="rotate(90 216 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="260" width="2" height="2" transform="rotate(90 206 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="260" width="2" height="2" transform="rotate(90 196 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="260" width="2" height="2" transform="rotate(90 186 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="260" width="2" height="2" transform="rotate(90 176 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="260" width="2" height="2" transform="rotate(90 166 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="260" width="2" height="2" transform="rotate(90 156 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="260" width="2" height="2" transform="rotate(90 146 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="260" width="2" height="2" transform="rotate(90 136 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="260" width="2" height="2" transform="rotate(90 126 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="260" width="2" height="2" transform="rotate(90 116 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="260" width="2" height="2" transform="rotate(90 106 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="260" width="2" height="2" transform="rotate(90 96 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="260" width="2" height="2" transform="rotate(90 86 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="260" width="2" height="2" transform="rotate(90 76 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="260" width="2" height="2" transform="rotate(90 66 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="260" width="2" height="2" transform="rotate(90 56 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="260" width="2" height="2" transform="rotate(90 46 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="260" width="2" height="2" transform="rotate(90 36 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="260" width="2" height="2" transform="rotate(90 26 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="260" width="2" height="2" transform="rotate(90 16 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="260" width="2" height="2" transform="rotate(90 6 260)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="270" width="2" height="2" transform="rotate(90 416 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="270" width="2" height="2" transform="rotate(90 406 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="270" width="2" height="2" transform="rotate(90 396 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="270" width="2" height="2" transform="rotate(90 386 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="270" width="2" height="2" transform="rotate(90 376 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="270" width="2" height="2" transform="rotate(90 366 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="270" width="2" height="2" transform="rotate(90 356 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="270" width="2" height="2" transform="rotate(90 346 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="270" width="2" height="2" transform="rotate(90 336 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="270" width="2" height="2" transform="rotate(90 326 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="270" width="2" height="2" transform="rotate(90 316 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="270" width="2" height="2" transform="rotate(90 306 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="270" width="2" height="2" transform="rotate(90 296 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="270" width="2" height="2" transform="rotate(90 286 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="270" width="2" height="2" transform="rotate(90 276 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="270" width="2" height="2" transform="rotate(90 266 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="270" width="2" height="2" transform="rotate(90 256 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="270" width="2" height="2" transform="rotate(90 246 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="270" width="2" height="2" transform="rotate(90 236 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="270" width="2" height="2" transform="rotate(90 226 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="270" width="2" height="2" transform="rotate(90 216 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="270" width="2" height="2" transform="rotate(90 206 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="270" width="2" height="2" transform="rotate(90 196 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="270" width="2" height="2" transform="rotate(90 186 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="270" width="2" height="2" transform="rotate(90 176 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="270" width="2" height="2" transform="rotate(90 166 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="270" width="2" height="2" transform="rotate(90 156 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="270" width="2" height="2" transform="rotate(90 146 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="270" width="2" height="2" transform="rotate(90 136 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="270" width="2" height="2" transform="rotate(90 126 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="270" width="2" height="2" transform="rotate(90 116 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="270" width="2" height="2" transform="rotate(90 106 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="270" width="2" height="2" transform="rotate(90 96 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="270" width="2" height="2" transform="rotate(90 86 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="270" width="2" height="2" transform="rotate(90 76 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="270" width="2" height="2" transform="rotate(90 66 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="270" width="2" height="2" transform="rotate(90 56 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="270" width="2" height="2" transform="rotate(90 46 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="270" width="2" height="2" transform="rotate(90 36 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="270" width="2" height="2" transform="rotate(90 26 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="270" width="2" height="2" transform="rotate(90 16 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="270" width="2" height="2" transform="rotate(90 6 270)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="280" width="2" height="2" transform="rotate(90 416 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="280" width="2" height="2" transform="rotate(90 406 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="280" width="2" height="2" transform="rotate(90 396 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="280" width="2" height="2" transform="rotate(90 386 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="280" width="2" height="2" transform="rotate(90 376 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="280" width="2" height="2" transform="rotate(90 366 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="280" width="2" height="2" transform="rotate(90 356 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="280" width="2" height="2" transform="rotate(90 346 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="280" width="2" height="2" transform="rotate(90 336 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="280" width="2" height="2" transform="rotate(90 326 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="280" width="2" height="2" transform="rotate(90 316 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="280" width="2" height="2" transform="rotate(90 306 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="280" width="2" height="2" transform="rotate(90 296 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="280" width="2" height="2" transform="rotate(90 286 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="280" width="2" height="2" transform="rotate(90 276 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="280" width="2" height="2" transform="rotate(90 266 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="280" width="2" height="2" transform="rotate(90 256 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="280" width="2" height="2" transform="rotate(90 246 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="280" width="2" height="2" transform="rotate(90 236 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="280" width="2" height="2" transform="rotate(90 226 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="280" width="2" height="2" transform="rotate(90 216 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="280" width="2" height="2" transform="rotate(90 206 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="280" width="2" height="2" transform="rotate(90 196 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="280" width="2" height="2" transform="rotate(90 186 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="280" width="2" height="2" transform="rotate(90 176 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="280" width="2" height="2" transform="rotate(90 166 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="280" width="2" height="2" transform="rotate(90 156 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="280" width="2" height="2" transform="rotate(90 146 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="280" width="2" height="2" transform="rotate(90 136 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="280" width="2" height="2" transform="rotate(90 126 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="280" width="2" height="2" transform="rotate(90 116 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="280" width="2" height="2" transform="rotate(90 106 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="280" width="2" height="2" transform="rotate(90 96 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="280" width="2" height="2" transform="rotate(90 86 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="280" width="2" height="2" transform="rotate(90 76 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="280" width="2" height="2" transform="rotate(90 66 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="280" width="2" height="2" transform="rotate(90 56 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="280" width="2" height="2" transform="rotate(90 46 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="280" width="2" height="2" transform="rotate(90 36 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="280" width="2" height="2" transform="rotate(90 26 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="280" width="2" height="2" transform="rotate(90 16 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="280" width="2" height="2" transform="rotate(90 6 280)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="290" width="2" height="2" transform="rotate(90 416 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="290" width="2" height="2" transform="rotate(90 406 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="290" width="2" height="2" transform="rotate(90 396 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="290" width="2" height="2" transform="rotate(90 386 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="290" width="2" height="2" transform="rotate(90 376 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="290" width="2" height="2" transform="rotate(90 366 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="290" width="2" height="2" transform="rotate(90 356 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="290" width="2" height="2" transform="rotate(90 346 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="290" width="2" height="2" transform="rotate(90 336 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="290" width="2" height="2" transform="rotate(90 326 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="290" width="2" height="2" transform="rotate(90 316 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="290" width="2" height="2" transform="rotate(90 306 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="290" width="2" height="2" transform="rotate(90 296 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="290" width="2" height="2" transform="rotate(90 286 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="290" width="2" height="2" transform="rotate(90 276 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="290" width="2" height="2" transform="rotate(90 266 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="290" width="2" height="2" transform="rotate(90 256 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="290" width="2" height="2" transform="rotate(90 246 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="290" width="2" height="2" transform="rotate(90 236 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="290" width="2" height="2" transform="rotate(90 226 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="290" width="2" height="2" transform="rotate(90 216 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="290" width="2" height="2" transform="rotate(90 206 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="290" width="2" height="2" transform="rotate(90 196 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="290" width="2" height="2" transform="rotate(90 186 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="290" width="2" height="2" transform="rotate(90 176 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="290" width="2" height="2" transform="rotate(90 166 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="290" width="2" height="2" transform="rotate(90 156 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="290" width="2" height="2" transform="rotate(90 146 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="290" width="2" height="2" transform="rotate(90 136 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="290" width="2" height="2" transform="rotate(90 126 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="290" width="2" height="2" transform="rotate(90 116 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="290" width="2" height="2" transform="rotate(90 106 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="290" width="2" height="2" transform="rotate(90 96 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="290" width="2" height="2" transform="rotate(90 86 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="290" width="2" height="2" transform="rotate(90 76 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="290" width="2" height="2" transform="rotate(90 66 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="290" width="2" height="2" transform="rotate(90 56 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="290" width="2" height="2" transform="rotate(90 46 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="290" width="2" height="2" transform="rotate(90 36 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="290" width="2" height="2" transform="rotate(90 26 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="290" width="2" height="2" transform="rotate(90 16 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="290" width="2" height="2" transform="rotate(90 6 290)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="300" width="2" height="2" transform="rotate(90 416 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="300" width="2" height="2" transform="rotate(90 406 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="300" width="2" height="2" transform="rotate(90 396 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="300" width="2" height="2" transform="rotate(90 386 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="300" width="2" height="2" transform="rotate(90 376 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="300" width="2" height="2" transform="rotate(90 366 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="300" width="2" height="2" transform="rotate(90 356 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="300" width="2" height="2" transform="rotate(90 346 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="300" width="2" height="2" transform="rotate(90 336 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="300" width="2" height="2" transform="rotate(90 326 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="300" width="2" height="2" transform="rotate(90 316 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="300" width="2" height="2" transform="rotate(90 306 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="300" width="2" height="2" transform="rotate(90 296 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="300" width="2" height="2" transform="rotate(90 286 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="300" width="2" height="2" transform="rotate(90 276 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="300" width="2" height="2" transform="rotate(90 266 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="300" width="2" height="2" transform="rotate(90 256 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="300" width="2" height="2" transform="rotate(90 246 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="300" width="2" height="2" transform="rotate(90 236 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="300" width="2" height="2" transform="rotate(90 226 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="300" width="2" height="2" transform="rotate(90 216 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="300" width="2" height="2" transform="rotate(90 206 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="300" width="2" height="2" transform="rotate(90 196 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="300" width="2" height="2" transform="rotate(90 186 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="300" width="2" height="2" transform="rotate(90 176 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="300" width="2" height="2" transform="rotate(90 166 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="300" width="2" height="2" transform="rotate(90 156 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="300" width="2" height="2" transform="rotate(90 146 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="300" width="2" height="2" transform="rotate(90 136 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="300" width="2" height="2" transform="rotate(90 126 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="300" width="2" height="2" transform="rotate(90 116 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="300" width="2" height="2" transform="rotate(90 106 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="300" width="2" height="2" transform="rotate(90 96 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="300" width="2" height="2" transform="rotate(90 86 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="300" width="2" height="2" transform="rotate(90 76 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="300" width="2" height="2" transform="rotate(90 66 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="300" width="2" height="2" transform="rotate(90 56 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="300" width="2" height="2" transform="rotate(90 46 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="300" width="2" height="2" transform="rotate(90 36 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="300" width="2" height="2" transform="rotate(90 26 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="300" width="2" height="2" transform="rotate(90 16 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="300" width="2" height="2" transform="rotate(90 6 300)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="310" width="2" height="2" transform="rotate(90 416 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="310" width="2" height="2" transform="rotate(90 406 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="310" width="2" height="2" transform="rotate(90 396 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="310" width="2" height="2" transform="rotate(90 386 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="310" width="2" height="2" transform="rotate(90 376 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="310" width="2" height="2" transform="rotate(90 366 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="310" width="2" height="2" transform="rotate(90 356 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="310" width="2" height="2" transform="rotate(90 346 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="310" width="2" height="2" transform="rotate(90 336 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="310" width="2" height="2" transform="rotate(90 326 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="310" width="2" height="2" transform="rotate(90 316 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="310" width="2" height="2" transform="rotate(90 306 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="310" width="2" height="2" transform="rotate(90 296 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="310" width="2" height="2" transform="rotate(90 286 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="310" width="2" height="2" transform="rotate(90 276 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="310" width="2" height="2" transform="rotate(90 266 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="310" width="2" height="2" transform="rotate(90 256 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="310" width="2" height="2" transform="rotate(90 246 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="310" width="2" height="2" transform="rotate(90 236 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="310" width="2" height="2" transform="rotate(90 226 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="310" width="2" height="2" transform="rotate(90 216 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="310" width="2" height="2" transform="rotate(90 206 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="310" width="2" height="2" transform="rotate(90 196 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="310" width="2" height="2" transform="rotate(90 186 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="310" width="2" height="2" transform="rotate(90 176 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="310" width="2" height="2" transform="rotate(90 166 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="310" width="2" height="2" transform="rotate(90 156 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="310" width="2" height="2" transform="rotate(90 146 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="310" width="2" height="2" transform="rotate(90 136 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="310" width="2" height="2" transform="rotate(90 126 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="310" width="2" height="2" transform="rotate(90 116 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="310" width="2" height="2" transform="rotate(90 106 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="310" width="2" height="2" transform="rotate(90 96 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="310" width="2" height="2" transform="rotate(90 86 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="310" width="2" height="2" transform="rotate(90 76 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="310" width="2" height="2" transform="rotate(90 66 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="310" width="2" height="2" transform="rotate(90 56 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="310" width="2" height="2" transform="rotate(90 46 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="310" width="2" height="2" transform="rotate(90 36 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="310" width="2" height="2" transform="rotate(90 26 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="310" width="2" height="2" transform="rotate(90 16 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="310" width="2" height="2" transform="rotate(90 6 310)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="320" width="2" height="2" transform="rotate(90 416 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="320" width="2" height="2" transform="rotate(90 406 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="320" width="2" height="2" transform="rotate(90 396 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="320" width="2" height="2" transform="rotate(90 386 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="320" width="2" height="2" transform="rotate(90 376 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="320" width="2" height="2" transform="rotate(90 366 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="320" width="2" height="2" transform="rotate(90 356 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="320" width="2" height="2" transform="rotate(90 346 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="320" width="2" height="2" transform="rotate(90 336 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="320" width="2" height="2" transform="rotate(90 326 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="320" width="2" height="2" transform="rotate(90 316 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="320" width="2" height="2" transform="rotate(90 306 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="320" width="2" height="2" transform="rotate(90 296 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="320" width="2" height="2" transform="rotate(90 286 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="320" width="2" height="2" transform="rotate(90 276 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="320" width="2" height="2" transform="rotate(90 266 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="320" width="2" height="2" transform="rotate(90 256 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="320" width="2" height="2" transform="rotate(90 246 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="320" width="2" height="2" transform="rotate(90 236 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="320" width="2" height="2" transform="rotate(90 226 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="320" width="2" height="2" transform="rotate(90 216 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="320" width="2" height="2" transform="rotate(90 206 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="320" width="2" height="2" transform="rotate(90 196 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="320" width="2" height="2" transform="rotate(90 186 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="320" width="2" height="2" transform="rotate(90 176 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="320" width="2" height="2" transform="rotate(90 166 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="320" width="2" height="2" transform="rotate(90 156 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="320" width="2" height="2" transform="rotate(90 146 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="320" width="2" height="2" transform="rotate(90 136 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="320" width="2" height="2" transform="rotate(90 126 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="320" width="2" height="2" transform="rotate(90 116 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="320" width="2" height="2" transform="rotate(90 106 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="320" width="2" height="2" transform="rotate(90 96 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="320" width="2" height="2" transform="rotate(90 86 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="320" width="2" height="2" transform="rotate(90 76 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="320" width="2" height="2" transform="rotate(90 66 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="320" width="2" height="2" transform="rotate(90 56 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="320" width="2" height="2" transform="rotate(90 46 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="320" width="2" height="2" transform="rotate(90 36 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="320" width="2" height="2" transform="rotate(90 26 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="320" width="2" height="2" transform="rotate(90 16 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="320" width="2" height="2" transform="rotate(90 6 320)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="330" width="2" height="2" transform="rotate(90 416 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="330" width="2" height="2" transform="rotate(90 406 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="330" width="2" height="2" transform="rotate(90 396 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="330" width="2" height="2" transform="rotate(90 386 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="330" width="2" height="2" transform="rotate(90 376 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="330" width="2" height="2" transform="rotate(90 366 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="330" width="2" height="2" transform="rotate(90 356 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="330" width="2" height="2" transform="rotate(90 346 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="330" width="2" height="2" transform="rotate(90 336 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="330" width="2" height="2" transform="rotate(90 326 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="330" width="2" height="2" transform="rotate(90 316 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="330" width="2" height="2" transform="rotate(90 306 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="330" width="2" height="2" transform="rotate(90 296 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="330" width="2" height="2" transform="rotate(90 286 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="330" width="2" height="2" transform="rotate(90 276 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="330" width="2" height="2" transform="rotate(90 266 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="330" width="2" height="2" transform="rotate(90 256 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="330" width="2" height="2" transform="rotate(90 246 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="330" width="2" height="2" transform="rotate(90 236 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="330" width="2" height="2" transform="rotate(90 226 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="330" width="2" height="2" transform="rotate(90 216 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="330" width="2" height="2" transform="rotate(90 206 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="330" width="2" height="2" transform="rotate(90 196 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="330" width="2" height="2" transform="rotate(90 186 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="330" width="2" height="2" transform="rotate(90 176 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="330" width="2" height="2" transform="rotate(90 166 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="330" width="2" height="2" transform="rotate(90 156 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="330" width="2" height="2" transform="rotate(90 146 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="330" width="2" height="2" transform="rotate(90 136 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="330" width="2" height="2" transform="rotate(90 126 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="330" width="2" height="2" transform="rotate(90 116 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="330" width="2" height="2" transform="rotate(90 106 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="330" width="2" height="2" transform="rotate(90 96 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="330" width="2" height="2" transform="rotate(90 86 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="330" width="2" height="2" transform="rotate(90 76 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="330" width="2" height="2" transform="rotate(90 66 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="330" width="2" height="2" transform="rotate(90 56 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="330" width="2" height="2" transform="rotate(90 46 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="330" width="2" height="2" transform="rotate(90 36 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="330" width="2" height="2" transform="rotate(90 26 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="330" width="2" height="2" transform="rotate(90 16 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="330" width="2" height="2" transform="rotate(90 6 330)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="340" width="2" height="2" transform="rotate(90 416 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="340" width="2" height="2" transform="rotate(90 406 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="340" width="2" height="2" transform="rotate(90 396 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="340" width="2" height="2" transform="rotate(90 386 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="340" width="2" height="2" transform="rotate(90 376 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="340" width="2" height="2" transform="rotate(90 366 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="340" width="2" height="2" transform="rotate(90 356 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="340" width="2" height="2" transform="rotate(90 346 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="340" width="2" height="2" transform="rotate(90 336 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="340" width="2" height="2" transform="rotate(90 326 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="340" width="2" height="2" transform="rotate(90 316 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="340" width="2" height="2" transform="rotate(90 306 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="340" width="2" height="2" transform="rotate(90 296 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="340" width="2" height="2" transform="rotate(90 286 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="340" width="2" height="2" transform="rotate(90 276 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="340" width="2" height="2" transform="rotate(90 266 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="340" width="2" height="2" transform="rotate(90 256 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="340" width="2" height="2" transform="rotate(90 246 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="340" width="2" height="2" transform="rotate(90 236 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="340" width="2" height="2" transform="rotate(90 226 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="340" width="2" height="2" transform="rotate(90 216 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="340" width="2" height="2" transform="rotate(90 206 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="340" width="2" height="2" transform="rotate(90 196 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="340" width="2" height="2" transform="rotate(90 186 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="340" width="2" height="2" transform="rotate(90 176 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="340" width="2" height="2" transform="rotate(90 166 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="340" width="2" height="2" transform="rotate(90 156 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="340" width="2" height="2" transform="rotate(90 146 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="340" width="2" height="2" transform="rotate(90 136 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="340" width="2" height="2" transform="rotate(90 126 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="340" width="2" height="2" transform="rotate(90 116 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="340" width="2" height="2" transform="rotate(90 106 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="340" width="2" height="2" transform="rotate(90 96 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="340" width="2" height="2" transform="rotate(90 86 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="340" width="2" height="2" transform="rotate(90 76 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="340" width="2" height="2" transform="rotate(90 66 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="340" width="2" height="2" transform="rotate(90 56 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="340" width="2" height="2" transform="rotate(90 46 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="340" width="2" height="2" transform="rotate(90 36 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="340" width="2" height="2" transform="rotate(90 26 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="340" width="2" height="2" transform="rotate(90 16 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="340" width="2" height="2" transform="rotate(90 6 340)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="350" width="2" height="2" transform="rotate(90 416 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="350" width="2" height="2" transform="rotate(90 406 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="350" width="2" height="2" transform="rotate(90 396 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="350" width="2" height="2" transform="rotate(90 386 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="350" width="2" height="2" transform="rotate(90 376 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="350" width="2" height="2" transform="rotate(90 366 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="350" width="2" height="2" transform="rotate(90 356 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="350" width="2" height="2" transform="rotate(90 346 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="350" width="2" height="2" transform="rotate(90 336 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="350" width="2" height="2" transform="rotate(90 326 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="350" width="2" height="2" transform="rotate(90 316 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="350" width="2" height="2" transform="rotate(90 306 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="350" width="2" height="2" transform="rotate(90 296 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="350" width="2" height="2" transform="rotate(90 286 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="350" width="2" height="2" transform="rotate(90 276 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="350" width="2" height="2" transform="rotate(90 266 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="350" width="2" height="2" transform="rotate(90 256 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="350" width="2" height="2" transform="rotate(90 246 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="350" width="2" height="2" transform="rotate(90 236 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="350" width="2" height="2" transform="rotate(90 226 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="350" width="2" height="2" transform="rotate(90 216 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="350" width="2" height="2" transform="rotate(90 206 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="350" width="2" height="2" transform="rotate(90 196 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="350" width="2" height="2" transform="rotate(90 186 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="350" width="2" height="2" transform="rotate(90 176 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="350" width="2" height="2" transform="rotate(90 166 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="350" width="2" height="2" transform="rotate(90 156 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="350" width="2" height="2" transform="rotate(90 146 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="350" width="2" height="2" transform="rotate(90 136 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="350" width="2" height="2" transform="rotate(90 126 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="350" width="2" height="2" transform="rotate(90 116 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="350" width="2" height="2" transform="rotate(90 106 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="350" width="2" height="2" transform="rotate(90 96 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="350" width="2" height="2" transform="rotate(90 86 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="350" width="2" height="2" transform="rotate(90 76 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="350" width="2" height="2" transform="rotate(90 66 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="350" width="2" height="2" transform="rotate(90 56 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="350" width="2" height="2" transform="rotate(90 46 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="350" width="2" height="2" transform="rotate(90 36 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="350" width="2" height="2" transform="rotate(90 26 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="350" width="2" height="2" transform="rotate(90 16 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="350" width="2" height="2" transform="rotate(90 6 350)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="360" width="2" height="2" transform="rotate(90 416 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="360" width="2" height="2" transform="rotate(90 406 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="360" width="2" height="2" transform="rotate(90 396 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="360" width="2" height="2" transform="rotate(90 386 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="360" width="2" height="2" transform="rotate(90 376 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="360" width="2" height="2" transform="rotate(90 366 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="360" width="2" height="2" transform="rotate(90 356 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="360" width="2" height="2" transform="rotate(90 346 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="360" width="2" height="2" transform="rotate(90 336 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="360" width="2" height="2" transform="rotate(90 326 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="360" width="2" height="2" transform="rotate(90 316 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="360" width="2" height="2" transform="rotate(90 306 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="360" width="2" height="2" transform="rotate(90 296 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="360" width="2" height="2" transform="rotate(90 286 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="360" width="2" height="2" transform="rotate(90 276 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="360" width="2" height="2" transform="rotate(90 266 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="360" width="2" height="2" transform="rotate(90 256 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="360" width="2" height="2" transform="rotate(90 246 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="360" width="2" height="2" transform="rotate(90 236 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="360" width="2" height="2" transform="rotate(90 226 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="360" width="2" height="2" transform="rotate(90 216 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="360" width="2" height="2" transform="rotate(90 206 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="360" width="2" height="2" transform="rotate(90 196 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="360" width="2" height="2" transform="rotate(90 186 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="360" width="2" height="2" transform="rotate(90 176 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="360" width="2" height="2" transform="rotate(90 166 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="360" width="2" height="2" transform="rotate(90 156 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="360" width="2" height="2" transform="rotate(90 146 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="360" width="2" height="2" transform="rotate(90 136 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="360" width="2" height="2" transform="rotate(90 126 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="360" width="2" height="2" transform="rotate(90 116 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="360" width="2" height="2" transform="rotate(90 106 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="360" width="2" height="2" transform="rotate(90 96 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="360" width="2" height="2" transform="rotate(90 86 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="360" width="2" height="2" transform="rotate(90 76 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="360" width="2" height="2" transform="rotate(90 66 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="360" width="2" height="2" transform="rotate(90 56 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="360" width="2" height="2" transform="rotate(90 46 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="360" width="2" height="2" transform="rotate(90 36 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="360" width="2" height="2" transform="rotate(90 26 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="360" width="2" height="2" transform="rotate(90 16 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="360" width="2" height="2" transform="rotate(90 6 360)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="370" width="2" height="2" transform="rotate(90 416 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="370" width="2" height="2" transform="rotate(90 406 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="370" width="2" height="2" transform="rotate(90 396 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="370" width="2" height="2" transform="rotate(90 386 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="370" width="2" height="2" transform="rotate(90 376 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="370" width="2" height="2" transform="rotate(90 366 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="370" width="2" height="2" transform="rotate(90 356 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="370" width="2" height="2" transform="rotate(90 346 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="370" width="2" height="2" transform="rotate(90 336 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="370" width="2" height="2" transform="rotate(90 326 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="370" width="2" height="2" transform="rotate(90 316 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="370" width="2" height="2" transform="rotate(90 306 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="370" width="2" height="2" transform="rotate(90 296 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="370" width="2" height="2" transform="rotate(90 286 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="370" width="2" height="2" transform="rotate(90 276 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="370" width="2" height="2" transform="rotate(90 266 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="370" width="2" height="2" transform="rotate(90 256 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="370" width="2" height="2" transform="rotate(90 246 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="370" width="2" height="2" transform="rotate(90 236 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="370" width="2" height="2" transform="rotate(90 226 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="370" width="2" height="2" transform="rotate(90 216 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="370" width="2" height="2" transform="rotate(90 206 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="370" width="2" height="2" transform="rotate(90 196 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="370" width="2" height="2" transform="rotate(90 186 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="370" width="2" height="2" transform="rotate(90 176 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="370" width="2" height="2" transform="rotate(90 166 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="370" width="2" height="2" transform="rotate(90 156 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="370" width="2" height="2" transform="rotate(90 146 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="370" width="2" height="2" transform="rotate(90 136 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="370" width="2" height="2" transform="rotate(90 126 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="370" width="2" height="2" transform="rotate(90 116 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="370" width="2" height="2" transform="rotate(90 106 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="370" width="2" height="2" transform="rotate(90 96 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="370" width="2" height="2" transform="rotate(90 86 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="370" width="2" height="2" transform="rotate(90 76 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="370" width="2" height="2" transform="rotate(90 66 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="370" width="2" height="2" transform="rotate(90 56 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="370" width="2" height="2" transform="rotate(90 46 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="370" width="2" height="2" transform="rotate(90 36 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="370" width="2" height="2" transform="rotate(90 26 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="370" width="2" height="2" transform="rotate(90 16 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="370" width="2" height="2" transform="rotate(90 6 370)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="380" width="2" height="2" transform="rotate(90 416 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="380" width="2" height="2" transform="rotate(90 406 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="380" width="2" height="2" transform="rotate(90 396 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="380" width="2" height="2" transform="rotate(90 386 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="380" width="2" height="2" transform="rotate(90 376 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="380" width="2" height="2" transform="rotate(90 366 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="380" width="2" height="2" transform="rotate(90 356 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="380" width="2" height="2" transform="rotate(90 346 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="380" width="2" height="2" transform="rotate(90 336 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="380" width="2" height="2" transform="rotate(90 326 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="380" width="2" height="2" transform="rotate(90 316 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="380" width="2" height="2" transform="rotate(90 306 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="380" width="2" height="2" transform="rotate(90 296 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="380" width="2" height="2" transform="rotate(90 286 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="380" width="2" height="2" transform="rotate(90 276 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="380" width="2" height="2" transform="rotate(90 266 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="380" width="2" height="2" transform="rotate(90 256 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="380" width="2" height="2" transform="rotate(90 246 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="380" width="2" height="2" transform="rotate(90 236 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="380" width="2" height="2" transform="rotate(90 226 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="380" width="2" height="2" transform="rotate(90 216 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="380" width="2" height="2" transform="rotate(90 206 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="380" width="2" height="2" transform="rotate(90 196 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="380" width="2" height="2" transform="rotate(90 186 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="380" width="2" height="2" transform="rotate(90 176 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="380" width="2" height="2" transform="rotate(90 166 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="380" width="2" height="2" transform="rotate(90 156 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="380" width="2" height="2" transform="rotate(90 146 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="380" width="2" height="2" transform="rotate(90 136 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="380" width="2" height="2" transform="rotate(90 126 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="380" width="2" height="2" transform="rotate(90 116 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="380" width="2" height="2" transform="rotate(90 106 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="380" width="2" height="2" transform="rotate(90 96 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="380" width="2" height="2" transform="rotate(90 86 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="380" width="2" height="2" transform="rotate(90 76 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="380" width="2" height="2" transform="rotate(90 66 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="380" width="2" height="2" transform="rotate(90 56 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="380" width="2" height="2" transform="rotate(90 46 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="380" width="2" height="2" transform="rotate(90 36 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="380" width="2" height="2" transform="rotate(90 26 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="380" width="2" height="2" transform="rotate(90 16 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="380" width="2" height="2" transform="rotate(90 6 380)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="390" width="2" height="2" transform="rotate(90 416 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="390" width="2" height="2" transform="rotate(90 406 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="390" width="2" height="2" transform="rotate(90 396 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="390" width="2" height="2" transform="rotate(90 386 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="390" width="2" height="2" transform="rotate(90 376 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="390" width="2" height="2" transform="rotate(90 366 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="390" width="2" height="2" transform="rotate(90 356 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="390" width="2" height="2" transform="rotate(90 346 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="390" width="2" height="2" transform="rotate(90 336 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="390" width="2" height="2" transform="rotate(90 326 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="390" width="2" height="2" transform="rotate(90 316 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="390" width="2" height="2" transform="rotate(90 306 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="390" width="2" height="2" transform="rotate(90 296 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="390" width="2" height="2" transform="rotate(90 286 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="390" width="2" height="2" transform="rotate(90 276 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="390" width="2" height="2" transform="rotate(90 266 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="390" width="2" height="2" transform="rotate(90 256 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="390" width="2" height="2" transform="rotate(90 246 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="390" width="2" height="2" transform="rotate(90 236 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="390" width="2" height="2" transform="rotate(90 226 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="390" width="2" height="2" transform="rotate(90 216 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="390" width="2" height="2" transform="rotate(90 206 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="390" width="2" height="2" transform="rotate(90 196 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="390" width="2" height="2" transform="rotate(90 186 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="390" width="2" height="2" transform="rotate(90 176 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="390" width="2" height="2" transform="rotate(90 166 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="390" width="2" height="2" transform="rotate(90 156 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="390" width="2" height="2" transform="rotate(90 146 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="390" width="2" height="2" transform="rotate(90 136 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="390" width="2" height="2" transform="rotate(90 126 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="390" width="2" height="2" transform="rotate(90 116 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="390" width="2" height="2" transform="rotate(90 106 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="390" width="2" height="2" transform="rotate(90 96 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="390" width="2" height="2" transform="rotate(90 86 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="390" width="2" height="2" transform="rotate(90 76 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="390" width="2" height="2" transform="rotate(90 66 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="390" width="2" height="2" transform="rotate(90 56 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="390" width="2" height="2" transform="rotate(90 46 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="390" width="2" height="2" transform="rotate(90 36 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="390" width="2" height="2" transform="rotate(90 26 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="390" width="2" height="2" transform="rotate(90 16 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="390" width="2" height="2" transform="rotate(90 6 390)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="400" width="2" height="2" transform="rotate(90 416 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="400" width="2" height="2" transform="rotate(90 406 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="400" width="2" height="2" transform="rotate(90 396 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="400" width="2" height="2" transform="rotate(90 386 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="400" width="2" height="2" transform="rotate(90 376 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="400" width="2" height="2" transform="rotate(90 366 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="400" width="2" height="2" transform="rotate(90 356 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="400" width="2" height="2" transform="rotate(90 346 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="400" width="2" height="2" transform="rotate(90 336 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="400" width="2" height="2" transform="rotate(90 326 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="400" width="2" height="2" transform="rotate(90 316 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="400" width="2" height="2" transform="rotate(90 306 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="400" width="2" height="2" transform="rotate(90 296 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="400" width="2" height="2" transform="rotate(90 286 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="400" width="2" height="2" transform="rotate(90 276 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="400" width="2" height="2" transform="rotate(90 266 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="400" width="2" height="2" transform="rotate(90 256 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="400" width="2" height="2" transform="rotate(90 246 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="400" width="2" height="2" transform="rotate(90 236 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="400" width="2" height="2" transform="rotate(90 226 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="400" width="2" height="2" transform="rotate(90 216 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="400" width="2" height="2" transform="rotate(90 206 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="400" width="2" height="2" transform="rotate(90 196 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="400" width="2" height="2" transform="rotate(90 186 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="400" width="2" height="2" transform="rotate(90 176 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="400" width="2" height="2" transform="rotate(90 166 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="400" width="2" height="2" transform="rotate(90 156 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="400" width="2" height="2" transform="rotate(90 146 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="400" width="2" height="2" transform="rotate(90 136 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="400" width="2" height="2" transform="rotate(90 126 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="400" width="2" height="2" transform="rotate(90 116 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="400" width="2" height="2" transform="rotate(90 106 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="400" width="2" height="2" transform="rotate(90 96 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="400" width="2" height="2" transform="rotate(90 86 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="400" width="2" height="2" transform="rotate(90 76 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="400" width="2" height="2" transform="rotate(90 66 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="400" width="2" height="2" transform="rotate(90 56 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="400" width="2" height="2" transform="rotate(90 46 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="400" width="2" height="2" transform="rotate(90 36 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="400" width="2" height="2" transform="rotate(90 26 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="400" width="2" height="2" transform="rotate(90 16 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="400" width="2" height="2" transform="rotate(90 6 400)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="410" width="2" height="2" transform="rotate(90 416 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="410" width="2" height="2" transform="rotate(90 406 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="410" width="2" height="2" transform="rotate(90 396 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="410" width="2" height="2" transform="rotate(90 386 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="410" width="2" height="2" transform="rotate(90 376 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="410" width="2" height="2" transform="rotate(90 366 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="410" width="2" height="2" transform="rotate(90 356 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="410" width="2" height="2" transform="rotate(90 346 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="410" width="2" height="2" transform="rotate(90 336 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="410" width="2" height="2" transform="rotate(90 326 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="410" width="2" height="2" transform="rotate(90 316 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="410" width="2" height="2" transform="rotate(90 306 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="410" width="2" height="2" transform="rotate(90 296 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="410" width="2" height="2" transform="rotate(90 286 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="410" width="2" height="2" transform="rotate(90 276 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="410" width="2" height="2" transform="rotate(90 266 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="410" width="2" height="2" transform="rotate(90 256 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="410" width="2" height="2" transform="rotate(90 246 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="410" width="2" height="2" transform="rotate(90 236 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="410" width="2" height="2" transform="rotate(90 226 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="410" width="2" height="2" transform="rotate(90 216 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="410" width="2" height="2" transform="rotate(90 206 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="410" width="2" height="2" transform="rotate(90 196 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="410" width="2" height="2" transform="rotate(90 186 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="410" width="2" height="2" transform="rotate(90 176 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="410" width="2" height="2" transform="rotate(90 166 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="410" width="2" height="2" transform="rotate(90 156 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="410" width="2" height="2" transform="rotate(90 146 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="410" width="2" height="2" transform="rotate(90 136 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="410" width="2" height="2" transform="rotate(90 126 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="410" width="2" height="2" transform="rotate(90 116 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="410" width="2" height="2" transform="rotate(90 106 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="410" width="2" height="2" transform="rotate(90 96 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="410" width="2" height="2" transform="rotate(90 86 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="410" width="2" height="2" transform="rotate(90 76 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="410" width="2" height="2" transform="rotate(90 66 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="410" width="2" height="2" transform="rotate(90 56 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="410" width="2" height="2" transform="rotate(90 46 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="410" width="2" height="2" transform="rotate(90 36 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="410" width="2" height="2" transform="rotate(90 26 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="410" width="2" height="2" transform="rotate(90 16 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="410" width="2" height="2" transform="rotate(90 6 410)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="420" width="2" height="2" transform="rotate(90 416 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="420" width="2" height="2" transform="rotate(90 406 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="420" width="2" height="2" transform="rotate(90 396 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="420" width="2" height="2" transform="rotate(90 386 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="420" width="2" height="2" transform="rotate(90 376 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="420" width="2" height="2" transform="rotate(90 366 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="420" width="2" height="2" transform="rotate(90 356 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="420" width="2" height="2" transform="rotate(90 346 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="420" width="2" height="2" transform="rotate(90 336 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="420" width="2" height="2" transform="rotate(90 326 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="420" width="2" height="2" transform="rotate(90 316 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="420" width="2" height="2" transform="rotate(90 306 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="420" width="2" height="2" transform="rotate(90 296 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="420" width="2" height="2" transform="rotate(90 286 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="420" width="2" height="2" transform="rotate(90 276 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="420" width="2" height="2" transform="rotate(90 266 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="420" width="2" height="2" transform="rotate(90 256 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="420" width="2" height="2" transform="rotate(90 246 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="420" width="2" height="2" transform="rotate(90 236 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="420" width="2" height="2" transform="rotate(90 226 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="420" width="2" height="2" transform="rotate(90 216 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="420" width="2" height="2" transform="rotate(90 206 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="420" width="2" height="2" transform="rotate(90 196 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="420" width="2" height="2" transform="rotate(90 186 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="420" width="2" height="2" transform="rotate(90 176 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="420" width="2" height="2" transform="rotate(90 166 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="420" width="2" height="2" transform="rotate(90 156 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="420" width="2" height="2" transform="rotate(90 146 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="420" width="2" height="2" transform="rotate(90 136 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="420" width="2" height="2" transform="rotate(90 126 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="420" width="2" height="2" transform="rotate(90 116 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="420" width="2" height="2" transform="rotate(90 106 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="420" width="2" height="2" transform="rotate(90 96 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="420" width="2" height="2" transform="rotate(90 86 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="420" width="2" height="2" transform="rotate(90 76 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="420" width="2" height="2" transform="rotate(90 66 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="420" width="2" height="2" transform="rotate(90 56 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="420" width="2" height="2" transform="rotate(90 46 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="420" width="2" height="2" transform="rotate(90 36 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="420" width="2" height="2" transform="rotate(90 26 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="420" width="2" height="2" transform="rotate(90 16 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="420" width="2" height="2" transform="rotate(90 6 420)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="416" y="430" width="2" height="2" transform="rotate(90 416 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="406" y="430" width="2" height="2" transform="rotate(90 406 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="396" y="430" width="2" height="2" transform="rotate(90 396 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="386" y="430" width="2" height="2" transform="rotate(90 386 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="376" y="430" width="2" height="2" transform="rotate(90 376 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="366" y="430" width="2" height="2" transform="rotate(90 366 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="356" y="430" width="2" height="2" transform="rotate(90 356 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="346" y="430" width="2" height="2" transform="rotate(90 346 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="336" y="430" width="2" height="2" transform="rotate(90 336 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="326" y="430" width="2" height="2" transform="rotate(90 326 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="316" y="430" width="2" height="2" transform="rotate(90 316 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="306" y="430" width="2" height="2" transform="rotate(90 306 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="296" y="430" width="2" height="2" transform="rotate(90 296 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="286" y="430" width="2" height="2" transform="rotate(90 286 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="276" y="430" width="2" height="2" transform="rotate(90 276 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="266" y="430" width="2" height="2" transform="rotate(90 266 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="256" y="430" width="2" height="2" transform="rotate(90 256 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="246" y="430" width="2" height="2" transform="rotate(90 246 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="236" y="430" width="2" height="2" transform="rotate(90 236 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="226" y="430" width="2" height="2" transform="rotate(90 226 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="216" y="430" width="2" height="2" transform="rotate(90 216 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="206" y="430" width="2" height="2" transform="rotate(90 206 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="196" y="430" width="2" height="2" transform="rotate(90 196 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="186" y="430" width="2" height="2" transform="rotate(90 186 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="176" y="430" width="2" height="2" transform="rotate(90 176 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="166" y="430" width="2" height="2" transform="rotate(90 166 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="156" y="430" width="2" height="2" transform="rotate(90 156 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="146" y="430" width="2" height="2" transform="rotate(90 146 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="136" y="430" width="2" height="2" transform="rotate(90 136 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="126" y="430" width="2" height="2" transform="rotate(90 126 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="116" y="430" width="2" height="2" transform="rotate(90 116 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="106" y="430" width="2" height="2" transform="rotate(90 106 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="96" y="430" width="2" height="2" transform="rotate(90 96 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="86" y="430" width="2" height="2" transform="rotate(90 86 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="76" y="430" width="2" height="2" transform="rotate(90 76 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="66" y="430" width="2" height="2" transform="rotate(90 66 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="56" y="430" width="2" height="2" transform="rotate(90 56 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="46" y="430" width="2" height="2" transform="rotate(90 46 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="36" y="430" width="2" height="2" transform="rotate(90 36 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="26" y="430" width="2" height="2" transform="rotate(90 26 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="16" y="430" width="2" height="2" transform="rotate(90 16 430)" fill="currentColor" fill-opacity="0.12" />
-		<rect x="6" y="430" width="2" height="2" transform="rotate(90 6 430)" fill="currentColor" fill-opacity="0.12" />
-	</g>
-	<defs>
-		<clipPath id="clip0_2770_96012">
-			<rect width="432" height="420" fill="currentColor" transform="translate(420) rotate(90)" />
-		</clipPath>
-	</defs>
-</svg>
diff --git a/packages/ui/src/assets/icons/arrow-right-to-line.svg b/packages/ui/src/assets/icons/arrow-right-to-line.svg
deleted file mode 100644
index fa55b13bd78..00000000000
--- a/packages/ui/src/assets/icons/arrow-right-to-line.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M14.9359 10.3184C14.8934 10.4209 14.8325 10.5125 14.755 10.59L10.5892 14.7559C10.4267 14.9184 10.2133 15 9.99996 15C9.78663 15 9.57327 14.9184 9.41077 14.7559C9.08493 14.43 9.08493 13.9033 9.41077 13.5775L12.1549 10.8333H2.49996C2.03913 10.8333 1.66663 10.46 1.66663 10C1.66663 9.54 2.03913 9.16666 2.49996 9.16666H12.1549L9.41077 6.42252C9.08493 6.09669 9.08493 5.56997 9.41077 5.24414C9.7366 4.9183 10.2633 4.9183 10.5892 5.24414L14.755 9.40999C14.8325 9.48749 14.8934 9.5791 14.9359 9.6816C15.02 9.88493 15.02 10.1151 14.9359 10.3184ZM17.5 4.16666C17.0391 4.16666 16.6666 4.54 16.6666 5V15C16.6666 15.46 17.0391 15.8333 17.5 15.8333C17.9608 15.8333 18.3333 15.46 18.3333 15V5C18.3333 4.54 17.9608 4.16666 17.5 4.16666Z" fill="currentColor"/>
-</svg>
diff --git a/packages/ui/src/components/icons/ArrowRightToLine.tsx b/packages/ui/src/components/icons/ArrowRightToLine.tsx
deleted file mode 100644
index 5d0b4a650cb..00000000000
--- a/packages/ui/src/components/icons/ArrowRightToLine.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Path, Svg } from 'react-native-svg'
-
-// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
-import { createIcon } from '../factories/createIcon'
-
-export const [ArrowRightToLine, AnimatedArrowRightToLine] = createIcon({
-  name: 'ArrowRightToLine',
-  getIcon: (props) => (
-    <Svg viewBox="0 0 20 20" fill="none" {...props}>
-      <Path
-        d="M14.9359 10.3184C14.8934 10.4209 14.8325 10.5125 14.755 10.59L10.5892 14.7559C10.4267 14.9184 10.2133 15 9.99996 15C9.78663 15 9.57327 14.9184 9.41077 14.7559C9.08493 14.43 9.08493 13.9033 9.41077 13.5775L12.1549 10.8333H2.49996C2.03913 10.8333 1.66663 10.46 1.66663 10C1.66663 9.54 2.03913 9.16666 2.49996 9.16666H12.1549L9.41077 6.42252C9.08493 6.09669 9.08493 5.56997 9.41077 5.24414C9.7366 4.9183 10.2633 4.9183 10.5892 5.24414L14.755 9.40999C14.8325 9.48749 14.8934 9.5791 14.9359 9.6816C15.02 9.88493 15.02 10.1151 14.9359 10.3184ZM17.5 4.16666C17.0391 4.16666 16.6666 4.54 16.6666 5V15C16.6666 15.46 17.0391 15.8333 17.5 15.8333C17.9608 15.8333 18.3333 15.46 18.3333 15V5C18.3333 4.54 17.9608 4.16666 17.5 4.16666Z"
-        fill="currentColor"
-      />
-    </Svg>
-  ),
-})
diff --git a/packages/ui/src/components/icons/exported.ts b/packages/ui/src/components/icons/exported.ts
index fd8d3e35f2f..bf80f81f6e9 100644
--- a/packages/ui/src/components/icons/exported.ts
+++ b/packages/ui/src/components/icons/exported.ts
@@ -12,7 +12,6 @@ export * from './ArrowDown'
 export * from './ArrowDownCircle'
 export * from './ArrowDownCircleFilled'
 export * from './ArrowDownInCircle'
-export * from './ArrowRightToLine'
 export * from './ArrowRightwardsDown'
 export * from './ArrowTurnDownRight'
 export * from './ArrowUpDown'
diff --git a/packages/ui/src/components/menu/MenuContent.tsx b/packages/ui/src/components/menu/MenuContent.tsx
index 768629915c2..208773d29a2 100644
--- a/packages/ui/src/components/menu/MenuContent.tsx
+++ b/packages/ui/src/components/menu/MenuContent.tsx
@@ -34,7 +34,6 @@ export function MenuContent({ items, onClose, ...rest }: MenuContentProps & Flex
           key={index}
           hoverable
           borderRadius="$rounded12"
-          disabledStyle={{ opacity: 0.6, cursor: 'default' }}
           onPress={(e) => handleOnPress(e, onPress)}
           {...touchableProps}
         >
diff --git a/packages/ui/src/components/modal/AdaptiveWebModalSheet.tsx b/packages/ui/src/components/modal/AdaptiveWebModalSheet.tsx
deleted file mode 100644
index 877fc9508a5..00000000000
--- a/packages/ui/src/components/modal/AdaptiveWebModalSheet.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { GetThemeValueForKey } from '@tamagui/core'
-import { PropsWithChildren, useCallback } from 'react'
-import { Adapt, Dialog, ScrollView, Sheet, VisuallyHidden } from 'tamagui'
-
-type ModalProps = PropsWithChildren<{
-  isOpen: boolean
-  onClose?: () => void
-  width?: number
-  maxHeight?: GetThemeValueForKey<'maxHeight'>
-}>
-
-export function AdaptiveWebModalSheet({ isOpen, onClose, width, maxHeight, children }: ModalProps): JSX.Element {
-  const handleClose = useCallback(
-    (open: boolean) => {
-      if (!open && onClose) {
-        onClose()
-      }
-    },
-    [onClose],
-  )
-  return (
-    <Dialog modal open={isOpen} onOpenChange={handleClose}>
-      <VisuallyHidden>
-        <Dialog.Title />
-      </VisuallyHidden>
-      <Adapt when="sm">
-        <Sheet dismissOnSnapToBottom modal animation="200ms">
-          <Sheet.Frame
-            borderBottomWidth="$none"
-            borderColor="$surface3"
-            borderTopLeftRadius="$rounded16"
-            borderTopRightRadius="$rounded16"
-            borderWidth="$spacing1"
-            gap={4}
-            px={24}
-            py={4}
-          >
-            <Sheet.Handle backgroundColor="$surface3" height={4} marginHorizontal="auto" mb={16} width={32} />
-            <Adapt.Contents />
-          </Sheet.Frame>
-          <Sheet.Overlay
-            animation="lazy"
-            backgroundColor="$scrim"
-            enterStyle={{ opacity: 0 }}
-            exitStyle={{ opacity: 0 }}
-          />
-        </Sheet>
-      </Adapt>
-
-      <Dialog.Portal>
-        <Dialog.Overlay
-          key="overlay"
-          animation="300ms"
-          backgroundColor="$scrim"
-          enterStyle={{ opacity: 0 }}
-          exitStyle={{ opacity: 0 }}
-          opacity={0.5}
-        />
-
-        <Dialog.Content
-          key="content"
-          bordered
-          elevate
-          animateOnly={['transform', 'opacity']}
-          animation={isOpen ? 'fastHeavy' : 'fastExitHeavy'}
-          borderColor="$surface3"
-          borderRadius="$rounded16"
-          enterStyle={{ x: 0, y: 20, opacity: 0 }}
-          exitStyle={{ x: 0, y: 10, opacity: 0 }}
-          gap={4}
-          m="$spacing16"
-          maxHeight={maxHeight || '90vh'}
-          px={24}
-          py={16}
-          width={width}
-        >
-          <ScrollView>{children}</ScrollView>
-        </Dialog.Content>
-      </Dialog.Portal>
-    </Dialog>
-  )
-}
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index a6b5122c59e..c2fb28c5ccd 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -41,8 +41,6 @@ export type {
   ViewProps,
 } from 'tamagui'
 export { LinearGradient } from 'tamagui/linear-gradient'
-export { AddressQRCode, QRCodeDisplay } from './components/QRCode'
-export type { GradientProps } from './components/QRCode'
 export { Unicon } from './components/Unicon'
 export * from './components/Unicon/utils'
 export * from './components/UniversalImage/UniversalImage'
@@ -56,7 +54,6 @@ export { Flex, Inset, Separator, flexStyles, type FlexProps } from './components
 export { ContextMenu } from './components/menu/ContextMenu'
 export { MenuContent } from './components/menu/MenuContent'
 export type { MenuContentItem } from './components/menu/types'
-export { AdaptiveWebModalSheet } from './components/modal/AdaptiveWebModalSheet'
 export * from './components/text'
 export { Tooltip } from './components/tooltip/Tooltip'
 export * from './components/touchable'
diff --git a/packages/ui/src/theme/animations.ts b/packages/ui/src/theme/animations.ts
index 134bc51d46f..4fda347e1bf 100644
--- a/packages/ui/src/theme/animations.ts
+++ b/packages/ui/src/theme/animations.ts
@@ -58,28 +58,4 @@ export const animations = createAnimations({
     stiffness: 200,
     delay: 70,
   },
-  fast: {
-    type: 'spring',
-    damping: 75,
-    stiffness: 1000,
-    mass: 1,
-  },
-  fastHeavy: {
-    type: 'spring',
-    damping: 75,
-    stiffness: 1000,
-    mass: 1.4,
-  },
-  fastExit: {
-    type: 'spring',
-    damping: 200,
-    stiffness: 1250,
-    mass: 1,
-  },
-  fastExitHeavy: {
-    type: 'spring',
-    damping: 200,
-    stiffness: 1250,
-    mass: 1.4,
-  },
 })
diff --git a/packages/ui/src/theme/color/colors.ts b/packages/ui/src/theme/color/colors.ts
index ced23f37d86..749cfe73a14 100644
--- a/packages/ui/src/theme/color/colors.ts
+++ b/packages/ui/src/theme/color/colors.ts
@@ -230,8 +230,6 @@ const sporeLight = {
   accent1Hovered: '#C70A92',
   accent2: '#FFEFFF',
   accent2Hovered: '#FEEBFC',
-  accent3: '#4C82FB',
-  accent3Hovered: '#F5F5F5',
 
   accentSoft: '#FC72FF33', //33 = 20%
 
@@ -263,8 +261,6 @@ const sporeDark = {
   accent1Hovered: '#FD3CFE',
   accent2: '#311C31',
   accent2Hovered: '#510D43',
-  accent3: '#4C82FB',
-  accent3Hovered: '#F5F5F5',
 
   accentSoft: '#FC72FF33', //33 = 20%
 
diff --git a/packages/uniswap/package.json b/packages/uniswap/package.json
index 7cd9c839062..f99d6db0e09 100644
--- a/packages/uniswap/package.json
+++ b/packages/uniswap/package.json
@@ -26,14 +26,12 @@
     "@react-native-async-storage/async-storage": "1.17.10",
     "@reduxjs/toolkit": "1.9.3",
     "@typechain/ethers-v5": "7.2.0",
-    "@uniswap/analytics-events": "2.34.0",
+    "@uniswap/analytics-events": "2.32.0",
     "@uniswap/router-sdk": "1.9.2",
     "@uniswap/sdk-core": "5.3.0",
     "apollo-link-rest": "0.9.0",
     "ethers": "5.7.2",
     "expo-blur": "12.9.2",
-    "expo-clipboard": "5.0.1",
-    "expo-web-browser": "12.8.2",
     "fuse.js": "6.5.3",
     "i18next": "23.10.0",
     "lodash": "4.17.21",
@@ -42,7 +40,6 @@
     "react-native": "0.73.6",
     "react-native-appsflyer": "6.13.1",
     "react-native-device-info": "10.0.2",
-    "react-native-gesture-handler": "2.15.0",
     "react-native-reanimated": "3.8.1",
     "react-test-renderer": "18.2.0",
     "react-virtualized-auto-sizer": "1.0.20",
@@ -51,12 +48,9 @@
     "statsig-react-native": "4.11.0",
     "ui": "workspace:^",
     "utilities": "workspace:^",
-    "uuid": "9.0.0",
-    "wagmi": "2.8.4",
-    "wcag-contrast": "3.0.0"
+    "wagmi": "2.8.4"
   },
   "devDependencies": {
-    "@faker-js/faker": "7.6.0",
     "@graphql-codegen/cli": "^3.3.1",
     "@graphql-codegen/client-preset": "^3.0.1",
     "@graphql-codegen/typescript": "^3.0.4",
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx b/packages/uniswap/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
deleted file mode 100644
index 2f3f8f2c07d..00000000000
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { memo } from 'react'
-import { useTranslation } from 'react-i18next'
-import { TokenSelectorList } from 'uniswap/src/components/TokenSelector/TokenSelectorList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  OnSelectCurrency,
-  TokenSection,
-} from 'uniswap/src/components/TokenSelector/types'
-import { GqlResult } from 'uniswap/src/data/types'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
-
-function _TokenSelectorEmptySearchList({
-  onDismiss,
-  onSelectCurrency,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
-  useTokenSectionsForEmptySearchHook,
-  useTokenWarningDismissedHook,
-}: {
-  onSelectCurrency: OnSelectCurrency
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  onDismiss: () => void
-  useTokenWarningDismissedHook: (currencyId: Maybe<string>) => {
-    tokenWarningDismissed: boolean
-    dismissWarningCallback: () => void
-  }
-  useTokenSectionsForEmptySearchHook: () => GqlResult<TokenSection[]>
-}): JSX.Element {
-  const { t } = useTranslation()
-
-  const { data: sections, loading, error, refetch } = useTokenSectionsForEmptySearchHook()
-
-  return (
-    <TokenSelectorList
-      showTokenAddress
-      convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-      errorText={t('token.selector.search.error')}
-      formatNumberOrStringCallback={formatNumberOrStringCallback}
-      hasError={Boolean(error)}
-      loading={loading}
-      refetch={refetch}
-      sections={sections}
-      showTokenWarnings={true}
-      useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-      onDismiss={onDismiss}
-      onSelectCurrency={onSelectCurrency}
-    />
-  )
-}
-
-export const TokenSelectorEmptySearchList = memo(_TokenSelectorEmptySearchList)
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx b/packages/uniswap/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
deleted file mode 100644
index d2998ced3e6..00000000000
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { memo, useMemo } from 'react'
-import { Trans, useTranslation } from 'react-i18next'
-import { Flex, Text } from 'ui/src'
-import { SectionHeader, TokenSelectorList } from 'uniswap/src/components/TokenSelector/TokenSelectorList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  OnSelectCurrency,
-  TokenSection,
-} from 'uniswap/src/components/TokenSelector/types'
-import { GqlResult } from 'uniswap/src/data/types'
-import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
-import { UniverseChainId } from 'uniswap/src/types/chains'
-
-function EmptyResults({ searchFilter }: { searchFilter: string }): JSX.Element {
-  const { t } = useTranslation()
-  return (
-    <Flex>
-      <SectionHeader title={t('tokens.selector.section.search')} />
-      <Text color="$neutral3" textAlign="center" variant="subheading2">
-        <Trans
-          components={{ highlight: <Text color="$neutral1" variant="subheading2" /> }}
-          i18nKey="tokens.selector.search.empty"
-          values={{ searchText: searchFilter }}
-        />
-      </Text>
-    </Flex>
-  )
-}
-
-function _TokenSelectorSearchResultsList({
-  addToSearchHistoryCallback,
-  onDismiss,
-  onSelectCurrency: parentOnSelectCurrency,
-  chainFilter,
-  searchFilter,
-  debouncedSearchFilter,
-  isBalancesOnlySearch,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
-  useTokenSectionsForSearchResultsHook,
-  useTokenWarningDismissedHook,
-}: {
-  onSelectCurrency: OnSelectCurrency
-  chainFilter: UniverseChainId | null
-  searchFilter: string
-  debouncedSearchFilter: string | null
-  isBalancesOnlySearch: boolean
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  addToSearchHistoryCallback: (currencyInfo: CurrencyInfo) => void
-  onDismiss: () => void
-  useTokenSectionsForSearchResultsHook: (
-    chainFilter: UniverseChainId | null,
-    searchFilter: string | null,
-    isBalancesOnlySearch: boolean,
-  ) => GqlResult<TokenSection[]>
-  useTokenWarningDismissedHook: (currencyId: Maybe<string>) => {
-    tokenWarningDismissed: boolean
-    dismissWarningCallback: () => void
-  }
-}): JSX.Element {
-  const { t } = useTranslation()
-  const {
-    data: sections,
-    loading,
-    error,
-    refetch,
-  } = useTokenSectionsForSearchResultsHook(chainFilter, debouncedSearchFilter, isBalancesOnlySearch)
-
-  const onSelectCurrency: OnSelectCurrency = (currencyInfo, section, index) => {
-    parentOnSelectCurrency(currencyInfo, section, index)
-    addToSearchHistoryCallback(currencyInfo)
-  }
-
-  const userIsTyping = Boolean(searchFilter && debouncedSearchFilter !== searchFilter)
-
-  const emptyElement = useMemo(
-    () => (debouncedSearchFilter ? <EmptyResults searchFilter={debouncedSearchFilter} /> : undefined),
-    [debouncedSearchFilter],
-  )
-  return (
-    <TokenSelectorList
-      showTokenAddress
-      chainFilter={chainFilter}
-      convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-      emptyElement={emptyElement}
-      errorText={t('token.selector.search.error')}
-      formatNumberOrStringCallback={formatNumberOrStringCallback}
-      hasError={Boolean(error)}
-      loading={userIsTyping || loading}
-      refetch={refetch}
-      sections={sections}
-      showTokenWarnings={true}
-      useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-      onDismiss={onDismiss}
-      onSelectCurrency={onSelectCurrency}
-    />
-  )
-}
-
-export const TokenSelectorSearchResultsList = memo(_TokenSelectorSearchResultsList)
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorSendList.tsx b/packages/uniswap/src/components/TokenSelector/TokenSelectorSendList.tsx
deleted file mode 100644
index 921df139281..00000000000
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorSendList.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { memo, useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Flex } from 'ui/src'
-import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
-import { SectionHeader, TokenSelectorList } from 'uniswap/src/components/TokenSelector/TokenSelectorList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  OnSelectCurrency,
-  TokenSection,
-  TokenSectionsForSend,
-} from 'uniswap/src/components/TokenSelector/types'
-import { getTokenOptionsSection } from 'uniswap/src/components/TokenSelector/utils'
-import { GqlResult } from 'uniswap/src/data/types'
-import { FeatureFlags } from 'uniswap/src/features/gating/flags'
-import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
-
-function useTokenSectionsForSend({
-  activeAccountAddress,
-  chainFilter,
-  usePortfolioTokenOptionsHook,
-}: TokenSectionsForSend): GqlResult<TokenSection[]> {
-  const { t } = useTranslation()
-
-  const {
-    data: portfolioTokenOptions,
-    error: portfolioTokenOptionsError,
-    refetch: refetchPortfolioTokenOptions,
-    loading: portfolioTokenOptionsLoading,
-  } = usePortfolioTokenOptionsHook(activeAccountAddress, chainFilter)
-
-  const loading = portfolioTokenOptionsLoading
-  const error = !portfolioTokenOptions && portfolioTokenOptionsError
-
-  const sections = useMemo(
-    () => getTokenOptionsSection(t('tokens.selector.section.yours'), portfolioTokenOptions),
-    [portfolioTokenOptions, t],
-  )
-
-  return useMemo(
-    () => ({
-      data: sections,
-      loading,
-      error: error || undefined,
-      refetch: refetchPortfolioTokenOptions,
-    }),
-    [error, loading, refetchPortfolioTokenOptions, sections],
-  )
-}
-
-function EmptyList({ onEmptyActionPress }: { onEmptyActionPress?: () => void }): JSX.Element {
-  const { t } = useTranslation()
-  // This flag is enabled only for supported countries.
-  const forAggregatorEnabled = useFeatureFlag(FeatureFlags.ForAggregator)
-
-  return (
-    <Flex>
-      <SectionHeader title={t('tokens.selector.section.yours')} />
-      <Flex pt="$spacing16" px="$spacing16">
-        <BaseCard.EmptyState
-          buttonLabel={
-            forAggregatorEnabled && onEmptyActionPress
-              ? t('tokens.selector.empty.buy.title')
-              : t('tokens.selector.empty.receive.title')
-          }
-          description={
-            forAggregatorEnabled ? t('tokens.selector.empty.buy.message') : t('tokens.selector.empty.receive.message')
-          }
-          title={t('tokens.selector.empty.title')}
-          onPress={onEmptyActionPress}
-        />
-      </Flex>
-    </Flex>
-  )
-}
-
-function _TokenSelectorSendList({
-  onDismiss,
-  onSelectCurrency,
-  activeAccountAddress,
-  chainFilter,
-  onEmptyActionPress,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
-  usePortfolioTokenOptionsHook,
-  useTokenWarningDismissedHook,
-}: TokenSectionsForSend & {
-  onSelectCurrency: OnSelectCurrency
-  onEmptyActionPress: () => void
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  onDismiss: () => void
-  useTokenWarningDismissedHook: (currencyId: Maybe<string>) => {
-    tokenWarningDismissed: boolean
-    dismissWarningCallback: () => void
-  }
-}): JSX.Element {
-  const {
-    data: sections,
-    loading,
-    error,
-    refetch,
-  } = useTokenSectionsForSend({
-    activeAccountAddress,
-    chainFilter,
-    usePortfolioTokenOptionsHook,
-  })
-  const emptyElement = useMemo(() => <EmptyList onEmptyActionPress={onEmptyActionPress} />, [onEmptyActionPress])
-
-  return (
-    <TokenSelectorList
-      chainFilter={chainFilter}
-      convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-      emptyElement={emptyElement}
-      formatNumberOrStringCallback={formatNumberOrStringCallback}
-      hasError={Boolean(error)}
-      loading={loading}
-      refetch={refetch}
-      sections={sections}
-      showTokenWarnings={false}
-      useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-      onDismiss={onDismiss}
-      onSelectCurrency={onSelectCurrency}
-    />
-  )
-}
-
-export const TokenSelectorSendList = memo(_TokenSelectorSendList)
diff --git a/packages/uniswap/src/components/TokenSelector/types.ts b/packages/uniswap/src/components/TokenSelector/types.ts
index 935d3501a7f..c92646d96ba 100644
--- a/packages/uniswap/src/components/TokenSelector/types.ts
+++ b/packages/uniswap/src/components/TokenSelector/types.ts
@@ -1,8 +1,4 @@
-import { GqlResult } from 'uniswap/src/data/types'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
-import { UniverseChainId } from 'uniswap/src/types/chains'
-import { FiatNumberType } from 'utilities/src/format/types'
 
 export type TokenOption = {
   currencyInfo: CurrencyInfo
@@ -10,24 +6,6 @@ export type TokenOption = {
   balanceUSD: Maybe<number>
 }
 
-export type TokenOptionsHookType = (
-  address: string,
-  chainFilter: UniverseChainId | null,
-  searchFilter?: string,
-) => GqlResult<TokenOption[] | undefined>
-
-export type TokenOptionsWithChainFilterHookType = (
-  address: string,
-  chainFilter: UniverseChainId,
-  searchFilter?: string,
-) => GqlResult<TokenOption[] | undefined>
-
-export type TokenOptionsWithBalanceOnlySearchHookType = (
-  chainFilter: UniverseChainId | null,
-  searchFilter: string | null,
-  isBalancesOnlySearch: boolean,
-) => GqlResult<TokenSection[]>
-
 export type OnSelectCurrency = (
   currency: CurrencyInfo,
   section: SuggestedTokenSection | TokenSection,
@@ -47,51 +25,3 @@ export type SuggestedTokenSection = {
 }
 
 export type TokenSelectorListSections = Array<SuggestedTokenSection | TokenSection>
-
-export type TokenWarningDismissedHook = (currencyId: Maybe<string>) => {
-  tokenWarningDismissed: boolean
-  dismissWarningCallback: () => void
-}
-
-export type TokenSectionsForSwap = {
-  activeAccountAddress: string
-  chainFilter: UniverseChainId | null
-  usePopularTokensOptionsHook: (address: string, chainFilter: UniverseChainId) => GqlResult<TokenOption[] | undefined>
-  usePortfolioTokenOptionsHook: (
-    address: string,
-    chainFilter: UniverseChainId | null,
-    searchFilter?: string | undefined,
-  ) => GqlResult<TokenOption[] | undefined>
-}
-
-export type TokenSectionsForSwapInput = TokenSectionsForSwap
-
-export type TokenSectionsForSwapOutput = Omit<TokenSectionsForSwap, 'usePortfolioTokenOptionsHook'> & {
-  useFavoriteTokensOptionsHook: (
-    address: string,
-    chainFilter: UniverseChainId | null,
-  ) => GqlResult<TokenOption[] | undefined>
-  useCommonTokensOptionsHook: (
-    address: string,
-    chainFilter: UniverseChainId | null,
-  ) => GqlResult<TokenOption[] | undefined>
-}
-
-export type TokenSectionsForSend = Omit<TokenSectionsForSwap, 'usePopularTokensOptionsHook'>
-
-export type ConvertFiatAmountFormattedCallback = (
-  fromAmount: Maybe<string | number>,
-  numberType: FiatNumberType,
-  placeholder?: string | undefined,
-) => string
-
-export type FilterCallbacksHookType = (
-  chainId: UniverseChainId | null,
-  flow: TokenSelectorFlow,
-) => {
-  chainFilter: UniverseChainId | null
-  searchFilter: string | null
-  onChangeChainFilter: (newChainFilter: UniverseChainId | null) => void
-  onClearSearchFilter: () => void
-  onChangeText: (newSearchFilter: string) => void
-}
diff --git a/packages/uniswap/src/components/ViewGestureHandler/index.native.tsx b/packages/uniswap/src/components/ViewGestureHandler/index.native.tsx
deleted file mode 100644
index 9fe6e59d783..00000000000
--- a/packages/uniswap/src/components/ViewGestureHandler/index.native.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { PropsWithChildren } from 'react'
-import { NativeViewGestureHandler } from 'react-native-gesture-handler'
-
-function ViewGestureHandler({ children }: PropsWithChildren<unknown>): JSX.Element {
-  return <NativeViewGestureHandler>{children}</NativeViewGestureHandler>
-}
-
-export default ViewGestureHandler
diff --git a/packages/uniswap/src/components/ViewGestureHandler/index.tsx b/packages/uniswap/src/components/ViewGestureHandler/index.tsx
deleted file mode 100644
index ce973691d87..00000000000
--- a/packages/uniswap/src/components/ViewGestureHandler/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { PropsWithChildren } from 'react'
-import { NotImplementedError } from 'utilities/src/errors'
-
-function ViewGestureHandler(_props: PropsWithChildren<unknown>): JSX.Element {
-  throw new NotImplementedError('See `.native.tsx` and `.web.tsx` files.')
-}
-
-export default ViewGestureHandler
diff --git a/packages/uniswap/src/components/ViewGestureHandler/index.web.tsx b/packages/uniswap/src/components/ViewGestureHandler/index.web.tsx
deleted file mode 100644
index a4a1bc17540..00000000000
--- a/packages/uniswap/src/components/ViewGestureHandler/index.web.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { PropsWithChildren } from 'react'
-
-function ViewGestureHandler({ children }: PropsWithChildren<unknown>): JSX.Element {
-  return <>{children}</>
-}
-
-export default ViewGestureHandler
diff --git a/packages/uniswap/src/components/modals/hooks.ts b/packages/uniswap/src/components/modals/hooks.ts
deleted file mode 100644
index 3da77252a44..00000000000
--- a/packages/uniswap/src/components/modals/hooks.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { NotImplementedError } from 'utilities/src/errors'
-
-export function useBottomSheetFocusHook(): () => void {
-  throw new NotImplementedError('See `.native.tsx` and `web.tsx` files.')
-}
diff --git a/packages/uniswap/src/components/modals/hooks.web.ts b/packages/uniswap/src/components/modals/hooks.web.ts
deleted file mode 100644
index 90472d9b363..00000000000
--- a/packages/uniswap/src/components/modals/hooks.web.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function useBottomSheetFocusHook(): () => void {
-  return () => {}
-}
diff --git a/packages/uniswap/src/config.ts b/packages/uniswap/src/config.ts
index 9ff6f04fdc1..13d6208a6a0 100644
--- a/packages/uniswap/src/config.ts
+++ b/packages/uniswap/src/config.ts
@@ -5,6 +5,9 @@ import {
   FIREBASE_APP_CHECK_DEBUG_TOKEN,
   INFURA_KEY,
   INFURA_PROJECT_ID,
+  MOONPAY_API_KEY,
+  MOONPAY_API_URL,
+  MOONPAY_WIDGET_API_URL,
   ONESIGNAL_APP_ID,
   QUICKNODE_ARBITRUM_RPC_URL,
   QUICKNODE_BNB_RPC_URL,
@@ -24,6 +27,9 @@ import { isNonJestDev } from 'utilities/src/environment/constants'
 export interface Config {
   appsflyerApiKey: string
   appsflyerAppId: string
+  moonpayApiKey: string
+  moonpayApiUrl: string
+  moonpayWidgetApiUrl: string
   uniswapApiKey: string
   infuraKey: string
   infuraProjectId: string
@@ -55,6 +61,9 @@ export interface Config {
 const _config: Config = {
   appsflyerApiKey: process.env.APPSFLYER_API_KEY || APPSFLYER_API_KEY,
   appsflyerAppId: process.env.APPSFLYER_APP_ID || APPSFLYER_APP_ID,
+  moonpayApiKey: process.env.REACT_APP_MOONPAY_PUBLISHABLE_KEY || process.env.MOONPAY_API_KEY || MOONPAY_API_KEY,
+  moonpayApiUrl: process.env.REACT_APP_MOONPAY_API || process.env.MOONPAY_API_URL || MOONPAY_API_URL,
+  moonpayWidgetApiUrl: process.env.MOONPAY_WIDGET_API_URL || MOONPAY_WIDGET_API_URL,
   uniswapApiKey: process.env.UNISWAP_API_KEY || UNISWAP_API_KEY,
   infuraKey: process.env.REACT_APP_INFURA_KEY || INFURA_KEY,
   infuraProjectId: process.env.INFURA_PROJECT_ID || INFURA_PROJECT_ID,
diff --git a/packages/uniswap/src/constants/addresses.ts b/packages/uniswap/src/constants/addresses.ts
index 0ea518cbd56..e2ccfa3ac85 100644
--- a/packages/uniswap/src/constants/addresses.ts
+++ b/packages/uniswap/src/constants/addresses.ts
@@ -1,5 +1,5 @@
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
-import { WalletChainId } from 'uniswap/src/types/chains'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 
 const MATIC_MAINNET_ADDRESS = '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0'
 const MATIC_BNB_ADDRESS = '0xcc42724c6683b7e57334c4e856f4c9965ed682bd'
@@ -28,3 +28,8 @@ export function getNativeAddress(chainId: WalletChainId): string {
 export function getWrappedNativeAddress(chainId: WalletChainId): string {
   return UNIVERSE_CHAIN_INFO[chainId].wrappedNativeCurrency.address
 }
+
+export const UNI_ADDRESS = {
+  [UniverseChainId.Mainnet]: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+  [UniverseChainId.Goerli]: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+}
diff --git a/packages/uniswap/src/constants/chains.ts b/packages/uniswap/src/constants/chains.ts
index 5c20c5e3201..897c218469a 100644
--- a/packages/uniswap/src/constants/chains.ts
+++ b/packages/uniswap/src/constants/chains.ts
@@ -52,7 +52,7 @@ import {
   UniverseChainId,
   UniverseChainInfo,
 } from 'uniswap/src/types/chains'
-import { isInterface } from 'utilities/src/platform'
+import { isWeb } from 'utilities/src/platform'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
 import {
   arbitrum,
@@ -80,7 +80,40 @@ export const DEFAULT_RETRY_OPTIONS: RetryOptions = { n: 10, minWait: 250, maxWai
 
 export const DEFAULT_MS_BEFORE_WARNING = ONE_MINUTE_MS * 10
 
-export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
+export const ETHEREUM_CHAIN_IDS = [UniverseChainId.Mainnet, UniverseChainId.Goerli, UniverseChainId.Sepolia] as const
+
+type EthereumChainId = (typeof ETHEREUM_CHAIN_IDS)[number]
+
+export const L2_CHAIN_IDS = [
+  UniverseChainId.ArbitrumOne,
+  UniverseChainId.ArbitrumGoerli,
+  UniverseChainId.Avalanche,
+  UniverseChainId.Base,
+  UniverseChainId.Celo,
+  UniverseChainId.CeloAlfajores,
+  UniverseChainId.Optimism,
+  UniverseChainId.OptimismGoerli,
+  UniverseChainId.Polygon,
+  UniverseChainId.PolygonMumbai,
+  UniverseChainId.Bnb,
+  UniverseChainId.Blast,
+  UniverseChainId.Zora,
+  UniverseChainId.Zksync,
+] as const
+
+export type L2ChainId = (typeof L2_CHAIN_IDS)[number]
+
+export type L1ChainInfo = UniverseChainInfo
+export interface L2ChainInfo extends L1ChainInfo {
+  readonly bridge: string
+  readonly statusPage?: string
+}
+
+export type ChainInfo = {
+  readonly [chainId in L2ChainId]: L2ChainInfo
+} & { readonly [chainId in EthereumChainId]: L1ChainInfo }
+
+export const UNIVERSE_CHAIN_INFO: ChainInfo = {
   [UniverseChainId.Mainnet]: {
     ...mainnet,
     id: UniverseChainId.Mainnet,
@@ -93,7 +126,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       nativeTokenBackendAddress: undefined,
     },
     blockPerMainnetEpochForChainId: 1,
-    blockWaitMsBeforeWarning: isInterface ? DEFAULT_MS_BEFORE_WARNING : ONE_MINUTE_MS,
+    blockWaitMsBeforeWarning: isWeb ? DEFAULT_MS_BEFORE_WARNING : ONE_MINUTE_MS,
     bridge: undefined,
     chainPriority: 0,
     docs: 'https://docs.uniswap.org/',
@@ -210,7 +243,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L1ChainInfo,
   [UniverseChainId.Goerli]: {
     ...goerli,
     id: UniverseChainId.Goerli,
@@ -223,7 +256,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       nativeTokenBackendAddress: undefined,
     },
     blockPerMainnetEpochForChainId: 1,
-    blockWaitMsBeforeWarning: isInterface ? DEFAULT_MS_BEFORE_WARNING : 180000, // 3 minutes
+    blockWaitMsBeforeWarning: isWeb ? DEFAULT_MS_BEFORE_WARNING : 180000, // 3 minutes
     bridge: undefined,
     chainPriority: 0,
     docs: 'https://docs.uniswap.org/',
@@ -272,7 +305,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L1ChainInfo,
   [UniverseChainId.ArbitrumOne]: {
     ...arbitrum,
     id: UniverseChainId.ArbitrumOne,
@@ -330,7 +363,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.ArbitrumGoerli]: {
     ...arbitrumGoerli,
     id: UniverseChainId.ArbitrumGoerli,
@@ -384,7 +417,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Optimism]: {
     ...optimism,
     id: UniverseChainId.Optimism,
@@ -397,7 +430,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       nativeTokenBackendAddress: undefined,
     },
     blockPerMainnetEpochForChainId: 6,
-    blockWaitMsBeforeWarning: isInterface ? 1500000 : 1200000,
+    blockWaitMsBeforeWarning: isWeb ? 1500000 : 1200000,
     bridge: 'https://app.optimism.io/bridge',
     chainPriority: 2,
     docs: 'https://optimism.io/',
@@ -440,7 +473,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x4200000000000000000000000000000000000006',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Base]: {
     ...base,
     id: UniverseChainId.Base,
@@ -452,7 +485,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       nativeTokenBackendAddress: undefined,
     },
     blockPerMainnetEpochForChainId: 6,
-    blockWaitMsBeforeWarning: isInterface ? 1500000 : 600000,
+    blockWaitMsBeforeWarning: isWeb ? 1500000 : 600000,
     bridge: 'https://bridge.base.org/deposit',
     chainPriority: 4,
     docs: 'https://docs.base.org/docs/',
@@ -496,7 +529,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x4200000000000000000000000000000000000006',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.OptimismGoerli]: {
     ...optimismGoerli,
     id: UniverseChainId.OptimismGoerli,
@@ -550,7 +583,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x4200000000000000000000000000000000000006',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Bnb]: {
     ...bsc,
     sdkId: UniswapSDKChainId.BNB,
@@ -605,7 +638,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L1ChainInfo,
   [UniverseChainId.Polygon]: {
     ...polygon,
     id: UniverseChainId.Polygon,
@@ -660,7 +693,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.PolygonMumbai]: {
     ...polygonMumbai,
     id: UniverseChainId.PolygonMumbai,
@@ -714,7 +747,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x9c3c9283d3e44854697cd22d3faa240cfb032889',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Blast]: {
     ...blast,
     id: UniverseChainId.Blast,
@@ -768,7 +801,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x4300000000000000000000000000000000000004',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Avalanche]: {
     ...avalanche,
     id: UniverseChainId.Avalanche,
@@ -818,7 +851,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Celo]: {
     ...celo,
     id: UniverseChainId.Celo,
@@ -873,7 +906,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x471EcE3750Da237f93B8E339c536989b8978a438',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.CeloAlfajores]: {
     ...celoAlfajores,
     id: UniverseChainId.CeloAlfajores,
@@ -927,7 +960,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x2DEf4285787d58a2f811AF24755A8150622f4361',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Zora]: {
     ...zora,
     id: UniverseChainId.Zora,
@@ -980,7 +1013,7 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x4200000000000000000000000000000000000006',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
   [UniverseChainId.Zksync]: {
     ...zkSync,
     id: UniverseChainId.Zksync,
@@ -1034,5 +1067,5 @@ export const UNIVERSE_CHAIN_INFO: Record<UniverseChainId, UniverseChainInfo> = {
       decimals: 18,
       address: '0x5AEa5775959fBC2557Cc8789bC1bf90A239D9a91',
     },
-  } as const satisfies UniverseChainInfo,
+  } as const satisfies L2ChainInfo,
 }
diff --git a/packages/uniswap/src/constants/misc.ts b/packages/uniswap/src/constants/misc.ts
index 31cf15a1c83..c24d6dbef9b 100644
--- a/packages/uniswap/src/constants/misc.ts
+++ b/packages/uniswap/src/constants/misc.ts
@@ -7,4 +7,6 @@ export enum PollingInterval {
   KindaFast = 30 * ONE_SECOND_MS,
   Fast = 15 * ONE_SECOND_MS, // slightly higher than block times for mainnet
   LightningMcQueen = 6 * ONE_SECOND_MS, // slightly higher than block times for polygon
+  AverageL2BlockTime = 3 * ONE_SECOND_MS,
+  AverageL1BlockTime = 12 * ONE_SECOND_MS,
 }
diff --git a/packages/uniswap/src/constants/tokens.ts b/packages/uniswap/src/constants/tokens.ts
index 5dfb2a7b979..887f06f3c40 100644
--- a/packages/uniswap/src/constants/tokens.ts
+++ b/packages/uniswap/src/constants/tokens.ts
@@ -1,4 +1,4 @@
-import { Token, UNI_ADDRESSES } from '@uniswap/sdk-core'
+import { Token } from '@uniswap/sdk-core'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 
 export const USDC_MAINNET = new Token(
@@ -168,71 +168,10 @@ export const USDC_ZORA = new Token(
   'USDC',
   'USD Coin',
 )
-
-export const USDC = new Token(
-  UniverseChainId.Mainnet,
-  '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-  6,
-  'USDC',
-  'USD//C',
-)
-
-export const USDBC_BASE = new Token(
-  UniverseChainId.Base,
-  '0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca',
-  6,
-  'USDbC',
-  'USD Base Coin',
-)
-export const USDT_BNB = new Token(
-  UniverseChainId.Bnb,
-  '0x55d398326f99059ff775485246999027b3197955',
-  18,
-  'USDT',
-  'TetherUSD',
-)
-
-export const USDB = new Token(UniverseChainId.Blast, '0x4300000000000000000000000000000000000003', 18, 'USDB', 'USDB')
-
-export const CUSD = new Token(UniverseChainId.Celo, '0x765de816845861e75a25fca122bb6898b8b1282a', 18, 'CUSD', 'CUSD')
-
-export const USDzC = new Token(
-  UniverseChainId.Zora,
-  '0xCccCCccc7021b32EBb4e8C08314bD62F7c653EC4',
-  6,
-  'USDzC',
-  'USD Coin',
-)
-
 export const USDC_ZKSYNC = new Token(
   UniverseChainId.Zksync,
   '0x1d17CBcF0D6D143135aE902365D2E5e2A16538D4',
   6,
   'USDC',
-  'USDC',
-)
-
-export const WBTC = new Token(
-  UniverseChainId.Mainnet,
-  '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-  8,
-  'WBTC',
-  'Wrapped BTC',
+  'USD Coin',
 )
-
-export const UNI = {
-  [UniverseChainId.Mainnet]: new Token(
-    UniverseChainId.Mainnet,
-    UNI_ADDRESSES[UniverseChainId.Mainnet] as string,
-    18,
-    'UNI',
-    'Uniswap',
-  ),
-  [UniverseChainId.Goerli]: new Token(
-    UniverseChainId.Goerli,
-    UNI_ADDRESSES[UniverseChainId.Goerli] as string,
-    18,
-    'UNI',
-    'Uniswap',
-  ),
-}
diff --git a/packages/uniswap/src/constants/urls.ts b/packages/uniswap/src/constants/urls.ts
index 29b286b8613..8383cc50c5e 100644
--- a/packages/uniswap/src/constants/urls.ts
+++ b/packages/uniswap/src/constants/urls.ts
@@ -35,8 +35,8 @@ export const uniswapUrls = {
     limitsFailure: `${helpUrl}/articles/24300813697933-Why-did-my-limit-order-fail-or-not-execute`,
     limitsInfo: `${helpUrl}/sections/24372644881293`,
     limitsNetworkSupport: `${helpUrl}/articles/24470251716237-What-networks-do-limits-support`,
+    moonpayHelp: `${helpUrl}/articles/11306574799117-How-to-use-Moon-Pay-on-the-Uniswap-web-app-`,
     fiatOnRampHelp: `${helpUrl}/articles/11306574799117`,
-    transferCryptoHelp: `${helpUrl}/articles/27103878635661-How-to-transfer-crypto-from-a-Robinhood-or-Coinbase-account-to-the-Uniswap-Wallet`,
     moonpayRegionalAvailability: `${helpUrl}/articles/11306664890381-Why-isn-t-MoonPay-available-in-my-region-`,
     networkFeeInfo: `${helpUrl}/articles/8370337377805-What-is-a-network-fee-`,
     recoveryPhraseHowToImport: `${helpUrl}/articles/11380692567949-How-to-import-a-recovery-phrase-into-the-Uniswap-Wallet`,
diff --git a/packages/uniswap/src/data/graphql/uniswap-data-api/schema.graphql b/packages/uniswap/src/data/graphql/uniswap-data-api/schema.graphql
index fba96251c8b..bc49540a27c 100644
--- a/packages/uniswap/src/data/graphql/uniswap-data-api/schema.graphql
+++ b/packages/uniswap/src/data/graphql/uniswap-data-api/schema.graphql
@@ -2,12 +2,15 @@
 directive @defer on FIELD
 
 """
-Tells the service this field/object has access authorized by a Cognito User Pools token.
+Tells the service this field/object has access authorized by an OIDC token.
 """
-directive @aws_cognito_user_pools(
+directive @aws_oidc on OBJECT | FIELD_DEFINITION
+
+"""Directs the schema to enforce authorization on a field"""
+directive @aws_auth(
   """List of cognito user pool groups which have access on this field"""
   cognito_groups: [String]
-) on OBJECT | FIELD_DEFINITION
+) on FIELD_DEFINITION
 
 """
 Tells the service this field/object has access authorized by an API key.
@@ -25,21 +28,12 @@ Tells the service this field/object has access authorized by sigv4 signing.
 directive @aws_iam on OBJECT | FIELD_DEFINITION
 
 """
-Tells the service which subscriptions will be published to when this mutation is
-called. This directive is deprecated use @aws_susbscribe directive instead.
+Tells the service this field/object has access authorized by a Cognito User Pools token.
 """
-directive @aws_publish(
-  """
-  List of subscriptions which will be published to when this mutation is called.
-  """
-  subscriptions: [String]
-) on FIELD_DEFINITION
-
-"""Directs the schema to enforce authorization on a field"""
-directive @aws_auth(
+directive @aws_cognito_user_pools(
   """List of cognito user pool groups which have access on this field"""
   cognito_groups: [String]
-) on FIELD_DEFINITION
+) on OBJECT | FIELD_DEFINITION
 
 """Tells the service which mutation triggers this subscription."""
 directive @aws_subscribe(
@@ -50,9 +44,15 @@ directive @aws_subscribe(
 ) on FIELD_DEFINITION
 
 """
-Tells the service this field/object has access authorized by an OIDC token.
+Tells the service which subscriptions will be published to when this mutation is
+called. This directive is deprecated use @aws_susbscribe directive instead.
 """
-directive @aws_oidc on OBJECT | FIELD_DEFINITION
+directive @aws_publish(
+  """
+  List of subscriptions which will be published to when this mutation is called.
+  """
+  subscriptions: [String]
+) on FIELD_DEFINITION
 
 """
   Types, unions, and inputs (alphabetized):
@@ -823,7 +823,6 @@ type OnRampTransfer {
   sourceAmount: Float!
   serviceProvider: OnRampServiceProvider!
   transactionReferenceId: String!
-  externalSessionId: String!
   networkFee: Float
   transactionFee: Float
   totalFee: Float
@@ -923,7 +922,7 @@ type Portfolio {
 
   """  TODO: (michael.zhang) replace with paginated query"""
   nftBalances: [NftBalance]
-  assetActivities(page: Int, pageSize: Int, includeOffChain: Boolean, onRampTransactionsAuth: OnRampTransactionsAuth, onRampTransactionIDs: [String!], chains: [Chain!], _fs: AssetActivitySwitch): [AssetActivity]
+  assetActivities(page: Int, pageSize: Int, includeOffChain: Boolean, onRampTransactionsAuth: OnRampTransactionsAuth, chains: [Chain!], _fs: AssetActivitySwitch): [AssetActivity]
 }
 
 """  Specify how the portfolio value should be calculated for each `ownerAddress`.
diff --git a/packages/uniswap/src/data/graphql/uniswap-data-api/web/activity.graphql b/packages/uniswap/src/data/graphql/uniswap-data-api/web/activity.graphql
index c1ed73a4fd5..36a76f98454 100644
--- a/packages/uniswap/src/data/graphql/uniswap-data-api/web/activity.graphql
+++ b/packages/uniswap/src/data/graphql/uniswap-data-api/web/activity.graphql
@@ -67,29 +67,6 @@ fragment TokenTransferParts on TokenTransfer {
   }
 }
 
-fragment OnRampTransferParts on OnRampTransfer {
-  id
-  token {
-    ...SimpleTokenDetails
-  }
-  tokenStandard
-  amount
-  sourceCurrency
-  sourceAmount
-  serviceProvider {
-    serviceProvider
-    name
-    url
-    logoLightUrl
-    logoDarkUrl
-  }
-  transactionReferenceId
-  externalSessionId
-  networkFee
-  transactionFee
-  totalFee
-}
-
 fragment TokenApprovalParts on TokenApproval {
   id
   asset {
@@ -154,33 +131,6 @@ fragment TransactionDetailsParts on TransactionDetails {
     ... on NftApproveForAll {
       ...NFTApproveForAllParts
     }
-    ... on OnRampTransfer {
-      ...OnRampTransferParts
-    }
-  }
-}
-
-fragment OnRampTransactionDetailsParts on OnRampTransactionDetails {
-  id
-  status
-  receiverAddress
-  onRampTransfer {
-    id
-    token {
-      ...SimpleTokenDetails
-    }
-    amount
-    sourceCurrency
-    sourceAmount
-    serviceProvider {
-      serviceProvider
-      name
-      url
-      logoLightUrl
-      logoDarkUrl
-    }
-    transactionReferenceId
-    externalSessionId
   }
 }
 
@@ -214,16 +164,13 @@ fragment AssetActivityParts on AssetActivity {
     ... on SwapOrderDetails {
       ...SwapOrderDetailsParts
     }
-    ... on OnRampTransactionDetails {
-      ...OnRampTransactionDetailsParts
-    }
   }
 }
 
-query ActivityWeb($account: String!, $chains: [Chain!]!, $onRampTransactionIDs: [String!]) {
+query ActivityWeb($account: String!, $chains: [Chain!]!) {
   portfolios(ownerAddresses: [$account], chains: $chains) {
     id
-    assetActivities(pageSize: 100, page: 1, includeOffChain: true, chains: $chains, onRampTransactionIDs: $onRampTransactionIDs) {
+    assetActivities(pageSize: 100, page: 1, includeOffChain: true, chains: $chains) {
       ...AssetActivityParts
     }
   }
diff --git a/packages/uniswap/src/features/chains/utils.test.ts b/packages/uniswap/src/features/chains/utils.test.ts
index 9de7fa8cf11..51922191222 100644
--- a/packages/uniswap/src/features/chains/utils.test.ts
+++ b/packages/uniswap/src/features/chains/utils.test.ts
@@ -61,7 +61,9 @@ describe(getPollingIntervalByBlocktime, () => {
   })
 
   it('returns the correct value for L2', () => {
-    expect(getPollingIntervalByBlocktime(UniverseChainId.Polygon)).toEqual(PollingInterval.LightningMcQueen)
+    expect(getPollingIntervalByBlocktime(UniverseChainId.Polygon)).toEqual(
+      PollingInterval.LightningMcQueen
+    )
   })
 })
 
diff --git a/packages/uniswap/src/features/chains/utils.ts b/packages/uniswap/src/features/chains/utils.ts
index 983711d86f2..73d5c9b4510 100644
--- a/packages/uniswap/src/features/chains/utils.ts
+++ b/packages/uniswap/src/features/chains/utils.ts
@@ -1,9 +1,9 @@
 import { BigNumber, BigNumberish } from '@ethersproject/bignumber'
 import { ChainId } from '@uniswap/sdk-core'
-import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { L2ChainId, L2_CHAIN_IDS } from 'uniswap/src/constants/chains'
 import { PollingInterval } from 'uniswap/src/constants/misc'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { NetworkLayer, UniverseChainId, WALLET_SUPPORTED_CHAIN_IDS, WalletChainId } from 'uniswap/src/types/chains'
+import { UniverseChainId, WALLET_SUPPORTED_CHAIN_IDS, WalletChainId } from 'uniswap/src/types/chains'
 import { isTestEnv } from 'utilities/src/environment'
 
 export function toGraphQLChain(chainId: ChainId | number): Chain | undefined {
@@ -66,13 +66,8 @@ export function hexadecimalStringToInt(hex: string): number {
   return parseInt(hex, 16)
 }
 
-export function isL2ChainId(chainId?: UniverseChainId): boolean {
-  return chainId !== undefined && UNIVERSE_CHAIN_INFO[chainId].networkLayer === NetworkLayer.L2
-}
-
-export function isMainnetChainId(chainId?: UniverseChainId): boolean {
-  return chainId === UniverseChainId.Mainnet
-}
+export const isL2Chain = (chainId?: UniverseChainId): boolean =>
+  Boolean(chainId && L2_CHAIN_IDS.includes(chainId as L2ChainId))
 
 export function fromGraphQLChain(chain: Chain | undefined): WalletChainId | null {
   switch (chain) {
@@ -106,7 +101,7 @@ export function fromGraphQLChain(chain: Chain | undefined): WalletChainId | null
 }
 
 export function getPollingIntervalByBlocktime(chainId?: WalletChainId): PollingInterval {
-  return isMainnetChainId(chainId) ? PollingInterval.Fast : PollingInterval.LightningMcQueen
+  return isL2Chain(chainId) ? PollingInterval.LightningMcQueen : PollingInterval.Fast
 }
 
 export function fromMoonpayNetwork(moonpayNetwork: string | undefined): WalletChainId | undefined {
diff --git a/packages/uniswap/src/features/fiatOnRamp/FORQuoteItem.tsx b/packages/uniswap/src/features/fiatOnRamp/FORQuoteItem.tsx
index b3c12d633bb..43043458ece 100644
--- a/packages/uniswap/src/features/fiatOnRamp/FORQuoteItem.tsx
+++ b/packages/uniswap/src/features/fiatOnRamp/FORQuoteItem.tsx
@@ -1,7 +1,6 @@
-import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Loader, Text, TouchableArea, UniversalImage, useIsDarkMode } from 'ui/src'
-import { borderRadii, iconSizes } from 'ui/src/theme'
+import { iconSizes } from 'ui/src/theme'
 import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
 import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
 import { concatStrings } from 'utilities/src/primitives/string'
@@ -13,18 +12,13 @@ function LogoLoader(): JSX.Element {
 export function FORQuoteItem({
   serviceProvider,
   onPress,
-  hoverIcon,
-  isLoading,
 }: {
   serviceProvider: FORServiceProvider | undefined
   onPress: () => void
-  hoverIcon?: JSX.Element
-  isLoading?: boolean
 }): JSX.Element | null {
   const { t } = useTranslation()
   const isDarkMode = useIsDarkMode()
   const logoUrl = getOptionalServiceProviderLogo(serviceProvider?.logos, isDarkMode)
-  const [hovered, setHovered] = useState(false)
 
   if (!serviceProvider) {
     return null
@@ -35,75 +29,51 @@ export function FORQuoteItem({
       ? concatStrings(
           [
             serviceProvider.paymentMethods.slice(0, 3).join(', ') + ',', // oxford comma
-            (t('fiatOnRamp.quote.type.other') as string).toLowerCase(),
+            t('fiatOnRamp.quote.type.other'),
           ],
           t('common.endAdornment'),
         )
       : serviceProvider.paymentMethods.join(', ')
 
   return (
-    <TouchableArea
-      disabled={isLoading}
-      disabledStyle={{
-        cursor: 'wait',
-      }}
-      onMouseEnter={() => setHovered(!isLoading)}
-      onMouseLeave={() => setHovered(false)}
-      onPress={isLoading ? undefined : onPress}
-    >
+    <TouchableArea onPress={onPress}>
       <Flex
-        $theme-dark={{
-          shadowOpacity: 0.12,
-          shadowRadius: '$spacing4',
-        }}
-        $theme-light={{
-          shadowOpacity: 0.02,
-          shadowRadius: '$spacing8',
-        }}
         backgroundColor="$surface1"
         borderColor="$surface3"
         borderRadius="$rounded20"
         borderWidth="$spacing1"
-        hoverStyle={{ backgroundColor: '$surface1Hovered' }}
         pl="$spacing16"
         pr="$spacing8"
         py="$spacing16"
-        // TODO(MOB-3699): replace with shadow preset once available.
-        shadowColor="$black"
-        shadowOffset={{ height: 1, width: 0 }}
-        style={{ transition: 'background-color 0.2s ease-in-out' }}
+        shadowColor="$neutral3"
+        shadowOpacity={0.4}
+        shadowRadius={!isDarkMode ? '$spacing4' : undefined}
       >
-        <Flex row alignItems="center" justifyContent="space-between">
-          <Flex row alignItems="center" gap="$spacing12" maxWidth="calc(100% - 48px)">
-            <Flex>
-              {logoUrl ? (
-                <UniversalImage
-                  fallback={<LogoLoader />}
-                  size={{
-                    height: iconSizes.icon40,
-                    width: iconSizes.icon40,
-                  }}
-                  style={{
-                    image: { borderRadius: borderRadii.rounded8 },
-                  }}
-                  uri={logoUrl}
-                />
-              ) : (
-                <LogoLoader />
-              )}
-            </Flex>
-            <Flex shrink>
-              <Text color="$neutral1" variant="subheading2">
-                {serviceProvider.name}
+        <Flex row alignItems="center" gap="$spacing12">
+          <Flex>
+            {logoUrl ? (
+              <UniversalImage
+                fallback={<LogoLoader />}
+                size={{
+                  height: iconSizes.icon40,
+                  width: iconSizes.icon40,
+                }}
+                uri={logoUrl}
+              />
+            ) : (
+              <LogoLoader />
+            )}
+          </Flex>
+          <Flex shrink gap="$spacing4">
+            <Text color="$neutral1" variant="subheading2">
+              {serviceProvider.name}
+            </Text>
+            {paymentMethods && (
+              <Text color="$neutral2" variant="body4">
+                {paymentMethods}
               </Text>
-              {paymentMethods && (
-                <Text color="$neutral2" variant="body4">
-                  {paymentMethods}
-                </Text>
-              )}
-            </Flex>
+            )}
           </Flex>
-          {hovered && hoverIcon}
         </Flex>
       </Flex>
     </TouchableArea>
diff --git a/packages/uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx b/packages/uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
index 90a995c2923..9a80563f044 100644
--- a/packages/uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
+++ b/packages/uniswap/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
@@ -27,9 +27,6 @@ export function FiatOnRampCountryPicker({
         hapticFeedback
         backgroundColor="$surface3"
         borderRadius="$roundedFull"
-        hoverStyle={{
-          opacity: 0.5,
-        }}
         overflow="hidden"
         pl="$spacing8"
         pr="$spacing4"
diff --git a/packages/uniswap/src/features/fiatOnRamp/SelectTokenButton.tsx b/packages/uniswap/src/features/fiatOnRamp/SelectTokenButton.tsx
index 589055ffe26..42195050db6 100644
--- a/packages/uniswap/src/features/fiatOnRamp/SelectTokenButton.tsx
+++ b/packages/uniswap/src/features/fiatOnRamp/SelectTokenButton.tsx
@@ -28,6 +28,7 @@ export function SelectTokenButton({
   loading,
   iconSize = iconSizes.icon24,
   chevronDirection = 'end',
+  backgroundColor,
   testID,
 }: SelectTokenButtonProps): JSX.Element {
   const textColor = !amountReady || disabled || loading ? '$neutral3' : '$neutral2'
@@ -35,13 +36,15 @@ export function SelectTokenButton({
   return (
     <TouchableArea
       hapticFeedback
+      backgroundColor={backgroundColor ?? 'unset'}
       borderRadius="$roundedFull"
       disabled={disabled}
-      p="$spacing4"
+      px="$spacing8"
+      py="$spacing4"
       testID={testID}
       onPress={onPress}
     >
-      <Flex centered row flexDirection="row" gap="$none" pr="$spacing4">
+      <Flex centered row flexDirection="row" gap="$none" p="$spacing4">
         {loading ? (
           <SpinningLoader />
         ) : (
diff --git a/packages/uniswap/src/features/fiatOnRamp/api.ts b/packages/uniswap/src/features/fiatOnRamp/api.ts
index 0edd6ad2e16..c47c8bc3c11 100644
--- a/packages/uniswap/src/features/fiatOnRamp/api.ts
+++ b/packages/uniswap/src/features/fiatOnRamp/api.ts
@@ -6,6 +6,7 @@ import {
   FORGetCountryResponse,
   FORQuoteRequest,
   FORQuoteResponse,
+  FORServiceProvidersRequest,
   FORServiceProvidersResponse,
   FORSupportedCountriesResponse,
   FORSupportedFiatCurrenciesRequest,
@@ -40,14 +41,13 @@ export const fiatOnRampAggregatorApi = createApi({
         method: 'POST',
       }),
       keepUnusedDataFor: 0,
-      transformResponse: (response: FORQuoteResponse) => ({
-        ...response,
-        quotes: response.quotes?.map((quote) => ({
-          ...quote,
-          serviceProviderDetails: {
-            ...quote.serviceProviderDetails,
-            paymentMethods: transformPaymentMethods(quote.serviceProviderDetails.paymentMethods),
-          },
+    }),
+    fiatOnRampAggregatorServiceProviders: builder.query<FORServiceProvidersResponse, FORServiceProvidersRequest>({
+      query: (request) => `/service-providers?${new URLSearchParams(request).toString()}`,
+      transformResponse: (response: FORServiceProvidersResponse) => ({
+        serviceProviders: response.serviceProviders.map((sp) => ({
+          ...sp,
+          paymentMethods: transformPaymentMethods(sp.paymentMethods),
         })),
       }),
     }),
@@ -95,6 +95,7 @@ export const {
   useFiatOnRampAggregatorCountryListQuery,
   useFiatOnRampAggregatorGetCountryQuery,
   useFiatOnRampAggregatorCryptoQuoteQuery,
+  useFiatOnRampAggregatorServiceProvidersQuery,
   useFiatOnRampAggregatorTransferServiceProvidersQuery,
   useFiatOnRampAggregatorSupportedTokensQuery,
   useFiatOnRampAggregatorSupportedFiatCurrenciesQuery,
diff --git a/packages/uniswap/src/features/fiatOnRamp/types.ts b/packages/uniswap/src/features/fiatOnRamp/types.ts
index f0edc534bb8..3e2fa18c3ed 100644
--- a/packages/uniswap/src/features/fiatOnRamp/types.ts
+++ b/packages/uniswap/src/features/fiatOnRamp/types.ts
@@ -24,7 +24,7 @@ export type FORQuoteRequest = {
   destinationCurrencyCode: string
   sourceAmount: number
   sourceCurrencyCode: string
-  walletAddress?: string
+  walletAddress: string
   state?: string
 }
 
@@ -34,9 +34,9 @@ export type FORQuote = {
   sourceCurrencyCode: string
   destinationAmount: number
   destinationCurrencyCode: string
+  serviceProvider: string
   serviceProviderDetails: FORServiceProvider
   totalFee: number
-  isMostRecentlyUsedProvider: boolean
 }
 
 export type FORQuoteResponse = {
@@ -58,7 +58,10 @@ export type FORServiceProvider = {
   url: string
   logos: FORLogo
   paymentMethods: string[]
-  supportUrl?: string
+}
+
+export type FORServiceProvidersRequest = {
+  countryCode: string
 }
 
 export type FORServiceProvidersResponse = {
diff --git a/packages/uniswap/src/features/fiatOnRamp/useCexTransferProviders.ts b/packages/uniswap/src/features/fiatOnRamp/useCexTransferProviders.ts
deleted file mode 100644
index 9d8e9f72dd0..00000000000
--- a/packages/uniswap/src/features/fiatOnRamp/useCexTransferProviders.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useFiatOnRampAggregatorTransferServiceProvidersQuery } from 'uniswap/src/features/fiatOnRamp/api'
-import { FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
-
-export function useCexTransferProviders(isEnabled: boolean): FORServiceProvider[] {
-  const { data, isLoading } = useFiatOnRampAggregatorTransferServiceProvidersQuery(undefined, {
-    skip: !isEnabled,
-  })
-
-  if (isLoading || !data) {
-    return []
-  }
-
-  return data.serviceProviders
-}
diff --git a/packages/uniswap/src/features/fiatOnRamp/utils.ts b/packages/uniswap/src/features/fiatOnRamp/utils.ts
index 7abb02e852a..967da4c19cd 100644
--- a/packages/uniswap/src/features/fiatOnRamp/utils.ts
+++ b/packages/uniswap/src/features/fiatOnRamp/utils.ts
@@ -1,6 +1,5 @@
-import { FORLogo } from 'uniswap/src/features/fiatOnRamp/types'
+import { FORLogo, FORQuote, FORServiceProvider } from 'uniswap/src/features/fiatOnRamp/types'
 import { isAndroid, isIOS } from 'utilities/src/platform'
-import { v4 as uuid } from 'uuid'
 
 const APPLE_PAY = 'Apple Pay'
 const GOOGLE_PAY = 'Google Pay'
@@ -89,11 +88,13 @@ export function getOptionalServiceProviderLogo(logos: FORLogo | undefined, isDar
   return isDarkMode ? logos?.darkLogo : logos?.lightLogo
 }
 
-export function getServiceProviderLogo(logos: FORLogo, isDarkMode: boolean): string {
-  return isDarkMode ? logos.darkLogo : logos.lightLogo
+export function getServiceProviderForQuote(
+  quote: FORQuote | undefined,
+  serviceProviders: FORServiceProvider[] | undefined,
+): FORServiceProvider | undefined {
+  return serviceProviders?.find((sp) => sp.serviceProvider === quote?.serviceProvider)
 }
 
-export function createOnRampTransactionId(serviceProvider?: string): string {
-  // The backend expects MoonPay transactions to have the MOONPAY prefix.
-  return `${serviceProvider?.toUpperCase() === 'MOONPAY' ? 'MOONPAY' : ''}${uuid()}`
+export function getServiceProviderLogo(logos: FORLogo, isDarkMode: boolean): string {
+  return isDarkMode ? logos.darkLogo : logos.lightLogo
 }
diff --git a/packages/uniswap/src/features/gating/configs.ts b/packages/uniswap/src/features/gating/configs.ts
index 53b3a0bf8cc..1fb8d02186c 100644
--- a/packages/uniswap/src/features/gating/configs.ts
+++ b/packages/uniswap/src/features/gating/configs.ts
@@ -1,58 +1,45 @@
+import { logger } from 'utilities/src/logger/logger'
+import { isInterface } from 'utilities/src/platform'
+
 /**
  * Dynamic Configs
  * These should match the dynamic config's `Config Name` on Statsig
  */
 export enum DynamicConfigs {
   // Wallet
-  MobileForceUpgrade = 'force_upgrade',
-  OnDeviceRecovery = 'on_device_recovery',
-  PollingIntervals = 'polling_intervals',
-  Slippage = 'slippage_configs',
-  UwuLink = 'uwulink_config',
-
-  // Web
-  QuickRouteChains = 'quick_route_chains',
-}
-
-// Config values go here for easy access
-
-// Wallet
-export enum ForceUpgradeConfigKey {
-  Status = 'status',
-}
-
-export enum OnDeviceRecoveryConfigKey {
-  AppLoadingTimeoutMs = 'appLoadingTimeoutMs',
-  MaxMnemonicsToLoad = 'maxMnemonicsToLoad',
-}
-
-export enum PollingIntervalsConfigKey {
-  AverageL1BlockTimeMs = 'averageL1BlockTimeMs',
-  AverageL2BlockTimeMs = 'averageL2BlockTimeMs',
-  TradingApiSwapRequestMs = 'tradingApiSwapRequestMs',
-}
-
-export enum SlippageConfigKey {
-  MinAutoSlippageToleranceL2 = 'minAutoSlippageToleranceL2',
-}
-
-export enum UwuLinkConfigKey {
-  Allowlist = 'allowlist',
-}
-
-// Web
-export enum QuickRouteChainsConfigKey {
-  Chains = 'quick_route_chains',
-}
-
-export type DynamicConfigKeys = {
-  // Wallet
-  [DynamicConfigs.MobileForceUpgrade]: ForceUpgradeConfigKey
-  [DynamicConfigs.OnDeviceRecovery]: OnDeviceRecoveryConfigKey
-  [DynamicConfigs.PollingIntervals]: PollingIntervalsConfigKey
-  [DynamicConfigs.Slippage]: SlippageConfigKey
-  [DynamicConfigs.UwuLink]: UwuLinkConfigKey
+  MobileForceUpgrade,
+  OnDeviceRecovery,
+  Slippage,
+  UwuLink,
 
   // Web
-  [DynamicConfigs.QuickRouteChains]: QuickRouteChainsConfigKey
+  QuickRouteChains,
+}
+
+export const WEB_CONFIG_NAMES = new Map<DynamicConfigs, string>([
+  [DynamicConfigs.QuickRouteChains, 'quick_route_chains'],
+])
+
+export const WALLET_CONFIG_NAMES = new Map<DynamicConfigs, string>([
+  [DynamicConfigs.MobileForceUpgrade, 'force_upgrade'],
+  [DynamicConfigs.OnDeviceRecovery, 'on_device_recovery'],
+  [DynamicConfigs.UwuLink, 'uwulink_config'],
+  [DynamicConfigs.Slippage, 'slippage_configs'],
+])
+
+export function getConfigName(config: DynamicConfigs): string {
+  const names = isInterface ? WEB_CONFIG_NAMES : WALLET_CONFIG_NAMES
+  const name = names.get(config)
+  if (!name) {
+    const err = new Error(`Dynamic config ${DynamicConfigs[config]} does not have a name mapped for this application`)
+    logger.error(err, {
+      tags: {
+        file: 'configs.ts',
+        function: 'getConfigName',
+      },
+    })
+    throw err
+  }
+
+  return name
 }
diff --git a/packages/uniswap/src/features/gating/experiments.ts b/packages/uniswap/src/features/gating/experiments.ts
index 28e42a28b13..de4dfd3ba7c 100644
--- a/packages/uniswap/src/features/gating/experiments.ts
+++ b/packages/uniswap/src/features/gating/experiments.ts
@@ -7,12 +7,6 @@ export enum Experiments {
   ArbitrumXV2OpenOrders = 'arbitrum_uniswapx_openorders',
 }
 
-export enum ArbitrumXV2OpenOrderProperties {
-  PriceImprovementBps = 'priceImprovementBps',
-  ForceOpenOrders = 'forceOpenOrders',
-  DeadlineBufferSecs = 'deadlineBufferSecs',
-}
-
 export type ExperimentProperties = {
-  [Experiments.ArbitrumXV2OpenOrders]: ArbitrumXV2OpenOrderProperties
+  [Experiments.ArbitrumXV2OpenOrders]: 'priceImprovementBps' | 'forceOpenOrders' | 'deadlineBufferSecs'
 }
diff --git a/packages/uniswap/src/features/gating/hooks.ts b/packages/uniswap/src/features/gating/hooks.ts
index 828059ab5ec..3edd647c4ab 100644
--- a/packages/uniswap/src/features/gating/hooks.ts
+++ b/packages/uniswap/src/features/gating/hooks.ts
@@ -1,7 +1,8 @@
-import { DynamicConfigKeys } from 'uniswap/src/features/gating/configs'
+import { DynamicConfigs, getConfigName } from 'uniswap/src/features/gating/configs'
 import { ExperimentProperties, Experiments } from 'uniswap/src/features/gating/experiments'
 import { FeatureFlags, getFeatureFlagName } from 'uniswap/src/features/gating/flags'
 import {
+  DynamicConfig,
   useConfig,
   useExperiment,
   useExperimentWithExposureLoggingDisabled,
@@ -30,14 +31,10 @@ export function useExperimentValue<
   Exp extends keyof ExperimentProperties,
   Param extends ExperimentProperties[Exp],
   ValType,
->(experiment: Exp, param: Param, defaultValue: ValType, customTypeGuard?: (x: unknown) => boolean): ValType {
+>(experiment: Exp, param: Param, defaultValue: ValType): ValType {
   const statsigExperiment = useExperiment(experiment).config
   return statsigExperiment.get(param, defaultValue, (value): value is ValType => {
-    if (customTypeGuard) {
-      return customTypeGuard(value)
-    } else {
-      return typeof value === typeof defaultValue
-    }
+    return typeof value === typeof defaultValue
   })
 }
 
@@ -45,28 +42,15 @@ export function useExperimentValueWithExposureLoggingDisabled<
   Exp extends keyof ExperimentProperties,
   Param extends ExperimentProperties[Exp],
   ValType,
->(experiment: Exp, param: Param, defaultValue: ValType, customTypeGuard?: (x: unknown) => boolean): ValType {
+>(experiment: Exp, param: Param, defaultValue: ValType): ValType {
   const statsigExperiment = useExperimentWithExposureLoggingDisabled(experiment).config
   return statsigExperiment.get(param, defaultValue, (value): value is ValType => {
-    if (customTypeGuard) {
-      return customTypeGuard(value)
-    } else {
-      return typeof value === typeof defaultValue
-    }
+    return typeof value === typeof defaultValue
   })
 }
 
-export function useDynamicConfigValue<
-  Conf extends keyof DynamicConfigKeys,
-  Key extends DynamicConfigKeys[Conf],
-  ValType,
->(config: Conf, key: Key, defaultValue: ValType, customTypeGuard?: (x: unknown) => boolean): ValType {
-  const { config: dynamicConfig } = useConfig(config)
-  return dynamicConfig.get(key, defaultValue, (value): value is ValType => {
-    if (customTypeGuard) {
-      return customTypeGuard(value)
-    } else {
-      return typeof value === typeof defaultValue
-    }
-  })
+export function useDynamicConfig(config: DynamicConfigs): DynamicConfig {
+  const name = getConfigName(config)
+  const { config: dynamicConfig } = useConfig(name)
+  return dynamicConfig
 }
diff --git a/packages/uniswap/src/features/language/formatter.ts b/packages/uniswap/src/features/language/formatter.ts
deleted file mode 100644
index 39e0172cb6a..00000000000
--- a/packages/uniswap/src/features/language/formatter.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NumberType } from 'utilities/src/format/types'
-
-export type FormatNumberOrStringInput = {
-  value: Maybe<number | string>
-  type?: NumberType
-  currencyCode?: string
-  placeholder?: string
-}
diff --git a/packages/uniswap/src/features/search/SearchResult.ts b/packages/uniswap/src/features/search/SearchResult.ts
deleted file mode 100644
index b23ab16eb27..00000000000
--- a/packages/uniswap/src/features/search/SearchResult.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Retain original ordering as these are saved to storage and loaded back out
-export enum SearchResultType {
-  ENSAddress,
-  Token,
-  Etherscan,
-  NFTCollection,
-  Unitag,
-  WalletByAddress,
-}
diff --git a/packages/uniswap/src/features/telemetry/constants/trace.ts b/packages/uniswap/src/features/telemetry/constants/trace.ts
index 7f9ef520416..f52a869b161 100644
--- a/packages/uniswap/src/features/telemetry/constants/trace.ts
+++ b/packages/uniswap/src/features/telemetry/constants/trace.ts
@@ -24,6 +24,7 @@ export const ModalName = {
   FaceIDWarning: 'face-id-warning',
   FOTInfo: 'fee-on-transfer',
   FiatCurrencySelector: 'fiat-currency-selector',
+  FiatOnRamp: 'fiat-on-ramp',
   FiatOnRampAggregator: 'fiat-on-ramp-aggregator',
   FiatOnRampCountryList: 'fiat-on-ramp-country-list',
   FiatOnRampTokenSelector: 'fiat-on-ramp-token-selector',
diff --git a/packages/uniswap/src/features/transactions/transfer/types.ts b/packages/uniswap/src/features/transactions/transfer/types.ts
deleted file mode 100644
index 3b340c054f2..00000000000
--- a/packages/uniswap/src/features/transactions/transfer/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TokenSelectorFlow {
-  Swap,
-  Transfer,
-}
diff --git a/packages/uniswap/src/i18n/locales/source/en-US.json b/packages/uniswap/src/i18n/locales/source/en-US.json
index 1ecd82fc906..25c84668bd4 100644
--- a/packages/uniswap/src/i18n/locales/source/en-US.json
+++ b/packages/uniswap/src/i18n/locales/source/en-US.json
@@ -264,6 +264,8 @@
   "extension.warning.storage.message": "Make sure to back up your recovery phrase to prevent losing access to your wallet and funds.",
   "extension.warning.storage.title": "Your browser is running out of storage",
   "fiatOnRamp.button.chooseToken": "Choose a token",
+  "fiatOnRamp.button.continueCheckout": "Continue to checkout",
+  "fiatOnRamp.checkout.button": "Checkout",
   "fiatOnRamp.checkout.title": "Checkout with",
   "fiatOnRamp.connection.message": "Connecting you to {{serviceProvider}}",
   "fiatOnRamp.connection.quote": "Buying {{amount}} worth of {{currencySymbol}}",
diff --git a/packages/uniswap/src/i18n/locales/translations/es-ES.json b/packages/uniswap/src/i18n/locales/translations/es-ES.json
index 5f0b056a2ad..ebd1f361929 100644
--- a/packages/uniswap/src/i18n/locales/translations/es-ES.json
+++ b/packages/uniswap/src/i18n/locales/translations/es-ES.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Intentar otra vez",
   "common.button.understand": "Entendido",
   "common.button.view": "Ver",
+  "common.button.yes": "Sí",
   "common.card.error.description": "Algo salió mal",
   "common.card.error.title": "¡Ups! Algo salió mal.",
   "common.endAdornment": "y",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Ajustes",
   "common.navigation.systemSettings": "Ajustes",
   "common.text.connected": "Conectado",
+  "common.text.contract": "Contrato",
   "common.text.disconnected": "Desconectado",
   "common.text.error": "Error",
   "common.text.notAvailable": "N/D",
+  "common.text.recipient": "Para",
+  "common.text.sender": "De",
   "common.text.unknown": "Desconocido",
   "currency.aud": "Dólar australiano",
   "currency.brl": "Real brasileño",
@@ -171,17 +175,15 @@
   "currency.usd": "Dólar de los Estados Unidos",
   "currency.vnd": "Dong vietnamita",
   "dapp.request.approve.action": "Aprobar",
-  "dapp.request.approve.fallbackTitle": "Aprobar tokens de gasto",
-  "dapp.request.approve.helptext": "Permita que este sitio acceda y gaste este token desde su billetera.",
+  "dapp.request.approve.fallbackTitle": "Aprobar este sitio para acceder a tokens",
+  "dapp.request.approve.helptext": "Permita que este sitio acceda y gaste este token en transacciones. Asegúrate de confiar en este sitio.",
   "dapp.request.approve.label": "Wallet",
-  "dapp.request.approve.title": "Aprobar gasto {{tokenSymbol}}",
+  "dapp.request.approve.title": "Aprobar el acceso a {{tokenSymbol}}",
   "dapp.request.base.title": "Solicitud de transacción",
   "dapp.request.connect.helptext": "Permitir a este sitio ver su dirección de wallet, saldo y solicitar aprobaciones para las transacciones.",
   "dapp.request.connect.title": "Conectarse al sitio",
   "dapp.request.fallback.calldata.label": "Datos sin procesar",
   "dapp.request.fallback.function.label": "Función",
-  "dapp.request.fallback.recipient.label": "Para",
-  "dapp.request.fallback.sending.label": "Enviando",
   "dapp.request.permit2.description": "Permit2 gestiona las aprobaciones de tokens en múltiples dapps.",
   "dapp.request.permit2.header": "Firmar permiso2",
   "dapp.request.reject.action": "Rechazar todo",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Ucranio",
   "language.urdu": "urdu",
   "language.vietnamese": "Vietnamita",
+  "mobile.appRating.button.decline": "No precisamente",
+  "mobile.appRating.description": "Háganos saber si está teniendo una buena experiencia con esta aplicación.",
+  "mobile.appRating.feedback.button.cancel": "Quizá más tarde",
+  "mobile.appRating.feedback.button.send": "Enviar comentarios",
+  "mobile.appRating.feedback.description": "Háganos saber cómo podemos mejorar su experiencia.",
+  "mobile.appRating.feedback.title": "Lamentamos oír eso.",
+  "mobile.appRating.title": "¿Disfrutas de Uniswap Wallet?",
   "notification.assetVisibility.hidden": "{{assetName}} oculto",
   "notification.assetVisibility.unhidden": "{{assetName}} no oculto",
   "notification.copied.address": "Dirección copiada",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Aprobado {{currencySymbol}} para uso con {{address}}.",
   "notification.transaction.pending": "Transacción pendiente",
   "notification.transaction.swap.canceled": "Cancelado el intercambio {{inputCurrencySymbol}}-{{outputCurrencySymbol}}.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} por {{outputCurrencyAmountWithSymbol}} el intercambio expiró.",
   "notification.transaction.swap.fail": "No se pudo intercambiar {{inputCurrencyAmountWithSymbol}} por {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Se intercambió {{inputCurrencyAmountWithSymbol}} por {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Cancelado el envío de {{tokenNameOrAddress}}.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Continuar en la extensión Uniswap",
   "notifications.scantastic.title": "Éxito!",
   "onboarding.backup.manual.banner": "Es mejor escribir esto en una hoja de papel y guardarlo en un lugar seguro o en un administrador de contraseñas seguro.",
+  "onboarding.backup.manual.error": "Palabra no válida o mal escrita",
   "onboarding.backup.manual.placeholder": "Palabra secreta",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} completado",
   "onboarding.backup.manual.selectedWordPlaceholder": "Seleccionar palabra",
-  "onboarding.backup.manual.subtitle_one": "¿Cuál es la <highlight/>{{count}}ª</highlight/> palabra en tu frase de recuperación?",
-  "onboarding.backup.manual.subtitle_two": "¿Cuál es la <highlight/>{{count}}ª</highlight/> palabra en tu frase de recuperación?",
-  "onboarding.backup.manual.subtitle_few": "¿Cuál es la <highlight/>{{count}}ª</highlight/> palabra en tu frase de recuperación?",
-  "onboarding.backup.manual.subtitle_other": "¿Cuál es la <highlight/>{{count}}ª</highlight/> palabra en tu frase de recuperación?",
+  "onboarding.backup.manual.subtitle_one": "¿Cuál es la {{count}}ª palabra en tu frase de recuperación?",
+  "onboarding.backup.manual.subtitle_two": "¿Cuál es la {{count}}ª palabra en tu frase de recuperación?",
+  "onboarding.backup.manual.subtitle_few": "¿Cuál es la {{count}}ª palabra en tu frase de recuperación?",
+  "onboarding.backup.manual.subtitle_other": "¿Cuál es la {{count}}ª palabra en tu frase de recuperación?",
   "onboarding.backup.manual.title": "Asegurémonos de haberlo grabado correctamente.",
   "onboarding.backup.option.cloud.description": "Encripta tu frase de recuperación con una contraseña segura",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} copia de seguridad",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Los respaldos te permiten restaurar tu wallet si eliminas la aplicación o pierdes tu dispositivo",
   "onboarding.backup.title.existing": "Haz una copia de seguridad de tu wallet",
   "onboarding.backup.title.new": "Elija un método de copia de seguridad",
-  "onboarding.backup.view.disclaimer": "Entiendo que si pierdo mi frase de recuperación, Uniswap Labs no puede ayudarme a restaurarla",
+  "onboarding.backup.view.disclaimer": "Entiendo que si pierdo mi frase de recuperación, Uniswap Labs no puede ayudarme a restaurarla.",
   "onboarding.backup.view.subtitle.message1": "Lea atentamente lo siguiente antes de continuar.",
   "onboarding.backup.view.subtitle.message2": "Deberá ingresar las 12 palabras secretas para recuperar su billetera.",
   "onboarding.backup.view.title": "Anota tu frase de recuperación",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Haga clic en el ícono de chincheta para agregar Uniswap Extension a su barra de herramientas.",
   "onboarding.complete.pin.title": "Pin extensión Uniswap",
   "onboarding.complete.title": "Estás todo listo",
-  "onboarding.extension.connectMobile.button": "Importa desde tu teléfono",
-  "onboarding.extension.connectMobile.title": "¿Tienes la aplicación móvil Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Descargue la aplicación móvil para reclamar un nombre de usuario",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Inscríbete en la lista de espera Beta",
   "onboarding.extension.password.subtitle": "Necesitará esto para desbloquear su billetera y acceder a su frase de recuperación.",
   "onboarding.extension.password.title.default": "Crear contraseña",
   "onboarding.extension.password.title.reset": "Restablecer su contraseña",
+  "onboarding.extension.unsupported.description": "La extensión Uniswap solo es compatible con Chrome en este momento.",
+  "onboarding.extension.unsupported.title": "Este navegador no es compatible (todavía)",
   "onboarding.import.error.invalidWords_one": "1 palabra no es válida o está mal escrita",
   "onboarding.import.error.invalidWords_other": "{{count}} palabras no son válidas o están mal escritas",
   "onboarding.import.method.import.message": "Ingresa tu frase de recuperación de otra wallet",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Escribe o pega tu frase de recuperación de 12 palabras",
   "onboarding.importMnemonic.title": "Ingresa tu frase de recuperación",
   "onboarding.intro.button.alreadyHave": "Ya tengo una wallet",
-  "onboarding.intro.title": "Bienvenido a \nUniswap Wallet",
+  "onboarding.intro.mobileScan.button": "Escanea el código QR para importar",
+  "onboarding.intro.mobileScan.title": "¿Tienes la aplicación Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Verificar elegibilidad",
   "onboarding.introBetaWaitlist.button.letsGo": "Vamos",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Ingresa tu nombre de usuario <highlight>uni.eth</highlight> a continuación para verificar si eres elegible para la versión Beta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Todavía estás en la lista de espera. ¡Te notificaremos en la aplicación móvil de Uniswap cuando seas elegible!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "nombre de usuario",
   "onboarding.landing.button.add": "Agregar una wallet existente",
-  "onboarding.landing.button.create": "Crear una nueva wallet",
+  "onboarding.landing.button.create": "crear una billetera",
   "onboarding.notification.permission.message": "Para recibir notificaciones, activa las notificaciones de Uniswap Wallet en la configuración de tu dispositivo.",
   "onboarding.notification.permission.title": "Permiso de notificaciones",
   "onboarding.notification.subtitle": "Recibe notificaciones cuando se completen sus transferencias, intercambios y aprobaciones.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Tienes esto como una billetera de solo visualización.",
   "send.recipientSelect.search.empty.message": "Cuando envías tokens a una dirección de billetera, aparecerán aquí",
   "send.recipientSelect.search.empty.title": "No hay billeteras guardadas",
-  "send.recipientSelect.title": "Para",
   "send.review.modal.title": "estas enviando",
   "send.review.summary.button.title": "Confirmar envío",
   "send.review.summary.sending": "Enviando",
-  "send.review.summary.to": "Para",
   "send.search.empty.subtitle": "La dirección que escribiste no existe o está escrita incorrectamente.",
   "send.search.empty.title": "No se han encontrado resultados",
   "send.search.placeholder": "Buscar ENS o dirección",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Esta wallet es de sólo vista",
   "setting.recoveryPhrase.account.show": "Mostrar frase de recuperación",
   "setting.recoveryPhrase.action.hide": "Ocultar frase de recuperación",
-  "setting.recoveryPhrase.remove.button": "Eliminar frase de recuperación",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Entiendo que Uniswap Labs no puede ayudarme a recuperar mi billetera si no lo hice",
+  "setting.recoveryPhrase.remove": "Eliminar frase de recuperación",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Entiendo que Uniswap Labs no puede ayudarme a recuperar mi billetera si no lo hice.",
   "setting.recoveryPhrase.remove.confirm.title": "Guardé mi frase de recuperación.",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Asegúrate de haber guardado tu frase de recuperación. De lo contrario, perderá el acceso a sus fondos",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Asegúrate de haber guardado tu frase de recuperación. De lo contrario, perderá el acceso a sus billeteras.",
   "setting.recoveryPhrase.remove.initial.title": "Antes de continuar",
   "setting.recoveryPhrase.remove.password.error": "Contraseña incorrecta. Intentar otra vez",
-  "setting.recoveryPhrase.remove.password.input": "Ingresar contraseña",
-  "setting.recoveryPhrase.remove.subtitle": "Ingresa tu contraseña para continuar",
+  "setting.recoveryPhrase.remove.subtitle": "Ingrese su contraseña para confirmar",
   "setting.recoveryPhrase.remove.title": "Estás eliminando tu frase de recuperación.",
-  "setting.recoveryPhrase.view.error": "Contraseña incorrecta, inténtalo de nuevo",
   "setting.recoveryPhrase.view.warning.message1": "Cualquiera que conozca tu frase de recuperación puede acceder a tu wallet y a tus fondos",
   "setting.recoveryPhrase.view.warning.message2": "Ver esto en privado",
-  "setting.recoveryPhrase.view.warning.message3": "No compartas esto con nadie",
-  "setting.recoveryPhrase.view.warning.message4": "Nunca lo introduzcas en ningún sitio web o aplicaciones",
+  "setting.recoveryPhrase.view.warning.message3": "No compartir con nadie",
+  "setting.recoveryPhrase.view.warning.message4": "Nunca lo ingreses en ningún sitio web o aplicación.",
   "setting.recoveryPhrase.view.warning.title": "Antes de continuar",
   "setting.recoveryPhrase.warning.screenshot.message": "Cualquiera que obtenga acceso a tus fotos podrá acceder a tu wallet. Te recomendamos que escribas tus palabras en vez de guardar una foto.",
   "setting.recoveryPhrase.warning.screenshot.title": "Las capturas de pantalla no son seguras",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Ver menos",
   "settings.section.wallet.label.viewOnly": "Sólo lectura",
   "settings.section.wallet.title": "Configuración de wallet",
-  "settings.setting.appearance.option.auto": "Auto",
   "settings.setting.appearance.option.dark.subtitle": "Usa siempre el modo oscuro",
   "settings.setting.appearance.option.dark.title": "Modo oscuro",
   "settings.setting.appearance.option.device.subtitle": "Usar configuración de tu dispositivo",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Utilizamos datos de uso anónimos para mejorar su experiencia en los productos de Uniswap Labs. Cuando está deshabilitado, solo realizamos un seguimiento de los errores y el uso esencial.",
   "settings.setting.privacy.analytics.title": "Permitir análisis",
   "settings.setting.privacy.title": "Privacidad",
-  "settings.setting.recoveryPhrase.remove": "Eliminar frase de recuperación",
+  "settings.setting.recoveryPhrase.password.title": "Ingresa tu contraseña",
   "settings.setting.recoveryPhrase.title": "Frase de recuperación",
-  "settings.setting.recoveryPhrase.view": "Ver frase de recuperación",
   "settings.setting.smallBalances.title": "Ocultar saldos pequeños",
-  "settings.setting.theme.title": "Tema",
   "settings.setting.unknownTokens.title": "Ocultar tokens desconocidos",
   "settings.setting.wallet.action.editLabel": "Editar etiqueta",
   "settings.setting.wallet.action.editProfile": "Editar perfil",
@@ -729,6 +734,8 @@
   "settings.version": "Versión {{appVersion}}",
   "swap.button.max": "Máx",
   "swap.button.review": "Revisar",
+  "swap.button.submitting": "Enviando intercambio...",
+  "swap.button.submitting.keep.open": "Mantén tu billetera abierta...",
   "swap.button.swap": "Intercambiar",
   "swap.button.unwrap": "Desenvolver",
   "swap.button.view": "Ver transacción",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Estás desconectado",
   "swap.warning.priceImpact.message": "Debido a la cantidad de liquidez de {{outputCurrencySymbol}} disponible actualmente, cuanto más {{inputCurrencySymbol}} intentes intercambiar, menos {{outputCurrencySymbol}} recibirás.",
   "swap.warning.priceImpact.title": "Alto impacto en el precio ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Su transacción no se envió porque cerró la aplicación.",
+  "swap.warning.queuedOrder.approvalFailed": "Su transacción no se envió porque falló la aprobación del token.",
+  "swap.warning.queuedOrder.stale": "Su transacción no se envió porque cerró la aplicación o la aprobación tomó demasiado tiempo.",
+  "swap.warning.queuedOrder.submissionFailed": "Hubo un problema al enviar su transacción.",
+  "swap.warning.queuedOrder.title": "Intercambio cancelado",
+  "swap.warning.queuedOrder.wrap.message": "Su ETH permanecerá envuelto como WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Su transacción no se envió porque falló la transacción final.",
   "swap.warning.rateLimit.message": "Inténtalo de nuevo en unos minutos.",
   "swap.warning.rateLimit.title": "Límite de conexiones excedido",
   "swap.warning.router.message": "Es posible que hayas perdido la conexión o que la red esté caída. Si el problema persiste, inténtalo de nuevo más tarde.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Saldos en otras redes",
   "token.balances.viewOnly": "Saldo de {{ownerAddress}}",
   "token.error.unknown": "Token desconocido",
-  "token.links.contract": "Contrato",
   "token.links.title": "Enlaces",
   "token.links.twitter": "Gorjeo",
   "token.links.website": "Sitio web",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Ocultar Token",
   "tokens.action.unhide": "Mostrar token",
   "tokens.hidden.label": "Oculto ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Ver en {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "No se pudo cargar la colección NFT",
   "tokens.nfts.collection.label.items": "Elementos",
   "tokens.nfts.collection.label.owners": "Propietarios",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Ilimitado",
   "transaction.currency.unknown": "token desconocido",
   "transaction.date": "Presentado el {{date}}",
+  "transaction.details.dappName": "Aplicación",
+  "transaction.details.from": "De",
   "transaction.details.networkFee": "Costo de red",
   "transaction.details.transactionId": "ID de transacción",
   "transaction.network.all": "Todas las redes",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Enviado el {{externalDappName}}",
   "transaction.status.swap.canceled": "intercambio cancelado",
   "transaction.status.swap.canceling": "Cancelando el intercambio",
+  "transaction.status.swap.expired": "Intercambio caducado",
   "transaction.status.swap.failed": "No se pudo cambiar",
+  "transaction.status.swap.insufficientFunds": "Fondos insuficientes",
   "transaction.status.swap.pending": "Intercambiando",
   "transaction.status.swap.success": "Intercambiado",
   "transaction.status.swap.successDapp": "Intercambiado en {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Desplácese hacia abajo para firmar",
   "walletConnect.request.button.sign": "Firmar",
   "walletConnect.request.details.label.function": "Función",
-  "walletConnect.request.details.label.recipient": "Para",
   "walletConnect.request.details.label.sending": "Enviando",
   "walletConnect.request.error.insufficientFunds": "No tienes suficiente {{currencySymbol}} para completar esta transacción.",
   "walletConnect.request.error.network": "Error de conexión",
diff --git a/packages/uniswap/src/i18n/locales/translations/fr-FR.json b/packages/uniswap/src/i18n/locales/translations/fr-FR.json
index ddcfda4d874..24ba4347043 100644
--- a/packages/uniswap/src/i18n/locales/translations/fr-FR.json
+++ b/packages/uniswap/src/i18n/locales/translations/fr-FR.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Réessayer",
   "common.button.understand": "Je comprends",
   "common.button.view": "Voir",
+  "common.button.yes": "Oui",
   "common.card.error.description": "Quelque chose s'est mal passé",
   "common.card.error.title": "Oups ! Quelque chose s'est mal passé.",
   "common.endAdornment": "et",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Paramètres",
   "common.navigation.systemSettings": "Paramètres",
   "common.text.connected": "Connecté",
+  "common.text.contract": "Contracter",
   "common.text.disconnected": "Déconnectée",
   "common.text.error": "Erreur",
   "common.text.notAvailable": "N / A",
+  "common.text.recipient": "À",
+  "common.text.sender": "Depuis",
   "common.text.unknown": "Inconnu",
   "currency.aud": "Dollar australien",
   "currency.brl": "Réal brésilien",
@@ -171,17 +175,15 @@
   "currency.usd": "Dollar américain",
   "currency.vnd": "Dong vietnamien",
   "dapp.request.approve.action": "Approuver",
-  "dapp.request.approve.fallbackTitle": "Approuver les jetons de dépenses",
-  "dapp.request.approve.helptext": "Autorisez ce site à accéder et à dépenser ce jeton depuis votre portefeuille.",
+  "dapp.request.approve.fallbackTitle": "Approuver ce site pour accéder aux jetons",
+  "dapp.request.approve.helptext": "Autorisez ce site à accéder et à dépenser ce jeton pour les transactions. Assurez-vous de faire confiance à ce site.",
   "dapp.request.approve.label": "Portefeuille",
-  "dapp.request.approve.title": "Approuver les dépenses {{tokenSymbol}}",
+  "dapp.request.approve.title": "Approuver l'accès à {{tokenSymbol}}",
   "dapp.request.base.title": "Demande de transaction",
   "dapp.request.connect.helptext": "Autorisez ce site à afficher l'adresse de votre portefeuille, votre solde et à demander des approbations pour les transactions.",
   "dapp.request.connect.title": "Se connecter au site",
   "dapp.request.fallback.calldata.label": "Données brutes",
   "dapp.request.fallback.function.label": "Fonction",
-  "dapp.request.fallback.recipient.label": "À",
-  "dapp.request.fallback.sending.label": "Envoi en cours",
   "dapp.request.permit2.description": "Permit2 gère les approbations de jetons sur plusieurs dapps.",
   "dapp.request.permit2.header": "Signer le permis2",
   "dapp.request.reject.action": "Rejeter tout",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Ukrainien",
   "language.urdu": "Ourdou",
   "language.vietnamese": "Vietnamien",
+  "mobile.appRating.button.decline": "Pas vraiment",
+  "mobile.appRating.description": "Faites-nous savoir si vous avez une bonne expérience avec cette application",
+  "mobile.appRating.feedback.button.cancel": "Peut-être plus tard",
+  "mobile.appRating.feedback.button.send": "Envoyer votre avis",
+  "mobile.appRating.feedback.description": "Faites-nous savoir comment nous pouvons améliorer votre expérience",
+  "mobile.appRating.feedback.title": "Nous sommes désolés d'entendre cela.",
+  "mobile.appRating.title": "Vous appréciez le portefeuille Uniswap ?",
   "notification.assetVisibility.hidden": "{{assetName}} caché",
   "notification.assetVisibility.unhidden": "{{assetName}} est visible",
   "notification.copied.address": "Adresse copiée",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "{{currencySymbol}} approuvé pour l'utilisation avec {{address}}.",
   "notification.transaction.pending": "Transaction en attente",
   "notification.transaction.swap.canceled": "Échange {{inputCurrencySymbol}}-{{outputCurrencySymbol}} annulé.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} pour {{outputCurrencyAmountWithSymbol}} l'échange a expiré.",
   "notification.transaction.swap.fail": "Échec de l'échange {{inputCurrencyAmountWithSymbol}} contre {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Échangé {{inputCurrencyAmountWithSymbol}} contre {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Annulé l'envoi de {{tokenNameOrAddress}}.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Continuer sur l'extension Uniswap",
   "notifications.scantastic.title": "Succès!",
   "onboarding.backup.manual.banner": "Il est préférable de l'écrire sur un morceau de papier et de le conserver dans un endroit sûr ou dans un gestionnaire de mots de passe sécurisé.",
+  "onboarding.backup.manual.error": "Mot invalide ou mal orthographié",
   "onboarding.backup.manual.placeholder": "Mot secret",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "Sélectionner un mot",
-  "onboarding.backup.manual.subtitle_one": "Quel est le <highlight/>{{count}}er</highlight/> mot de votre phrase de récupération ?",
-  "onboarding.backup.manual.subtitle_two": "Quel est le <highlight/>{{count}}e</highlight/> mot de votre phrase de récupération ?",
-  "onboarding.backup.manual.subtitle_few": "Quel est le <highlight/>{{count}}e</highlight/> mot de votre phrase de récupération ?",
-  "onboarding.backup.manual.subtitle_other": "Quel est le <highlight/>{{count}}e</highlight/> mot de votre phrase de récupération ?",
+  "onboarding.backup.manual.subtitle_one": "Quel est le {{count}}er mot de votre phrase de récupération ?",
+  "onboarding.backup.manual.subtitle_two": "Quel est le {{count}}e mot de votre phrase de récupération ?",
+  "onboarding.backup.manual.subtitle_few": "Quel est le {{count}}e mot de votre phrase de récupération ?",
+  "onboarding.backup.manual.subtitle_other": "Quel est le {{count}}e mot de votre phrase de récupération ?",
   "onboarding.backup.manual.title": "Assurons-nous que vous l'avez enregistré correctement",
   "onboarding.backup.option.cloud.description": "Cryptez votre phrase de récupération avec un mot de passe sécurisé",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} sauvegarde",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Cliquez sur l'icône en forme d'épingle pour ajouter l'extension Uniswap à votre barre d'outils.",
   "onboarding.complete.pin.title": "Épingler l'extension Uniswap",
   "onboarding.complete.title": "Vous êtes prêt",
-  "onboarding.extension.connectMobile.button": "Importer depuis votre téléphone",
-  "onboarding.extension.connectMobile.title": "Vous disposez de l'application mobile Uniswap ?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Téléchargez l'application mobile pour réclamer un nom d'utilisateur",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Inscrivez-vous sur la liste d'attente de la version bêta",
   "onboarding.extension.password.subtitle": "Vous en aurez besoin pour déverrouiller votre portefeuille et accéder à votre phrase de récupération",
   "onboarding.extension.password.title.default": "Créer un mot de passe",
   "onboarding.extension.password.title.reset": "réinitialisez votre mot de passe",
+  "onboarding.extension.unsupported.description": "L'extension Uniswap n'est actuellement compatible qu'avec Chrome.",
+  "onboarding.extension.unsupported.title": "Ce navigateur n'est pas (encore) supporté",
   "onboarding.import.error.invalidWords_one": "1 mot n'est pas valide ou est mal orthographié",
   "onboarding.import.error.invalidWords_other": "{{count}}  mots sont invalides ou mal orthographiés",
   "onboarding.import.method.import.message": "Entrez votre phrase de récupération d'un autre wallet de crypto",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Tapez ou collez votre phrase de récupération de 12 mots",
   "onboarding.importMnemonic.title": "Entrez votre phrase de récupération",
   "onboarding.intro.button.alreadyHave": "J'ai déjà un wallet",
-  "onboarding.intro.title": "Bienvenue sur \nPortefeuille Uniswap",
+  "onboarding.intro.mobileScan.button": "Scannez le code QR pour importer",
+  "onboarding.intro.mobileScan.title": "Vous avez l'application Uniswap ?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Vérifier l'éligibilité",
   "onboarding.introBetaWaitlist.button.letsGo": "Allons-y",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Entrez votre nom d'utilisateur <highlight>uni.eth</highlight> ci-dessous pour vérifier si vous êtes éligible pour la version bêta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Vous êtes toujours sur la liste d'attente. Nous vous informerons dans l'application mobile Uniswap lorsque vous deviendrez éligible !",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "nom d'utilisateur",
   "onboarding.landing.button.add": "Ajouter un wallet existant",
-  "onboarding.landing.button.create": "Créer un nouveau wallet",
+  "onboarding.landing.button.create": "Créer un portefeuille",
   "onboarding.notification.permission.message": "Pour recevoir des notifications, activez les notifications pour Uniswap Wallet dans les paramètres de votre appareil.",
   "onboarding.notification.permission.title": "Autorisation des notifications",
   "onboarding.notification.subtitle": "Soyez averti lorsque vos transferts, échanges et approbations sont confirmées.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Vous l'avez comme portefeuille en lecture seule",
   "send.recipientSelect.search.empty.message": "Lorsque vous envoyez des jetons à une adresse de portefeuille, ils apparaîtront ici",
   "send.recipientSelect.search.empty.title": "Aucun portefeuille enregistré",
-  "send.recipientSelect.title": "À",
   "send.review.modal.title": "Vous envoyez",
   "send.review.summary.button.title": "Confirmer l'envoi",
   "send.review.summary.sending": "Envoi en cours",
-  "send.review.summary.to": "À",
   "send.search.empty.subtitle": "L'adresse que vous avez saisie n'existe pas ou est incorrectement orthographiée.",
   "send.search.empty.title": "Aucun résultat trouvé",
   "send.search.placeholder": "Rechercher des ENS ou des adresses",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Ce wallet est en \"lecture seule\"",
   "setting.recoveryPhrase.account.show": "Afficher la phrase de récupération",
   "setting.recoveryPhrase.action.hide": "Masquer la phrase de récupération",
-  "setting.recoveryPhrase.remove.button": "Supprimer la phrase de récupération",
+  "setting.recoveryPhrase.remove": "Supprimer la phrase de récupération",
   "setting.recoveryPhrase.remove.confirm.subtitle": "Je comprends qu'Uniswap Labs ne peut pas m'aider à récupérer mon portefeuille si je ne parviens pas à le faire.",
   "setting.recoveryPhrase.remove.confirm.title": "J'ai enregistré ma phrase de récupération",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Assurez-vous d'avoir enregistré votre phrase de récupération. Sinon, vous perdrez l’accès à vos fonds",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Assurez-vous d'avoir enregistré votre phrase de récupération. Sinon, vous perdrez l’accès à vos portefeuilles",
   "setting.recoveryPhrase.remove.initial.title": "Avant de continuer",
   "setting.recoveryPhrase.remove.password.error": "Mauvais mot de passe. Essayer à nouveau",
-  "setting.recoveryPhrase.remove.password.input": "Entrez le mot de passe",
-  "setting.recoveryPhrase.remove.subtitle": "Entrez votre mot de passe pour continuer",
+  "setting.recoveryPhrase.remove.subtitle": "Entrez votre mot de passe pour confirmer",
   "setting.recoveryPhrase.remove.title": "Vous supprimez votre phrase de récupération",
-  "setting.recoveryPhrase.view.error": "Mot de passe erroné, réessayez",
   "setting.recoveryPhrase.view.warning.message1": "N'importe qui ayant accès à votre phrase de récupération peut accéder à votre wallet et à vos fonds",
   "setting.recoveryPhrase.view.warning.message2": "Voir ceci en privé",
-  "setting.recoveryPhrase.view.warning.message3": "Ne partagez ceci avec personne",
-  "setting.recoveryPhrase.view.warning.message4": "Ne l'entrez jamais sur des sites Web ou des applications",
+  "setting.recoveryPhrase.view.warning.message3": "Ne partagez avec personne",
+  "setting.recoveryPhrase.view.warning.message4": "Ne le saisissez jamais sur des sites Web ou des applications",
   "setting.recoveryPhrase.view.warning.title": "Avant de continuer",
   "setting.recoveryPhrase.warning.screenshot.message": "N'importe qui ayant accès à vos photos peut accéder à votre wallet. Nous vous recommandons plutôt d’écrire vos mots.",
   "setting.recoveryPhrase.warning.screenshot.title": "Les captures d'écran ne sont pas sécurisées",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Voir moins",
   "settings.section.wallet.label.viewOnly": "Lecture seule",
   "settings.section.wallet.title": "Paramètres du wallet",
-  "settings.setting.appearance.option.auto": "Auto",
   "settings.setting.appearance.option.dark.subtitle": "Utilisez toujours le thème sombre",
   "settings.setting.appearance.option.dark.title": "Thème sombre",
   "settings.setting.appearance.option.device.subtitle": "L'apparence par défaut de votre appareil",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Nous utilisons des données d'utilisation anonymes pour améliorer votre expérience sur les produits Uniswap Labs. Lorsqu'il est désactivé, nous suivons uniquement les erreurs et l'utilisation essentielle.",
   "settings.setting.privacy.analytics.title": "Autoriser l'analyse",
   "settings.setting.privacy.title": "Confidentialité",
-  "settings.setting.recoveryPhrase.remove": "Supprimer la phrase de récupération",
+  "settings.setting.recoveryPhrase.password.title": "Tapez votre mot de passe",
   "settings.setting.recoveryPhrase.title": "Phrase de récupération",
-  "settings.setting.recoveryPhrase.view": "Voyez la phrase de récupération",
   "settings.setting.smallBalances.title": "Masquer les petits soldes",
-  "settings.setting.theme.title": "Thème",
   "settings.setting.unknownTokens.title": "Masquer les tokens inconnus",
   "settings.setting.wallet.action.editLabel": "Modifier l'étiquette",
   "settings.setting.wallet.action.editProfile": "Editer le profil",
@@ -729,6 +734,8 @@
   "settings.version": "Version {{appVersion}}",
   "swap.button.max": "Max.",
   "swap.button.review": "Vérification",
+  "swap.button.submitting": "Soumission de l'échange...",
+  "swap.button.submitting.keep.open": "Gardez votre portefeuille ouvert...",
   "swap.button.swap": "Échanger",
   "swap.button.unwrap": "Déballez",
   "swap.button.view": "Voyez la transaction",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Vous êtes hors-ligne",
   "swap.warning.priceImpact.message": "En raison de la quantité de liquidité {{outputCurrencySymbol}} disponible, le plus que vous essayez d’échanger de {{inputCurrencySymbol}}, le moins que vous recevrez de {{outputCurrencySymbol}}.",
   "swap.warning.priceImpact.title": "Impact prix élevé ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Votre transaction n'a pas été soumise car vous avez fermé l'application.",
+  "swap.warning.queuedOrder.approvalFailed": "Votre transaction n'a pas été soumise car l'approbation du jeton a échoué.",
+  "swap.warning.queuedOrder.stale": "Votre transaction n'a pas été soumise car vous avez fermé l'application ou l'approbation a pris trop de temps.",
+  "swap.warning.queuedOrder.submissionFailed": "Un problème est survenu lors de la soumission de votre transaction.",
+  "swap.warning.queuedOrder.title": "Échange annulé",
+  "swap.warning.queuedOrder.wrap.message": "Votre ETH restera enveloppé en tant que WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Votre transaction n'a pas été soumise car la transaction wrap a échoué.",
   "swap.warning.rateLimit.message": "Veuillez réessayer dans quelques minutes.",
   "swap.warning.rateLimit.title": "Limite de connexion dépassée",
   "swap.warning.router.message": "Vous avez peut-être perdu la connexion ou le réseau est peut-être en panne. Si le problème persiste, veuillez réessayer plus tard.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Soldes sur d'autres réseaux",
   "token.balances.viewOnly": "Le solde de {{ownerAddress}}",
   "token.error.unknown": "Token inconnu",
-  "token.links.contract": "Contracter",
   "token.links.title": "Liens",
   "token.links.twitter": "Twitter",
   "token.links.website": "Site web",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Masquer le token",
   "tokens.action.unhide": "Démasquez token",
   "tokens.hidden.label": "Masqués ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Voyez sur {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Impossible de charger la collection NFT",
   "tokens.nfts.collection.label.items": "Articles",
   "tokens.nfts.collection.label.owners": "Les propriétaires",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Illimité",
   "transaction.currency.unknown": "token inconnu",
   "transaction.date": "Soumis le {{date}}",
+  "transaction.details.dappName": "Application",
+  "transaction.details.from": "Depuis",
   "transaction.details.networkFee": "Frais de réseau",
   "transaction.details.transactionId": "identifiant de transaction",
   "transaction.network.all": "Tous les réseaux",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Envoyé le {{externalDappName}}",
   "transaction.status.swap.canceled": "Échange annulé",
   "transaction.status.swap.canceling": "Annulation de l'échange",
+  "transaction.status.swap.expired": "Échange expiré",
   "transaction.status.swap.failed": "Échec de l'échange",
+  "transaction.status.swap.insufficientFunds": "Fonds insuffisants",
   "transaction.status.swap.pending": "Échange",
   "transaction.status.swap.success": "Échangé",
   "transaction.status.swap.successDapp": "Échangé le {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Faites défiler vers le bas pour signer",
   "walletConnect.request.button.sign": "Signe",
   "walletConnect.request.details.label.function": "Fonction",
-  "walletConnect.request.details.label.recipient": "À",
   "walletConnect.request.details.label.sending": "Envoi en cours",
   "walletConnect.request.error.insufficientFunds": "Vous n'avez pas assez de {{currencySymbol}} pour effectuer cette transaction.",
   "walletConnect.request.error.network": "Erreur de connexion réseau",
diff --git a/packages/uniswap/src/i18n/locales/translations/hi-IN.json b/packages/uniswap/src/i18n/locales/translations/hi-IN.json
index b331cfafd45..1f5f252ca5b 100644
--- a/packages/uniswap/src/i18n/locales/translations/hi-IN.json
+++ b/packages/uniswap/src/i18n/locales/translations/hi-IN.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "पुनः प्रयास करें",
   "common.button.understand": "मैं समझता हूँ",
   "common.button.view": "देखना",
+  "common.button.yes": "हाँ",
   "common.card.error.description": "कुछ गलत हो गया",
   "common.card.error.title": "उफ़! कुछ गलत हो गया।",
   "common.endAdornment": "और",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "समायोजन",
   "common.navigation.systemSettings": "समायोजन",
   "common.text.connected": "जुड़े हुए",
+  "common.text.contract": "अनुबंध",
   "common.text.disconnected": "डिस्कनेक्ट किया गया",
   "common.text.error": "गलती",
   "common.text.notAvailable": "एन/ए",
+  "common.text.recipient": "को",
+  "common.text.sender": "से",
   "common.text.unknown": "अज्ञात",
   "currency.aud": "ऑस्ट्रलियन डॉलर",
   "currency.brl": "ब्राजीली रियल",
@@ -171,17 +175,15 @@
   "currency.usd": "यूनाइटेड स्टेट का डॉलर",
   "currency.vnd": "वियतनामी डोंग",
   "dapp.request.approve.action": "मंज़ूरी देना",
-  "dapp.request.approve.fallbackTitle": "टोकन खर्च करने की स्वीकृति दें",
-  "dapp.request.approve.helptext": "इस साइट को अपने वॉलेट से इस टोकन तक पहुंचने और खर्च करने की अनुमति दें।",
+  "dapp.request.approve.fallbackTitle": "इस साइट को टोकन तक पहुंच की अनुमति दें",
+  "dapp.request.approve.helptext": "इस साइट को इस टोकन को एक्सेस करने और लेनदेन के लिए खर्च करने की अनुमति दें। सुनिश्चित करें कि आप इस साइट पर भरोसा करते हैं।",
   "dapp.request.approve.label": "बटुआ",
-  "dapp.request.approve.title": "व्यय स्वीकृत करें {{tokenSymbol}}",
+  "dapp.request.approve.title": "{{tokenSymbol}}तक पहुंच स्वीकृत करें",
   "dapp.request.base.title": "लेन-देन अनुरोध",
   "dapp.request.connect.helptext": "इस साइट को अपना वॉलेट पता, शेष राशि देखने और लेनदेन के लिए अनुमोदन का अनुरोध करने की अनुमति दें।",
   "dapp.request.connect.title": "साइट से कनेक्ट करें",
   "dapp.request.fallback.calldata.label": "कच्चा डेटा",
   "dapp.request.fallback.function.label": "समारोह",
-  "dapp.request.fallback.recipient.label": "को",
-  "dapp.request.fallback.sending.label": "भेजना",
   "dapp.request.permit2.description": "परमिट2 कई dapps में टोकन अनुमोदन का प्रबंधन करता है।",
   "dapp.request.permit2.header": "साइन परमिट2",
   "dapp.request.reject.action": "सभी अस्वीकार करें",
@@ -349,6 +351,13 @@
   "language.ukrainian": "यूक्रेनी",
   "language.urdu": "उर्दू",
   "language.vietnamese": "वियतनामी",
+  "mobile.appRating.button.decline": "ज़रूरी नहीं",
+  "mobile.appRating.description": "हमें बताएं कि क्या आपको इस ऐप के साथ अच्छा अनुभव हो रहा है",
+  "mobile.appRating.feedback.button.cancel": "शायद बाद में",
+  "mobile.appRating.feedback.button.send": "प्रतिक्रिया भेजें",
+  "mobile.appRating.feedback.description": "हमें बताएं कि हम आपके अनुभव को कैसे बेहतर बना सकते हैं",
+  "mobile.appRating.feedback.title": "हमें यह सुनकर खेद है।",
+  "mobile.appRating.title": "क्या आप यूनिस्वैप वॉलेट का आनंद ले रहे हैं?",
   "notification.assetVisibility.hidden": "{{assetName}} छिपा हुआ",
   "notification.assetVisibility.unhidden": "{{assetName}} छिपा हुआ",
   "notification.copied.address": "पता कॉपी किया गया",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "{{address}}के साथ उपयोग के लिए {{currencySymbol}} स्वीकृत।",
   "notification.transaction.pending": "लेन-देन लंबित",
   "notification.transaction.swap.canceled": "{{inputCurrencySymbol}}-{{outputCurrencySymbol}} स्वैप रद्द किया गया।",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} के लिए {{outputCurrencyAmountWithSymbol}} स्वैप समाप्त हो गया।",
   "notification.transaction.swap.fail": "{{inputCurrencyAmountWithSymbol}} को {{outputCurrencyAmountWithSymbol}}से बदलने में विफल।",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} {{outputCurrencyAmountWithSymbol}}से बदला गया।",
   "notification.transaction.transfer.canceled": "रद्द किया गया {{tokenNameOrAddress}} भेजें।",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Uniswap एक्सटेंशन पर जारी रखें",
   "notifications.scantastic.title": "सफलता!",
   "onboarding.backup.manual.banner": "इसे कागज के एक टुकड़े पर लिखकर किसी सुरक्षित स्थान पर या किसी सुरक्षित पासवर्ड मैनेजर में रखना सबसे अच्छा है।",
+  "onboarding.backup.manual.error": "अमान्य या ग़लत वर्तनी वाला शब्द",
   "onboarding.backup.manual.placeholder": "गुप्त शब्द",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} पूरा हुआ",
   "onboarding.backup.manual.selectedWordPlaceholder": "शब्द चुनें",
-  "onboarding.backup.manual.subtitle_one": "आपके पुनर्प्राप्ति वाक्यांश में <highlight/>{{count}}st</highlight/> शब्द क्या है?",
-  "onboarding.backup.manual.subtitle_two": "आपके पुनर्प्राप्ति वाक्यांश में <highlight/>{{count}}और</highlight/> शब्द क्या है?",
-  "onboarding.backup.manual.subtitle_few": "आपके पुनर्प्राप्ति वाक्यांश में <highlight/>{{count}}तीसरा</highlight/> शब्द क्या है?",
-  "onboarding.backup.manual.subtitle_other": "आपके पुनर्प्राप्ति वाक्यांश में <highlight/>{{count}}वां</highlight/> शब्द क्या है?",
+  "onboarding.backup.manual.subtitle_one": "आपके पुनर्प्राप्ति वाक्यांश में {{count}}पहला शब्द क्या है?",
+  "onboarding.backup.manual.subtitle_two": "आपके पुनर्प्राप्ति वाक्यांश में {{count}}दूसरा शब्द क्या है?",
+  "onboarding.backup.manual.subtitle_few": "आपके पुनर्प्राप्ति वाक्यांश में {{count}}तीसरा शब्द क्या है?",
+  "onboarding.backup.manual.subtitle_other": "आपके पुनर्प्राप्ति वाक्यांश में {{count}}वां शब्द क्या है?",
   "onboarding.backup.manual.title": "आइए सुनिश्चित करें कि आपने इसे सही तरीके से रिकॉर्ड किया है",
   "onboarding.backup.option.cloud.description": "अपने पुनर्प्राप्ति वाक्यांश को एक सुरक्षित पासवर्ड से एन्क्रिप्ट करें",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} बैकअप",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "यदि आप ऐप हटाते हैं या अपना डिवाइस खो देते हैं तो बैकअप आपको अपना वॉलेट पुनर्स्थापित करने देता है",
   "onboarding.backup.title.existing": "अपने बटुए का बैकअप लें",
   "onboarding.backup.title.new": "एक बैकअप विधि चुनें",
-  "onboarding.backup.view.disclaimer": "मैं समझता हूं कि यदि मैं अपना पुनर्प्राप्ति वाक्यांश खो देता हूं, तो Uniswap Labs मुझे इसे पुनर्स्थापित करने में मदद नहीं कर सकती है",
+  "onboarding.backup.view.disclaimer": "मैं समझता हूं कि यदि मैं अपना पुनर्प्राप्ति वाक्यांश खो देता हूं, तो यूनिस्वैप लैब्स मुझे इसे पुनर्स्थापित करने में मदद नहीं कर सकता।",
   "onboarding.backup.view.subtitle.message1": "जारी रखने से पहले निम्नलिखित को ध्यान से पढ़ें",
   "onboarding.backup.view.subtitle.message2": "आपको अपना बटुआ पुनः प्राप्त करने के लिए इन सभी 12 गुप्त शब्दों को दर्ज करना होगा।",
   "onboarding.backup.view.title": "अपना पुनर्प्राप्ति वाक्यांश लिखें",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "अपने टूलबार में Uniswap एक्सटेंशन जोड़ने के लिए पिन आइकन पर क्लिक करें।",
   "onboarding.complete.pin.title": "पिन यूनिस्वैप एक्सटेंशन",
   "onboarding.complete.title": "तुम सब सेट हो",
-  "onboarding.extension.connectMobile.button": "अपने फ़ोन से आयात करें",
-  "onboarding.extension.connectMobile.title": "क्या आपके पास Uniswap मोबाइल ऐप है?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "उपयोगकर्ता नाम का दावा करने के लिए मोबाइल ऐप डाउनलोड करें",
   "onboarding.extension.getOnTheBetaWaitlist.title": "बीटा प्रतीक्षा सूची में शामिल हों",
   "onboarding.extension.password.subtitle": "आपको अपने वॉलेट को अनलॉक करने और अपने पुनर्प्राप्ति वाक्यांश तक पहुंचने के लिए इसकी आवश्यकता होगी",
   "onboarding.extension.password.title.default": "पासवर्ड बनाएं",
   "onboarding.extension.password.title.reset": "अपना पासवर्ड रीसेट करें",
+  "onboarding.extension.unsupported.description": "यूनिस्वैप एक्सटेंशन अभी केवल क्रोम के साथ संगत है।",
+  "onboarding.extension.unsupported.title": "यह ब्राउज़र समर्थित नहीं है (अभी तक)",
   "onboarding.import.error.invalidWords_one": "1 शब्द अमान्य या ग़लत वर्तनी वाला है",
   "onboarding.import.error.invalidWords_other": "{{count}} शब्द अमान्य या ग़लत वर्तनी वाले हैं",
   "onboarding.import.method.import.message": "किसी अन्य क्रिप्टो वॉलेट से अपना पुनर्प्राप्ति वाक्यांश दर्ज करें",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "अपना 12-शब्द पुनर्प्राप्ति वाक्यांश टाइप करें या पेस्ट करें",
   "onboarding.importMnemonic.title": "अपना पुनर्प्राप्ति वाक्यांश दर्ज करें",
   "onboarding.intro.button.alreadyHave": "मेरे पास पहले से ही एक बटुआ है",
-  "onboarding.intro.title": "\nUniswap वॉलेट में आपका स्वागत है",
+  "onboarding.intro.mobileScan.button": "आयात करने के लिए QR कोड स्कैन करें",
+  "onboarding.intro.mobileScan.title": "क्या आपके पास Uniswap ऐप है?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "पात्रता जांचें",
   "onboarding.introBetaWaitlist.button.letsGo": "चल दर",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "यह जांचने के लिए कि क्या आप बीटा के लिए पात्र हैं, नीचे अपना <highlight>uni.eth</highlight> उपयोगकर्ता नाम दर्ज करें।",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "आप अभी भी प्रतीक्षा सूची में हैं। जब आप पात्र हो जाएंगे तो हम आपको Uniswap मोबाइल ऐप में सूचित करेंगे!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "उपयोगकर्ता नाम",
   "onboarding.landing.button.add": "एक मौजूदा वॉलेट जोड़ें",
-  "onboarding.landing.button.create": "एक नया वॉलेट बनाएं",
+  "onboarding.landing.button.create": "वॉलेट बनाएं",
   "onboarding.notification.permission.message": "सूचनाएं प्राप्त करने के लिए, अपने डिवाइस की सेटिंग में Uniswap वॉलेट के लिए सूचनाएं चालू करें।",
   "onboarding.notification.permission.title": "अधिसूचना अनुमति",
   "onboarding.notification.subtitle": "जब आपका स्थानांतरण, स्वैप और अनुमोदन पूरा हो जाए तो सूचित करें।",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "आपके पास यह केवल देखने योग्य वॉलेट के रूप में है",
   "send.recipientSelect.search.empty.message": "जब आप किसी वॉलेट पते पर टोकन भेजते हैं, तो वे यहां दिखाई देंगे",
   "send.recipientSelect.search.empty.title": "कोई वॉलेट सहेजा नहीं गया",
-  "send.recipientSelect.title": "को",
   "send.review.modal.title": "आप भेज रहे हैं",
   "send.review.summary.button.title": "भेजने की पुष्टि करें",
   "send.review.summary.sending": "भेजना",
-  "send.review.summary.to": "को",
   "send.search.empty.subtitle": "आपके द्वारा टाइप किया गया पता या तो मौजूद नहीं है या गलत तरीके से लिखा गया है।",
   "send.search.empty.title": "कोई परिणाम नहीं मिला",
   "send.search.placeholder": "ईएनएस या पता खोजें",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "यह वॉलेट केवल देखने के लिए है",
   "setting.recoveryPhrase.account.show": "पुनर्प्राप्ति वाक्यांश दिखाएँ",
   "setting.recoveryPhrase.action.hide": "पुनर्प्राप्ति वाक्यांश छिपाएँ",
-  "setting.recoveryPhrase.remove.button": "पुनर्प्राप्ति वाक्यांश हटाएँ",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "मैं समझता हूं कि अगर मैं ऐसा करने में विफल रहा तो Uniswap Labs मेरा बटुआ वापस पाने में मेरी मदद नहीं कर सकती",
+  "setting.recoveryPhrase.remove": "पुनर्प्राप्ति वाक्यांश हटाएँ",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "मैं समझता हूं कि यदि मैं ऐसा करने में विफल रहा तो यूनिस्वैप लैब्स मुझे अपना वॉलेट पुनर्प्राप्त करने में मदद नहीं कर सकता।",
   "setting.recoveryPhrase.remove.confirm.title": "मैंने अपना पुनर्प्राप्ति वाक्यांश सहेजा है",
-  "setting.recoveryPhrase.remove.initial.subtitle": "सुनिश्चित करें कि आपने अपना पुनर्प्राप्ति वाक्यांश सहेज लिया है. अन्यथा आप अपने धन तक पहुंच खो देंगे",
+  "setting.recoveryPhrase.remove.initial.subtitle": "सुनिश्चित करें कि आपने अपना पुनर्प्राप्ति वाक्यांश सहेज लिया है। अन्यथा आप अपने वॉलेट तक पहुँच खो देंगे",
   "setting.recoveryPhrase.remove.initial.title": "इससे पहले कि आप जारी रखें",
   "setting.recoveryPhrase.remove.password.error": "गलत पासवर्ड। पुनः प्रयास करें",
-  "setting.recoveryPhrase.remove.password.input": "पास वर्ड दर्ज करें",
-  "setting.recoveryPhrase.remove.subtitle": "जारी रखने के लिए अपना पासवर्ड दर्ज करें",
+  "setting.recoveryPhrase.remove.subtitle": "पुष्टि करने के लिए अपना पासवर्ड दर्ज करें",
   "setting.recoveryPhrase.remove.title": "आप अपना पुनर्प्राप्ति वाक्यांश हटा रहे हैं",
-  "setting.recoveryPhrase.view.error": "ग़लत पासवर्ड, पुनः प्रयास करें",
   "setting.recoveryPhrase.view.warning.message1": "जो कोई भी आपके पुनर्प्राप्ति वाक्यांश को जानता है वह आपके वॉलेट और फंड तक पहुंच सकता है",
   "setting.recoveryPhrase.view.warning.message2": "इसे अकेले में देखें",
-  "setting.recoveryPhrase.view.warning.message3": "इसे किसी के साथ साझा न करें",
-  "setting.recoveryPhrase.view.warning.message4": "इसे कभी भी किसी वेबसाइट या ऐप पर दर्ज न करें",
+  "setting.recoveryPhrase.view.warning.message3": "किसी के साथ साझा न करें",
+  "setting.recoveryPhrase.view.warning.message4": "इसे कभी भी किसी वेबसाइट या एप्लीकेशन में दर्ज न करें",
   "setting.recoveryPhrase.view.warning.title": "इससे पहले कि आप जारी रखें",
   "setting.recoveryPhrase.warning.screenshot.message": "जो कोई भी आपकी तस्वीरों तक पहुंच प्राप्त करता है वह आपके बटुए तक पहुंच सकता है। हम अनुशंसा करते हैं कि आप इसके बजाय अपने शब्द लिखें।",
   "setting.recoveryPhrase.warning.screenshot.title": "स्क्रीनशॉट सुरक्षित नहीं हैं",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "कम देखें",
   "settings.section.wallet.label.viewOnly": "केवल देखें",
   "settings.section.wallet.title": "वॉलेट सेटिंग्स",
-  "settings.setting.appearance.option.auto": "ऑटो",
   "settings.setting.appearance.option.dark.subtitle": "हमेशा डार्क मोड का इस्तेमाल करें",
   "settings.setting.appearance.option.dark.title": "डार्क मोड",
   "settings.setting.appearance.option.device.subtitle": "आपके डिवाइस का स्वरूप डिफ़ॉल्ट है",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Uniswap Labs उत्पादों में आपके अनुभव को बेहतर बनाने के लिए हम अनाम उपयोग डेटा का उपयोग करते हैं। अक्षम होने पर, हम केवल त्रुटियों और आवश्यक उपयोग को ट्रैक करते हैं।",
   "settings.setting.privacy.analytics.title": "विश्लेषण की अनुमति दें",
   "settings.setting.privacy.title": "गोपनीयता",
-  "settings.setting.recoveryPhrase.remove": "पुनर्प्राप्ति वाक्यांश हटाएँ",
+  "settings.setting.recoveryPhrase.password.title": "अपना कूटशब्द भरें",
   "settings.setting.recoveryPhrase.title": "पुनर्प्राप्ति वाक्यांश",
-  "settings.setting.recoveryPhrase.view": "पुनर्प्राप्ति वाक्यांश देखें",
   "settings.setting.smallBalances.title": "छोटे-छोटे शेष छिपाएँ",
-  "settings.setting.theme.title": "विषय",
   "settings.setting.unknownTokens.title": "अज्ञात टोकन छिपाएँ",
   "settings.setting.wallet.action.editLabel": "लेबल संपादित करें",
   "settings.setting.wallet.action.editProfile": "प्रोफ़ाइल संपादित करें",
@@ -729,6 +734,8 @@
   "settings.version": "संस्करण {{appVersion}}",
   "swap.button.max": "अधिकतम",
   "swap.button.review": "समीक्षा",
+  "swap.button.submitting": "स्वैप सबमिट किया जा रहा है...",
+  "swap.button.submitting.keep.open": "अपना बटुआ खुला रखें...",
   "swap.button.swap": "बदलना",
   "swap.button.unwrap": "खोलना",
   "swap.button.view": "लेन-देन देखें",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "आप ऑफ़लाइन हैं",
   "swap.warning.priceImpact.message": "वर्तमान में उपलब्ध {{outputCurrencySymbol}} तरलता की मात्रा के कारण, जितना अधिक {{inputCurrencySymbol}} आप स्वैप करने का प्रयास करेंगे, उतना ही कम {{outputCurrencySymbol}} आपको प्राप्त होगा।",
   "swap.warning.priceImpact.title": "उच्च मूल्य प्रभाव ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "आपका लेनदेन सबमिट नहीं किया गया क्योंकि आपने ऐप बंद कर दिया था.",
+  "swap.warning.queuedOrder.approvalFailed": "आपका लेनदेन सबमिट नहीं किया गया क्योंकि टोकन अनुमोदन विफल हो गया.",
+  "swap.warning.queuedOrder.stale": "आपका लेन-देन सबमिट नहीं किया गया क्योंकि आपने ऐप बंद कर दिया था या स्वीकृति में बहुत अधिक समय लग गया था।",
+  "swap.warning.queuedOrder.submissionFailed": "आपका लेनदेन सबमिट करने में समस्या हुई.",
+  "swap.warning.queuedOrder.title": "स्वैप रद्द",
+  "swap.warning.queuedOrder.wrap.message": "आपका ETH WETH के रूप में लिपटा रहेगा।",
+  "swap.warning.queuedOrder.wrapFailed": "आपका लेनदेन सबमिट नहीं किया गया क्योंकि रैप लेनदेन विफल हो गया.",
   "swap.warning.rateLimit.message": "कुछ ही मिनटों में पुनः प्रयास करें।",
   "swap.warning.rateLimit.title": "दर सीमा पार हो गई",
   "swap.warning.router.message": "हो सकता है कि आपका कनेक्शन टूट गया हो या नेटवर्क डाउन हो गया हो. यदि समस्या बनी रहती है, तो कृपया बाद में पुनः प्रयास करें।",
@@ -805,7 +819,6 @@
   "token.balances.other": "अन्य नेटवर्क पर संतुलन",
   "token.balances.viewOnly": "{{ownerAddress}}का संतुलन",
   "token.error.unknown": "अज्ञात टोकन",
-  "token.links.contract": "अनुबंध",
   "token.links.title": "लिंक",
   "token.links.twitter": "ट्विटर",
   "token.links.website": "वेबसाइट",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "टोकन छिपाएँ",
   "tokens.action.unhide": "टोकन उजागर करें",
   "tokens.hidden.label": "छिपा हुआ ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "{{blockExplorerName}}पर देखें",
   "tokens.nfts.collection.error.load.title": "एनएफटी संग्रह लोड नहीं किया जा सका",
   "tokens.nfts.collection.label.items": "सामान",
   "tokens.nfts.collection.label.owners": "मालिकों",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "असीमित",
   "transaction.currency.unknown": "अज्ञात टोकन",
   "transaction.date": "{{date}}पर प्रस्तुत किया गया",
+  "transaction.details.dappName": "अनुप्रयोग",
+  "transaction.details.from": "से",
   "transaction.details.networkFee": "नेटवर्क लागत",
   "transaction.details.transactionId": "लेन-देन आईडी",
   "transaction.network.all": "सभी नेटवर्क",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "{{externalDappName}}पर भेजा गया",
   "transaction.status.swap.canceled": "रद्द किया गया स्वैप",
   "transaction.status.swap.canceling": "स्वैप रद्द करना",
+  "transaction.status.swap.expired": "स्वैप की अवधि समाप्त हो गई",
   "transaction.status.swap.failed": "स्वैप करने में विफल",
+  "transaction.status.swap.insufficientFunds": "अपर्याप्त कोष",
   "transaction.status.swap.pending": "अदला-बदली",
   "transaction.status.swap.success": "बदली",
   "transaction.status.swap.successDapp": "{{externalDappName}}पर स्वैप किया गया",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "हस्ताक्षर करने के लिए नीचे स्क्रॉल करें",
   "walletConnect.request.button.sign": "संकेत",
   "walletConnect.request.details.label.function": "समारोह",
-  "walletConnect.request.details.label.recipient": "को",
   "walletConnect.request.details.label.sending": "भेजना",
   "walletConnect.request.error.insufficientFunds": "इस लेनदेन को पूरा करने के लिए आपके पास पर्याप्त {{currencySymbol}} नहीं है।",
   "walletConnect.request.error.network": "इंटरनेट या नेटवर्क कनेक्शन त्रुटि",
diff --git a/packages/uniswap/src/i18n/locales/translations/id-ID.json b/packages/uniswap/src/i18n/locales/translations/id-ID.json
index 249f5286dcd..45bba1c3748 100644
--- a/packages/uniswap/src/i18n/locales/translations/id-ID.json
+++ b/packages/uniswap/src/i18n/locales/translations/id-ID.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Coba lagi",
   "common.button.understand": "saya mengerti",
   "common.button.view": "Melihat",
+  "common.button.yes": "Ya",
   "common.card.error.description": "Ada yang salah",
   "common.card.error.title": "Ups! Ada yang salah.",
   "common.endAdornment": "Dan",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Pengaturan",
   "common.navigation.systemSettings": "Pengaturan",
   "common.text.connected": "Terhubung",
+  "common.text.contract": "Kontrak",
   "common.text.disconnected": "Terputus",
   "common.text.error": "Kesalahan",
   "common.text.notAvailable": "T/A",
+  "common.text.recipient": "Ke",
+  "common.text.sender": "Dari",
   "common.text.unknown": "Tidak dikenal",
   "currency.aud": "Dollar Australia",
   "currency.brl": "Real Brasil",
@@ -171,17 +175,15 @@
   "currency.usd": "Dolar Amerika Serikat",
   "currency.vnd": "Dong Vietnam",
   "dapp.request.approve.action": "Menyetujui",
-  "dapp.request.approve.fallbackTitle": "Setujui token pembelanjaan",
-  "dapp.request.approve.helptext": "Izinkan situs ini mengakses dan membelanjakan token ini dari dompet Anda.",
+  "dapp.request.approve.fallbackTitle": "Setujui situs ini untuk mengakses token",
+  "dapp.request.approve.helptext": "Izinkan situs ini mengakses dan membelanjakan token ini untuk transaksi. Pastikan Anda mempercayai situs ini.",
   "dapp.request.approve.label": "Dompet",
-  "dapp.request.approve.title": "Setujui pembelanjaan {{tokenSymbol}}",
+  "dapp.request.approve.title": "Setujui akses ke {{tokenSymbol}}",
   "dapp.request.base.title": "Permintaan transaksi",
   "dapp.request.connect.helptext": "Izinkan situs ini melihat alamat dompet Anda, saldo, dan meminta persetujuan transaksi.",
   "dapp.request.connect.title": "Hubungkan ke situs",
   "dapp.request.fallback.calldata.label": "Data mentah",
   "dapp.request.fallback.function.label": "Fungsi",
-  "dapp.request.fallback.recipient.label": "Ke",
-  "dapp.request.fallback.sending.label": "Mengirim",
   "dapp.request.permit2.description": "Permit2 mengelola persetujuan token di beberapa dapps.",
   "dapp.request.permit2.header": "Menandatangani Izin2",
   "dapp.request.reject.action": "Tolak semuanya",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Orang Ukraina",
   "language.urdu": "bahasa Urdu",
   "language.vietnamese": "Vietnam",
+  "mobile.appRating.button.decline": "Tidak terlalu",
+  "mobile.appRating.description": "Beri tahu kami jika Anda memiliki pengalaman yang baik dengan aplikasi ini",
+  "mobile.appRating.feedback.button.cancel": "mungkin nanti",
+  "mobile.appRating.feedback.button.send": "Kirim masukan",
+  "mobile.appRating.feedback.description": "Beri tahu kami bagaimana kami dapat meningkatkan pengalaman Anda",
+  "mobile.appRating.feedback.title": "Kami menyesal mendengarnya.",
+  "mobile.appRating.title": "Menikmati Dompet Uniswap?",
   "notification.assetVisibility.hidden": "{{assetName}} tersembunyi",
   "notification.assetVisibility.unhidden": "{{assetName}} tidak disembunyikan",
   "notification.copied.address": "Alamat disalin",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Disetujui {{currencySymbol}} untuk digunakan dengan {{address}}.",
   "notification.transaction.pending": "Transaksi tertunda",
   "notification.transaction.swap.canceled": "Dibatalkan {{inputCurrencySymbol}}-{{outputCurrencySymbol}} pertukaran.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} untuk {{outputCurrencyAmountWithSymbol}} swap kedaluwarsa.",
   "notification.transaction.swap.fail": "Gagal menukar {{inputCurrencyAmountWithSymbol}} dengan {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Bertukar {{inputCurrencyAmountWithSymbol}} untuk {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Dibatalkan {{tokenNameOrAddress}} kirim.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Lanjutkan di Ekstensi Uniswap",
   "notifications.scantastic.title": "Berhasil!",
   "onboarding.backup.manual.banner": "Yang terbaik adalah menulis ini di selembar kertas dan menyimpannya di tempat yang aman atau di pengelola kata sandi yang aman.",
+  "onboarding.backup.manual.error": "Kata tidak valid atau salah eja",
   "onboarding.backup.manual.placeholder": "Kata rahasia",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "Pilih kata",
-  "onboarding.backup.manual.subtitle_one": "Apa kata <highlight/>{{count}}st</highlight/> dalam frasa pemulihan Anda?",
-  "onboarding.backup.manual.subtitle_two": "Apa kata <highlight/>{{count}}dan</highlight/> dalam frasa pemulihan Anda?",
-  "onboarding.backup.manual.subtitle_few": "Apa kata <highlight/>{{count}}rd</highlight/> dalam frasa pemulihan Anda?",
-  "onboarding.backup.manual.subtitle_other": "Apa kata <highlight/>{{count}}th</highlight/> dalam frasa pemulihan Anda?",
+  "onboarding.backup.manual.subtitle_one": "Apa kata pertama {{count}}dalam frase pemulihan Anda?",
+  "onboarding.backup.manual.subtitle_two": "Apa kata terakhir {{count}}dalam frase pemulihan Anda?",
+  "onboarding.backup.manual.subtitle_few": "Apa kata ketiga {{count}}dalam frase pemulihan Anda?",
+  "onboarding.backup.manual.subtitle_other": "Apa kata {{count}}dalam frase pemulihan Anda?",
   "onboarding.backup.manual.title": "Pastikan Anda telah mencatatnya dengan benar",
   "onboarding.backup.option.cloud.description": "Enkripsi frase pemulihan Anda dengan kata sandi yang aman",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} cadangan",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Cadangan memungkinkan Anda memulihkan dompet jika Anda menghapus aplikasi atau kehilangan perangkat",
   "onboarding.backup.title.existing": "Cadangkan dompet Anda",
   "onboarding.backup.title.new": "Pilih metode pencadangan",
-  "onboarding.backup.view.disclaimer": "Saya memahami bahwa jika saya kehilangan frase pemulihan, Uniswap Labs tidak dapat membantu saya memulihkannya",
+  "onboarding.backup.view.disclaimer": "Saya memahami bahwa jika saya kehilangan frase pemulihan, Uniswap Labs tidak dapat membantu saya memulihkannya.",
   "onboarding.backup.view.subtitle.message1": "Bacalah yang berikut ini dengan seksama sebelum melanjutkan",
   "onboarding.backup.view.subtitle.message2": "Anda harus memasukkan 12 kata rahasia ini untuk memulihkan dompet Anda.",
   "onboarding.backup.view.title": "Tuliskan frase pemulihan Anda",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Klik ikon pin untuk menambahkan Ekstensi Uniswap ke toolbar Anda.",
   "onboarding.complete.pin.title": "Sematkan Ekstensi Uniswap",
   "onboarding.complete.title": "Anda sudah siap",
-  "onboarding.extension.connectMobile.button": "Impor dari ponsel Anda",
-  "onboarding.extension.connectMobile.title": "Punya aplikasi seluler Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Unduh aplikasi seluler untuk mengklaim nama pengguna",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Masuk daftar tunggu Beta",
   "onboarding.extension.password.subtitle": "Anda memerlukan ini untuk membuka kunci dompet Anda dan mengakses frase pemulihan Anda",
   "onboarding.extension.password.title.default": "Buat kata sandi",
   "onboarding.extension.password.title.reset": "Mereset password Anda",
+  "onboarding.extension.unsupported.description": "Ekstensi Uniswap hanya kompatibel dengan Chrome saat ini.",
+  "onboarding.extension.unsupported.title": "Browser ini belum didukung (belum)",
   "onboarding.import.error.invalidWords_one": "1 kata tidak valid atau salah eja",
   "onboarding.import.error.invalidWords_other": "{{count}} kata-kata tidak valid atau salah eja",
   "onboarding.import.method.import.message": "Masukkan frasa pemulihan Anda dari dompet kripto lain",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Ketik atau tempel frasa pemulihan 12 kata Anda",
   "onboarding.importMnemonic.title": "Masukkan frase pemulihan Anda",
   "onboarding.intro.button.alreadyHave": "Saya sudah punya dompet",
-  "onboarding.intro.title": "Selamat datang di \nDompet Uniswap",
+  "onboarding.intro.mobileScan.button": "Pindai kode QR untuk mengimpor",
+  "onboarding.intro.mobileScan.title": "Punya aplikasi Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Periksa kelayakan",
   "onboarding.introBetaWaitlist.button.letsGo": "Ayo pergi",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Masukkan nama pengguna <highlight>uni.eth</highlight> Anda di bawah untuk memeriksa apakah Anda memenuhi syarat untuk Beta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Anda masih dalam daftar tunggu. Kami akan memberi tahu Anda di aplikasi seluler Uniswap saat Anda memenuhi syarat!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "nama belakang",
   "onboarding.landing.button.add": "Tambahkan dompet yang ada",
-  "onboarding.landing.button.create": "Buat dompet baru",
+  "onboarding.landing.button.create": "Buat dompet",
   "onboarding.notification.permission.message": "Untuk menerima notifikasi, aktifkan notifikasi untuk Uniswap Wallet di pengaturan perangkat Anda.",
   "onboarding.notification.permission.title": "Izin pemberitahuan",
   "onboarding.notification.subtitle": "Dapatkan pemberitahuan saat transfer, penukaran, dan persetujuan Anda selesai.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Anda memiliki ini sebagai dompet hanya lihat",
   "send.recipientSelect.search.empty.message": "Saat Anda mengirim token ke alamat dompet, token tersebut akan muncul di sini",
   "send.recipientSelect.search.empty.title": "Tidak ada dompet yang disimpan",
-  "send.recipientSelect.title": "Ke",
   "send.review.modal.title": "Anda mengirim",
   "send.review.summary.button.title": "Konfirmasikan pengiriman",
   "send.review.summary.sending": "Mengirim",
-  "send.review.summary.to": "Ke",
   "send.search.empty.subtitle": "Alamat yang Anda ketikkan tidak ada atau salah ejaannya.",
   "send.search.empty.title": "Tidak ada hasil yang ditemukan",
   "send.search.placeholder": "Cari ENS atau alamat",
@@ -612,19 +622,17 @@
   "send.warning.viewOnly.title": "Dompet ini hanya dapat dilihat",
   "setting.recoveryPhrase.account.show": "Tampilkan frasa pemulihan",
   "setting.recoveryPhrase.action.hide": "Sembunyikan frase pemulihan",
-  "setting.recoveryPhrase.remove.button": "Hapus frase pemulihan",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Saya memahami bahwa Uniswap Labs tidak dapat membantu memulihkan dompet saya jika saya gagal melakukannya",
+  "setting.recoveryPhrase.remove": "Hapus frase pemulihan",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Saya memahami bahwa Uniswap Labs tidak dapat membantu memulihkan dompet saya jika saya gagal melakukannya.",
   "setting.recoveryPhrase.remove.confirm.title": "Saya menyimpan frase pemulihan saya",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Pastikan Anda telah menyimpan frase pemulihan Anda. Jika tidak, Anda akan kehilangan akses ke dana Anda",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Pastikan Anda telah menyimpan frase pemulihan Anda. Jika tidak, Anda akan kehilangan akses ke dompet Anda",
   "setting.recoveryPhrase.remove.initial.title": "Sebelum Anda melanjutkan",
   "setting.recoveryPhrase.remove.password.error": "Kata sandi salah. Coba lagi",
-  "setting.recoveryPhrase.remove.password.input": "Masukkan kata kunci",
-  "setting.recoveryPhrase.remove.subtitle": "Masukkan kata sandi Anda untuk melanjutkan",
+  "setting.recoveryPhrase.remove.subtitle": "Masukkan kata sandi Anda untuk mengonfirmasi",
   "setting.recoveryPhrase.remove.title": "Anda menghapus frase pemulihan Anda",
-  "setting.recoveryPhrase.view.error": "Kata sandi salah, coba lagi",
   "setting.recoveryPhrase.view.warning.message1": "Siapa pun yang mengetahui frasa pemulihan Anda dapat mengakses dompet dan dana Anda",
   "setting.recoveryPhrase.view.warning.message2": "Lihat ini secara pribadi",
-  "setting.recoveryPhrase.view.warning.message3": "Jangan berbagi ini dengan siapa pun",
+  "setting.recoveryPhrase.view.warning.message3": "Jangan berbagi dengan siapa pun",
   "setting.recoveryPhrase.view.warning.message4": "Jangan pernah memasukkannya ke situs web atau aplikasi apa pun",
   "setting.recoveryPhrase.view.warning.title": "Sebelum Anda melanjutkan",
   "setting.recoveryPhrase.warning.screenshot.message": "Siapa pun yang mendapatkan akses ke foto Anda dapat mengakses dompet Anda. Kami menyarankan Anda menuliskan kata-kata Anda saja.",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Lihat lebih sedikit",
   "settings.section.wallet.label.viewOnly": "Hanya lihat",
   "settings.section.wallet.title": "Pengaturan dompet",
-  "settings.setting.appearance.option.auto": "Mobil",
   "settings.setting.appearance.option.dark.subtitle": "Selalu gunakan mode gelap",
   "settings.setting.appearance.option.dark.title": "Mode gelap",
   "settings.setting.appearance.option.device.subtitle": "Default untuk tampilan perangkat Anda",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Kami menggunakan data penggunaan anonim untuk meningkatkan pengalaman Anda di seluruh produk Uniswap Labs. Saat dinonaktifkan, kami hanya melacak kesalahan dan penggunaan penting.",
   "settings.setting.privacy.analytics.title": "Izinkan analitik",
   "settings.setting.privacy.title": "Pribadi",
-  "settings.setting.recoveryPhrase.remove": "Hapus frase pemulihan",
+  "settings.setting.recoveryPhrase.password.title": "Masukkan kata sandi Anda",
   "settings.setting.recoveryPhrase.title": "Frase pemulihan",
-  "settings.setting.recoveryPhrase.view": "Lihat frase pemulihan",
   "settings.setting.smallBalances.title": "Sembunyikan saldo kecil",
-  "settings.setting.theme.title": "Tema",
   "settings.setting.unknownTokens.title": "Sembunyikan token yang tidak diketahui",
   "settings.setting.wallet.action.editLabel": "Sunting label",
   "settings.setting.wallet.action.editProfile": "Sunting profil",
@@ -729,6 +734,8 @@
   "settings.version": "Versi {{appVersion}}",
   "swap.button.max": "Maks",
   "swap.button.review": "Tinjauan",
+  "swap.button.submitting": "Mengirimkan pertukaran...",
+  "swap.button.submitting.keep.open": "Buka dompetmu...",
   "swap.button.swap": "Menukar",
   "swap.button.unwrap": "Membuka",
   "swap.button.view": "Lihat transaksi",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Anda sedang luring",
   "swap.warning.priceImpact.message": "Karena jumlah {{outputCurrencySymbol}} likuiditas yang tersedia saat ini, semakin banyak {{inputCurrencySymbol}} Anda mencoba menukar, semakin sedikit {{outputCurrencySymbol}} yang akan Anda terima.",
   "swap.warning.priceImpact.title": "Dampak harga tinggi ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Transaksi Anda tidak terkirim karena Anda menutup aplikasi.",
+  "swap.warning.queuedOrder.approvalFailed": "Transaksi Anda tidak dikirimkan karena persetujuan token gagal.",
+  "swap.warning.queuedOrder.stale": "Transaksi Anda tidak terkirim karena Anda menutup aplikasi atau persetujuannya terlalu lama.",
+  "swap.warning.queuedOrder.submissionFailed": "Ada masalah saat mengirimkan transaksi Anda.",
+  "swap.warning.queuedOrder.title": "Pertukaran dibatalkan",
+  "swap.warning.queuedOrder.wrap.message": "ETH Anda akan tetap terbungkus sebagai WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Transaksi Anda tidak terkirim karena transaksi bungkus gagal.",
   "swap.warning.rateLimit.message": "Silakan coba lagi dalam beberapa menit.",
   "swap.warning.rateLimit.title": "Batas tarif terlampaui",
   "swap.warning.router.message": "Anda mungkin kehilangan koneksi atau jaringan mungkin sedang down. Jika masalah masih berlanjut, coba lagi nanti.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Saldo di jaringan lain",
   "token.balances.viewOnly": "saldo {{ownerAddress}}",
   "token.error.unknown": "Tanda tidak diketahui",
-  "token.links.contract": "Kontrak",
   "token.links.title": "Tautan",
   "token.links.twitter": "Twitter",
   "token.links.website": "Situs web",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Sembunyikan Token",
   "tokens.action.unhide": "Perlihatkan Token",
   "tokens.hidden.label": "Tersembunyi ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Lihat di {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Tidak dapat memuat koleksi NFT",
   "tokens.nfts.collection.label.items": "Barang",
   "tokens.nfts.collection.label.owners": "Pemilik",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Tak terbatas",
   "transaction.currency.unknown": "tanda yang tidak diketahui",
   "transaction.date": "Dikirim pada {{date}}",
+  "transaction.details.dappName": "Aplikasi",
+  "transaction.details.from": "Dari",
   "transaction.details.networkFee": "Biaya jaringan",
   "transaction.details.transactionId": "ID transaksi",
   "transaction.network.all": "Semua jaringan",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Dikirim pada {{externalDappName}}",
   "transaction.status.swap.canceled": "Pertukaran dibatalkan",
   "transaction.status.swap.canceling": "Membatalkan pertukaran",
+  "transaction.status.swap.expired": "Pertukaran sudah habis masa berlakunya",
   "transaction.status.swap.failed": "Gagal menukar",
+  "transaction.status.swap.insufficientFunds": "Dana tidak mencukupi",
   "transaction.status.swap.pending": "Bertukar",
   "transaction.status.swap.success": "Bertukar",
   "transaction.status.swap.successDapp": "Bertukar pada {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Gulir ke bawah untuk menandatangani",
   "walletConnect.request.button.sign": "Tanda",
   "walletConnect.request.details.label.function": "Fungsi",
-  "walletConnect.request.details.label.recipient": "Ke",
   "walletConnect.request.details.label.sending": "Mengirim",
   "walletConnect.request.error.insufficientFunds": "Anda tidak memiliki cukup {{currencySymbol}} untuk menyelesaikan transaksi ini.",
   "walletConnect.request.error.network": "Kesalahan koneksi internet atau jaringan",
diff --git a/packages/uniswap/src/i18n/locales/translations/ja-JP.json b/packages/uniswap/src/i18n/locales/translations/ja-JP.json
index 5cfc3b2f519..13969a9e2c4 100644
--- a/packages/uniswap/src/i18n/locales/translations/ja-JP.json
+++ b/packages/uniswap/src/i18n/locales/translations/ja-JP.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "やり直す",
   "common.button.understand": "了解",
   "common.button.view": "表示",
+  "common.button.yes": "はい",
   "common.card.error.description": "エラーが発生しました",
   "common.card.error.title": "エラーが発生しました。",
   "common.endAdornment": "と",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "設定",
   "common.navigation.systemSettings": "設定",
   "common.text.connected": "接続されました",
+  "common.text.contract": "契約",
   "common.text.disconnected": "切断済",
   "common.text.error": "エラー",
   "common.text.notAvailable": "該当なし",
+  "common.text.recipient": "受信者",
+  "common.text.sender": "から",
   "common.text.unknown": "不明",
   "currency.aud": "オーストラリア ドル",
   "currency.brl": "ブラジル レアル",
@@ -171,17 +175,15 @@
   "currency.usd": "米ドル",
   "currency.vnd": "ベトナムドン",
   "dapp.request.approve.action": "承認する",
-  "dapp.request.approve.fallbackTitle": "支出トークンを承認する",
-  "dapp.request.approve.helptext": "このサイトがウォレットからこのトークンにアクセスして使用することを許可します。",
+  "dapp.request.approve.fallbackTitle": "このサイトがトークンにアクセスすることを承認する",
+  "dapp.request.approve.helptext": "このサイトがこのトークンにアクセスし、取引に使用することを許可します。このサイトが信頼できることを確認してください。",
   "dapp.request.approve.label": "ウォレット",
-  "dapp.request.approve.title": "支出を承認する {{tokenSymbol}}",
+  "dapp.request.approve.title": "{{tokenSymbol}}へのアクセスを承認",
   "dapp.request.base.title": "取引リクエスト",
   "dapp.request.connect.helptext": "このサイトにウォレットのアドレス、残高の表示、取引の承認のリクエストを許可します。",
   "dapp.request.connect.title": "サイトに接続",
   "dapp.request.fallback.calldata.label": "生データ",
   "dapp.request.fallback.function.label": "関数",
-  "dapp.request.fallback.recipient.label": "受信者",
-  "dapp.request.fallback.sending.label": "送金",
   "dapp.request.permit2.description": "Permit2 は複数の dapp にわたるトークン承認を管理します。",
   "dapp.request.permit2.header": "サイン許可証2",
   "dapp.request.reject.action": "すべて拒否",
@@ -349,6 +351,13 @@
   "language.ukrainian": "ウクライナ語",
   "language.urdu": "ウルドゥー語",
   "language.vietnamese": "ベトナム語",
+  "mobile.appRating.button.decline": "あまり",
+  "mobile.appRating.description": "このアプリを気に入っていただけましたら、ぜひお知らせください",
+  "mobile.appRating.feedback.button.cancel": "後で",
+  "mobile.appRating.feedback.button.send": "フィードバックを送信",
+  "mobile.appRating.feedback.description": "お客様の体験を改善する方法をお知らせください",
+  "mobile.appRating.feedback.title": "それは残念です。",
+  "mobile.appRating.title": "Uniswapウォレットをお楽しみですか?",
   "notification.assetVisibility.hidden": "{{assetName}}を隠しました",
   "notification.assetVisibility.unhidden": "{{assetName}} を再表示",
   "notification.copied.address": "コピーしました",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "{{currencySymbol}} を {{address}} と使用するのを許可しました。",
   "notification.transaction.pending": "取引保留中",
   "notification.transaction.swap.canceled": "{{inputCurrencySymbol}}-{{outputCurrencySymbol}} スワップをキャンセルしました。",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} と {{outputCurrencyAmountWithSymbol}} のスワップが期限切れになりました。",
   "notification.transaction.swap.fail": "{{inputCurrencyAmountWithSymbol}}を{{outputCurrencyAmountWithSymbol}}にスワップできませんでした",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} を {{outputCurrencyAmountWithSymbol}}にスワップしました。",
   "notification.transaction.transfer.canceled": "{{tokenNameOrAddress}} 送信をキャンセルしました。",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Uniswap 拡張機能を続行する",
   "notifications.scantastic.title": "成功!",
   "onboarding.backup.manual.banner": "これを紙に書いて、安全な場所または安全なパスワード マネージャーに保管することをお勧めします。",
+  "onboarding.backup.manual.error": "無効な単語またはスペルミス",
   "onboarding.backup.manual.placeholder": "秘密の言葉",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} 完了",
   "onboarding.backup.manual.selectedWordPlaceholder": "単語を選択",
-  "onboarding.backup.manual.subtitle_one": "<highlight/> は何ですか{{count}}</highlight/>リカバリーフレーズに含まれる単語は何ですか?",
-  "onboarding.backup.manual.subtitle_two": "<highlight/> は何ですか{{count}}</highlight/>リカバリーフレーズに含まれる単語は何ですか?",
-  "onboarding.backup.manual.subtitle_few": "<highlight/> は何ですか{{count}}</highlight/>リカバリーフレーズに含まれる単語は何ですか?",
-  "onboarding.backup.manual.subtitle_other": "<highlight/> は何ですか{{count}}</highlight/>リカバリーフレーズに含まれる単語は何ですか?",
+  "onboarding.backup.manual.subtitle_one": " は何ですか{{count}}リカバリーフレーズに含まれる単語は何ですか?",
+  "onboarding.backup.manual.subtitle_two": " は何ですか{{count}}リカバリーフレーズに含まれる単語は何ですか?",
+  "onboarding.backup.manual.subtitle_few": " は何ですか{{count}}リカバリーフレーズに含まれる単語は何ですか?",
+  "onboarding.backup.manual.subtitle_other": " は何ですか{{count}}リカバリーフレーズに含まれる単語は何ですか?",
   "onboarding.backup.manual.title": "正しく記録できているか確認してみましょう",
   "onboarding.backup.option.cloud.description": "パスワードでリカバリフレーズを暗号化",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} バックアップ",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "バックアップを使用すると、アプリを削除した場合やデバイスを紛失した場合にウォレットを復元できます",
   "onboarding.backup.title.existing": "ウォレットをバックアップ",
   "onboarding.backup.title.new": "バックアップ方法を選択してください",
-  "onboarding.backup.view.disclaimer": "リカバリ フレーズを紛失した場合、Uniswap Labs では復元のお手伝いができないことを理解しています",
+  "onboarding.backup.view.disclaimer": "リカバリ フレーズを紛失した場合、Uniswap Labs では復元のお手伝いができないことを理解しています.",
   "onboarding.backup.view.subtitle.message1": "続行する前に以下をよくお読みください",
   "onboarding.backup.view.subtitle.message2": "ウォレットを回復するには、これら 12 個の秘密の単語をすべて入力する必要があります。",
   "onboarding.backup.view.title": "回復フレーズを書き留めてください",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "ピンアイコンをクリックして、Uniswap 拡張機能をツールバーに追加します。",
   "onboarding.complete.pin.title": "ピンユニスワップ拡張機能",
   "onboarding.complete.title": "準備完了です",
-  "onboarding.extension.connectMobile.button": "携帯電話からインポートする",
-  "onboarding.extension.connectMobile.title": "Uniswap アプリをお持ちですか?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "モバイルアプリをダウンロードしてユーザー名を取得してください",
   "onboarding.extension.getOnTheBetaWaitlist.title": "ベータ版の待機リストに登録する",
   "onboarding.extension.password.subtitle": "ウォレットのロックを解除し、回復フレーズにアクセスするにはこれが必要です",
   "onboarding.extension.password.title.default": "パスワード作成",
   "onboarding.extension.password.title.reset": "あなたのパスワードをリセット",
+  "onboarding.extension.unsupported.description": "Uniswap 拡張機能は現在 Chrome とのみ互換性があります。",
+  "onboarding.extension.unsupported.title": "このブラウザはまだサポートされていません",
   "onboarding.import.error.invalidWords_one": "1 語が無効またはスペルミスです",
   "onboarding.import.error.invalidWords_other": "{{count}} の単語が無効またはスペルミスです",
   "onboarding.import.method.import.message": "別のウォレットのリカバリフレーズを入力してください",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "12語の回復フレーズを入力または貼り付けます",
   "onboarding.importMnemonic.title": "リカバリフレーズを入力してください",
   "onboarding.intro.button.alreadyHave": "既存のウォレットをインポート",
-  "onboarding.intro.title": "\nUniswap Walletへようこそ",
+  "onboarding.intro.mobileScan.button": "QRコードをスキャンしてインポートする",
+  "onboarding.intro.mobileScan.title": "Uniswap アプリをお持ちですか?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "資格を確認する",
   "onboarding.introBetaWaitlist.button.letsGo": "さあ行こう",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "ベータ版の資格があるかどうかを確認するには、以下に <highlight>uni.eth</highlight> ユーザー名を入力してください。",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "あなたはまだ順番待ちリストに載っています。資格が得られたら、Uniswap モバイル アプリでお知らせします。",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "ユーザー名",
   "onboarding.landing.button.add": "既存のウォレットを追加",
-  "onboarding.landing.button.create": "新しいウォレットを作成",
+  "onboarding.landing.button.create": "ウォレットを作成する",
   "onboarding.notification.permission.message": "通知を受け取るには、システム設定で Uniswap Wallet の通知をオンにしてください。",
   "onboarding.notification.permission.title": "通知の許可",
   "onboarding.notification.subtitle": "取引が完了すると通知を届けます",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "これは表示専用のウォレットです",
   "send.recipientSelect.search.empty.message": "トークンをウォレットアドレスに送信すると、ここに表示されます",
   "send.recipientSelect.search.empty.title": "ウォレットが保存されていません",
-  "send.recipientSelect.title": "受信者",
   "send.review.modal.title": "送信中",
   "send.review.summary.button.title": "送信を確認",
   "send.review.summary.sending": "送金",
-  "send.review.summary.to": "受信者",
   "send.search.empty.subtitle": "入力したアドレスは存在しないか、スペルが間違っています。",
   "send.search.empty.title": "検索結果なし",
   "send.search.placeholder": "ENS またはアドレスを検索",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "これは閲覧専用のワレットです",
   "setting.recoveryPhrase.account.show": "リカバリフレーズを表示",
   "setting.recoveryPhrase.action.hide": "リカバリフレーズを非表示",
-  "setting.recoveryPhrase.remove.button": "リカバリフレーズを削除する",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "ウォレットの回復に失敗した場合、Uniswap Labs は私のサポートを提供できないことを理解しています",
+  "setting.recoveryPhrase.remove": "リカバリフレーズを削除する",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "ウォレットの回復に失敗した場合、Uniswap Labs は私のサポートを提供できないことを理解しています.",
   "setting.recoveryPhrase.remove.confirm.title": "リカバリフレーズを保存しました",
-  "setting.recoveryPhrase.remove.initial.subtitle": "リカバリフレーズを保存していることを確認してください。そうしないと資金にアクセスできなくなります",
+  "setting.recoveryPhrase.remove.initial.subtitle": "リカバリフレーズを保存したことを確認してください。保存しないとウォレットにアクセスできなくなります。",
   "setting.recoveryPhrase.remove.initial.title": "続行する前に",
   "setting.recoveryPhrase.remove.password.error": "間違ったパスワード。もう一度やり直してください",
-  "setting.recoveryPhrase.remove.password.input": "パスワードを入力してください",
-  "setting.recoveryPhrase.remove.subtitle": "続行するにはパスワードを入力してください",
+  "setting.recoveryPhrase.remove.subtitle": "確認のためパスワードを入力してください",
   "setting.recoveryPhrase.remove.title": "回復フレーズを削除しています",
-  "setting.recoveryPhrase.view.error": "パスワードが間違っています。もう一度お試しください",
   "setting.recoveryPhrase.view.warning.message1": "あなたの回復フレーズを知っている人は誰でもあなたのウォレットと資金にアクセスできます",
   "setting.recoveryPhrase.view.warning.message2": "これをプライベートで表示",
-  "setting.recoveryPhrase.view.warning.message3": "これを誰とも共有しないでください",
-  "setting.recoveryPhrase.view.warning.message4": "ウェブサイトやアプリに入力しないでください",
+  "setting.recoveryPhrase.view.warning.message3": "誰とも共有しないでください",
+  "setting.recoveryPhrase.view.warning.message4": "ウェブサイトやアプリケーションに入力しないでください",
   "setting.recoveryPhrase.view.warning.title": "続行する前に",
   "setting.recoveryPhrase.warning.screenshot.message": "あなたの写真にアクセスできる人はウォレットにアクセスできる可能性があります。リカバリフレーズを書き留めることをお勧めします。",
   "setting.recoveryPhrase.warning.screenshot.title": "スクリーンショットするのは安全ではありません",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "表示を減らす",
   "settings.section.wallet.label.viewOnly": "閲覧専用",
   "settings.section.wallet.title": "ウォレット設定",
-  "settings.setting.appearance.option.auto": "自動",
   "settings.setting.appearance.option.dark.subtitle": "常にダークモードを使用",
   "settings.setting.appearance.option.dark.title": "ダークモード",
   "settings.setting.appearance.option.device.subtitle": "デバイスの外観をデフォルトに",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Uniswap Labs 製品全体でのエクスペリエンスを向上させるために、匿名の使用状況データを使用します。無効にすると、エラーと重要な使用法のみが追跡されます。",
   "settings.setting.privacy.analytics.title": "分析を許可する",
   "settings.setting.privacy.title": "プライバシー",
-  "settings.setting.recoveryPhrase.remove": "リカバリフレーズを削除する",
+  "settings.setting.recoveryPhrase.password.title": "パスワードを入力してください",
   "settings.setting.recoveryPhrase.title": "リカバリフレーズ",
-  "settings.setting.recoveryPhrase.view": "リカバリフレーズを表示",
   "settings.setting.smallBalances.title": "少額の残高を非表示",
-  "settings.setting.theme.title": "テーマ",
   "settings.setting.unknownTokens.title": "不明なトークンを非表示",
   "settings.setting.wallet.action.editLabel": "ラベルを編集する",
   "settings.setting.wallet.action.editProfile": "プロファイル編集",
@@ -729,6 +734,8 @@
   "settings.version": "バージョン {{appVersion}}",
   "swap.button.max": "最大額",
   "swap.button.review": "確認へ進む",
+  "swap.button.submitting": "スワップを送信しています...",
+  "swap.button.submitting.keep.open": "財布を開けたままにしておきましょう...",
   "swap.button.swap": "スワップ",
   "swap.button.unwrap": "アンラップ",
   "swap.button.view": "取引を表示",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "インターネットに接続されていません",
   "swap.warning.priceImpact.message": "現在{{outputCurrencySymbol}} 流動性が少ない為、 {{inputCurrencySymbol}} 交換しようとするほど、受け取る {{outputCurrencySymbol}} が少なくなります。",
   "swap.warning.priceImpact.title": "高い価格インパクト ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "アプリを閉じたため、取引は送信されませんでした。",
+  "swap.warning.queuedOrder.approvalFailed": "トークンの承認に失敗したため、トランザクションは送信されませんでした。",
+  "swap.warning.queuedOrder.stale": "アプリを閉じたか、承認に時間がかかりすぎたため、取引は送信されませんでした。",
+  "swap.warning.queuedOrder.submissionFailed": "取引の送信中に問題が発生しました。",
+  "swap.warning.queuedOrder.title": "スワップはキャンセルされました",
+  "swap.warning.queuedOrder.wrap.message": "ETH は WETH としてラップされたままになります。",
+  "swap.warning.queuedOrder.wrapFailed": "ラップ取引が失敗したため、取引は送信されませんでした。",
   "swap.warning.rateLimit.message": "後でもう一度試してください。",
   "swap.warning.rateLimit.title": "レート制限を超えました",
   "swap.warning.router.message": "インターネット接続が切れているか、ネットワークに問題が発生しました。後でもう一度試してください。",
@@ -805,7 +819,6 @@
   "token.balances.other": "他のネットワーク上の残高",
   "token.balances.viewOnly": "{{ownerAddress}}の残高",
   "token.error.unknown": "不明なトークン",
-  "token.links.contract": "契約",
   "token.links.title": "詳細情報",
   "token.links.twitter": "ツイッター",
   "token.links.website": "ウェブサイト",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "トークンを非表示",
   "tokens.action.unhide": "トークンを再表示",
   "tokens.hidden.label": "非表示 ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "{{blockExplorerName}} で表示",
   "tokens.nfts.collection.error.load.title": "NFTコレクションを読み込めませんでした",
   "tokens.nfts.collection.label.items": "アイテム",
   "tokens.nfts.collection.label.owners": "所有者",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "無制限",
   "transaction.currency.unknown": "不明なトークン",
   "transaction.date": "{{date}}に提出",
+  "transaction.details.dappName": "アプリ",
+  "transaction.details.from": "から",
   "transaction.details.networkFee": "ネットワーク代",
   "transaction.details.transactionId": "取引ID",
   "transaction.network.all": "すべてのネットワーク",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "{{externalDappName}}に送信",
   "transaction.status.swap.canceled": "スワップ取消済",
   "transaction.status.swap.canceling": "スワップをキャンセル",
+  "transaction.status.swap.expired": "スワップ期限切れ",
   "transaction.status.swap.failed": "スワップに失敗",
+  "transaction.status.swap.insufficientFunds": "残高不足",
   "transaction.status.swap.pending": "スワップ中",
   "transaction.status.swap.success": "スワップ済",
   "transaction.status.swap.successDapp": "{{externalDappName}} でスワップ済",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "下にスクロールして署名する",
   "walletConnect.request.button.sign": "署名",
   "walletConnect.request.details.label.function": "関数",
-  "walletConnect.request.details.label.recipient": "受信者",
   "walletConnect.request.details.label.sending": "送金",
   "walletConnect.request.error.insufficientFunds": "この取引を完了するには {{currencySymbol}} が足りません。",
   "walletConnect.request.error.network": "インターネットまたはネットワーク接続エラー",
diff --git a/packages/uniswap/src/i18n/locales/translations/ms-MY.json b/packages/uniswap/src/i18n/locales/translations/ms-MY.json
index f454ff08b0e..73810fc1e8d 100644
--- a/packages/uniswap/src/i18n/locales/translations/ms-MY.json
+++ b/packages/uniswap/src/i18n/locales/translations/ms-MY.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Cuba lagi",
   "common.button.understand": "saya faham",
   "common.button.view": "Lihat",
+  "common.button.yes": "ya",
   "common.card.error.description": "Sesuatu telah berlaku",
   "common.card.error.title": "Aduh! Sesuatu telah berlaku.",
   "common.endAdornment": "dan",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "tetapan",
   "common.navigation.systemSettings": "tetapan",
   "common.text.connected": "Bersambung",
+  "common.text.contract": "Kontrak",
   "common.text.disconnected": "Terputus sambungan",
   "common.text.error": "Ralat",
   "common.text.notAvailable": "T/A",
+  "common.text.recipient": "Kepada",
+  "common.text.sender": "daripada",
   "common.text.unknown": "Tidak diketahui",
   "currency.aud": "Dolar Australia",
   "currency.brl": "Real Brazil",
@@ -171,17 +175,15 @@
   "currency.usd": "Dolar Amerika Syarikat",
   "currency.vnd": "Dong Vietnam",
   "dapp.request.approve.action": "Terima",
-  "dapp.request.approve.fallbackTitle": "Luluskan token perbelanjaan",
-  "dapp.request.approve.helptext": "Benarkan tapak ini mengakses dan membelanjakan token ini daripada dompet anda.",
+  "dapp.request.approve.fallbackTitle": "Luluskan tapak ini untuk mengakses token",
+  "dapp.request.approve.helptext": "Benarkan tapak ini mengakses dan membelanjakan token ini untuk transaksi. Pastikan anda mempercayai tapak ini.",
   "dapp.request.approve.label": "Dompet",
-  "dapp.request.approve.title": "Luluskan perbelanjaan {{tokenSymbol}}",
+  "dapp.request.approve.title": "Luluskan akses kepada {{tokenSymbol}}",
   "dapp.request.base.title": "Permintaan transaksi",
   "dapp.request.connect.helptext": "Benarkan tapak ini melihat alamat dompet anda, baki dan meminta kelulusan untuk transaksi.",
   "dapp.request.connect.title": "Sambung ke tapak",
   "dapp.request.fallback.calldata.label": "Data mentah",
   "dapp.request.fallback.function.label": "Fungsi",
-  "dapp.request.fallback.recipient.label": "Kepada",
-  "dapp.request.fallback.sending.label": "Menghantar",
   "dapp.request.permit2.description": "Permit2 menguruskan kelulusan token merentas berbilang dapps.",
   "dapp.request.permit2.header": "Tandatangan Permit2",
   "dapp.request.reject.action": "Tolak semua",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Ukraine",
   "language.urdu": "bahasa Urdu",
   "language.vietnamese": "Vietnam",
+  "mobile.appRating.button.decline": "Tidak juga",
+  "mobile.appRating.description": "Beritahu kami jika anda mempunyai pengalaman yang baik dengan apl ini",
+  "mobile.appRating.feedback.button.cancel": "Mungkin kemudian",
+  "mobile.appRating.feedback.button.send": "Hantar maklumbalas",
+  "mobile.appRating.feedback.description": "Beritahu kami cara kami boleh meningkatkan pengalaman anda",
+  "mobile.appRating.feedback.title": "Kami kesal mendengarnya.",
+  "mobile.appRating.title": "Menikmati Uniswap Wallet?",
   "notification.assetVisibility.hidden": "{{assetName}} tersembunyi",
   "notification.assetVisibility.unhidden": "{{assetName}} tidak tersembunyi",
   "notification.copied.address": "Alamat disalin",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Diluluskan {{currencySymbol}} untuk digunakan dengan {{address}}.",
   "notification.transaction.pending": "Urus niaga belum selesai",
   "notification.transaction.swap.canceled": "Dibatalkan {{inputCurrencySymbol}}-{{outputCurrencySymbol}} pertukaran.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} untuk {{outputCurrencyAmountWithSymbol}} pertukaran tamat tempoh.",
   "notification.transaction.swap.fail": "Gagal menukar {{inputCurrencyAmountWithSymbol}} dengan {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Bertukar {{inputCurrencyAmountWithSymbol}} dengan {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Dibatalkan {{tokenNameOrAddress}} penghantaran.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Teruskan pada Sambungan Uniswap",
   "notifications.scantastic.title": "Kejayaan!",
   "onboarding.backup.manual.banner": "Adalah lebih baik untuk menulis ini pada sekeping kertas dan menyimpannya di tempat yang selamat atau dalam pengurus kata laluan yang selamat.",
+  "onboarding.backup.manual.error": "Perkataan tidak sah atau salah eja",
   "onboarding.backup.manual.placeholder": "Perkataan rahsia",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "Pilih perkataan",
-  "onboarding.backup.manual.subtitle_one": "Apakah perkataan <highlight/>{{count}}st</highlight/> dalam frasa pemulihan anda?",
-  "onboarding.backup.manual.subtitle_two": "Apakah perkataan <highlight/>{{count}}dan</highlight/> dalam frasa pemulihan anda?",
-  "onboarding.backup.manual.subtitle_few": "Apakah perkataan <highlight/>{{count}}rd</highlight/> dalam frasa pemulihan anda?",
-  "onboarding.backup.manual.subtitle_other": "Apakah perkataan <highlight/>{{count}}ke</highlight/> dalam frasa pemulihan anda?",
+  "onboarding.backup.manual.subtitle_one": "Apakah {{count}}perkataan pertama dalam frasa pemulihan anda?",
+  "onboarding.backup.manual.subtitle_two": "Apakah perkataan {{count}}dalam frasa pemulihan anda?",
+  "onboarding.backup.manual.subtitle_few": "Apakah perkataan {{count}}dalam frasa pemulihan anda?",
+  "onboarding.backup.manual.subtitle_other": "Apakah perkataan {{count}}dalam frasa pemulihan anda?",
   "onboarding.backup.manual.title": "Mari pastikan anda telah merakamnya dengan betul",
   "onboarding.backup.option.cloud.description": "Sulitkan frasa pemulihan anda dengan kata laluan selamat",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} sandaran",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Sandaran membolehkan anda memulihkan dompet anda jika anda memadamkan apl atau kehilangan peranti anda",
   "onboarding.backup.title.existing": "Sandarkan dompet anda",
   "onboarding.backup.title.new": "Pilih kaedah sandaran",
-  "onboarding.backup.view.disclaimer": "Saya faham bahawa jika saya kehilangan frasa pemulihan saya, Uniswap Labs tidak dapat membantu saya memulihkannya",
+  "onboarding.backup.view.disclaimer": "Saya faham bahawa jika saya kehilangan frasa pemulihan saya, Uniswap Labs tidak dapat membantu saya memulihkannya.",
   "onboarding.backup.view.subtitle.message1": "Baca perkara berikut dengan teliti sebelum meneruskan",
   "onboarding.backup.view.subtitle.message2": "Anda perlu memasukkan kesemua 12 perkataan rahsia ini untuk mendapatkan semula dompet anda.",
   "onboarding.backup.view.title": "Tulis frasa pemulihan anda",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Klik ikon pin untuk menambah Sambungan Uniswap pada bar alat anda.",
   "onboarding.complete.pin.title": "Sambungan Uniswap Pin",
   "onboarding.complete.title": "Anda telah siap sedia",
-  "onboarding.extension.connectMobile.button": "Import dari telefon anda",
-  "onboarding.extension.connectMobile.title": "Mempunyai apl mudah alih Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Muat turun apl mudah alih untuk menuntut nama pengguna",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Dapatkan senarai tunggu Beta",
   "onboarding.extension.password.subtitle": "Anda memerlukan ini untuk membuka kunci dompet anda dan mengakses frasa pemulihan anda",
   "onboarding.extension.password.title.default": "Bina kata laluan",
   "onboarding.extension.password.title.reset": "Menetapkan semula kata laluan anda",
+  "onboarding.extension.unsupported.description": "Sambungan Uniswap hanya serasi dengan Chrome sekarang.",
+  "onboarding.extension.unsupported.title": "Penyemak imbas ini tidak disokong (lagi)",
   "onboarding.import.error.invalidWords_one": "1 perkataan tidak sah atau salah ejaan",
   "onboarding.import.error.invalidWords_other": "{{count}} perkataan tidak sah atau salah ejaan",
   "onboarding.import.method.import.message": "Masukkan frasa pemulihan anda daripada dompet crypto lain",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Taip atau tampal frasa pemulihan 12 perkataan anda",
   "onboarding.importMnemonic.title": "Masukkan frasa pemulihan anda",
   "onboarding.intro.button.alreadyHave": "Saya sudah mempunyai dompet",
-  "onboarding.intro.title": "Selamat datang ke \nUniswap Wallet",
+  "onboarding.intro.mobileScan.button": "Imbas kod QR untuk mengimport",
+  "onboarding.intro.mobileScan.title": "Ada apl Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Semak kelayakan",
   "onboarding.introBetaWaitlist.button.letsGo": "Mari pergi",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Masukkan <highlight>uni.eth</highlight> nama pengguna anda di bawah untuk menyemak sama ada anda layak untuk Beta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Anda masih dalam senarai menunggu. Kami akan memberitahu anda dalam apl mudah alih Uniswap apabila anda layak!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "nama pengguna",
   "onboarding.landing.button.add": "Tambah dompet sedia ada",
-  "onboarding.landing.button.create": "Buat dompet baharu",
+  "onboarding.landing.button.create": "Buat dompet",
   "onboarding.notification.permission.message": "Untuk menerima pemberitahuan, hidupkan pemberitahuan untuk Uniswap Wallet dalam tetapan peranti anda.",
   "onboarding.notification.permission.title": "Kebenaran pemberitahuan",
   "onboarding.notification.subtitle": "Dapatkan pemberitahuan apabila pemindahan, pertukaran dan kelulusan anda selesai.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Anda mempunyai ini sebagai dompet lihat sahaja",
   "send.recipientSelect.search.empty.message": "Apabila anda menghantar token ke alamat dompet, ia akan dipaparkan di sini",
   "send.recipientSelect.search.empty.title": "Tiada dompet disimpan",
-  "send.recipientSelect.title": "Kepada",
   "send.review.modal.title": "Anda menghantar",
   "send.review.summary.button.title": "Sahkan hantar",
   "send.review.summary.sending": "Menghantar",
-  "send.review.summary.to": "Kepada",
   "send.search.empty.subtitle": "Alamat yang anda taip sama ada tidak wujud atau dieja dengan salah.",
   "send.search.empty.title": "Tiada keputusan dijumpai",
   "send.search.placeholder": "Cari ENS atau alamat",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Dompet ini adalah lihat sahaja",
   "setting.recoveryPhrase.account.show": "Tunjukkan frasa pemulihan",
   "setting.recoveryPhrase.action.hide": "Sembunyikan frasa pemulihan",
-  "setting.recoveryPhrase.remove.button": "Alih keluar frasa pemulihan",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Saya faham bahawa Uniswap Labs tidak dapat membantu saya mendapatkan semula dompet saya jika saya gagal berbuat demikian",
+  "setting.recoveryPhrase.remove": "Alih keluar frasa pemulihan",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Saya faham bahawa Uniswap Labs tidak dapat membantu saya mendapatkan semula dompet saya jika saya gagal berbuat demikian.",
   "setting.recoveryPhrase.remove.confirm.title": "Saya menyimpan frasa pemulihan saya",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Pastikan anda telah menyimpan frasa pemulihan anda. Anda akan kehilangan akses kepada dana anda jika tidak",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Pastikan anda telah menyimpan frasa pemulihan anda. Anda akan kehilangan akses kepada dompet anda jika tidak",
   "setting.recoveryPhrase.remove.initial.title": "Sebelum anda meneruskan",
   "setting.recoveryPhrase.remove.password.error": "Salah kata laluan. Cuba lagi",
-  "setting.recoveryPhrase.remove.password.input": "Masukkan kata laluan",
-  "setting.recoveryPhrase.remove.subtitle": "Masukkan kata laluan anda untuk meneruskan",
+  "setting.recoveryPhrase.remove.subtitle": "Masukkan kata laluan anda untuk mengesahkan",
   "setting.recoveryPhrase.remove.title": "Anda sedang mengalih keluar frasa pemulihan anda",
-  "setting.recoveryPhrase.view.error": "Kata laluan salah, cuba lagi",
   "setting.recoveryPhrase.view.warning.message1": "Sesiapa sahaja yang mengetahui frasa pemulihan anda boleh mengakses dompet dan dana anda",
   "setting.recoveryPhrase.view.warning.message2": "Lihat ini secara peribadi",
-  "setting.recoveryPhrase.view.warning.message3": "Jangan kongsi ini dengan sesiapa",
-  "setting.recoveryPhrase.view.warning.message4": "Jangan sekali-kali memasukkannya ke mana-mana tapak web atau apl",
+  "setting.recoveryPhrase.view.warning.message3": "Jangan kongsi dengan sesiapa",
+  "setting.recoveryPhrase.view.warning.message4": "Jangan sekali-kali memasukkannya ke mana-mana tapak web atau aplikasi",
   "setting.recoveryPhrase.view.warning.title": "Sebelum anda meneruskan",
   "setting.recoveryPhrase.warning.screenshot.message": "Sesiapa sahaja yang mendapat akses kepada foto anda boleh mengakses dompet anda. Kami mengesyorkan anda menulis perkataan anda sebaliknya.",
   "setting.recoveryPhrase.warning.screenshot.title": "Tangkapan skrin tidak selamat",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Lihat kurang",
   "settings.section.wallet.label.viewOnly": "Lihat sahaja",
   "settings.section.wallet.title": "Tetapan dompet",
-  "settings.setting.appearance.option.auto": "Auto",
   "settings.setting.appearance.option.dark.subtitle": "Sentiasa gunakan mod gelap",
   "settings.setting.appearance.option.dark.title": "Mod gelap",
   "settings.setting.appearance.option.device.subtitle": "Lalai kepada penampilan peranti anda",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Kami menggunakan data penggunaan tanpa nama untuk meningkatkan pengalaman anda merentas produk Uniswap Labs. Apabila dilumpuhkan, kami hanya menjejaki ralat dan penggunaan penting.",
   "settings.setting.privacy.analytics.title": "Benarkan analisis",
   "settings.setting.privacy.title": "Privasi",
-  "settings.setting.recoveryPhrase.remove": "Alih keluar frasa pemulihan",
+  "settings.setting.recoveryPhrase.password.title": "Masukkan kata laluan anda",
   "settings.setting.recoveryPhrase.title": "Frasa pemulihan",
-  "settings.setting.recoveryPhrase.view": "Lihat frasa pemulihan",
   "settings.setting.smallBalances.title": "Sembunyikan baki kecil",
-  "settings.setting.theme.title": "Tema",
   "settings.setting.unknownTokens.title": "Sembunyikan token yang tidak diketahui",
   "settings.setting.wallet.action.editLabel": "Edit label",
   "settings.setting.wallet.action.editProfile": "Sunting profil",
@@ -729,6 +734,8 @@
   "settings.version": "Versi {{appVersion}}",
   "swap.button.max": "Maks",
   "swap.button.review": "Semakan",
+  "swap.button.submitting": "Menyerahkan pertukaran...",
+  "swap.button.submitting.keep.open": "Pastikan dompet anda terbuka...",
   "swap.button.swap": "Tukar",
   "swap.button.unwrap": "Buka bungkus",
   "swap.button.view": "Lihat transaksi",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Anda di luar talian",
   "swap.warning.priceImpact.message": "Disebabkan oleh jumlah {{outputCurrencySymbol}} kecairan yang tersedia pada masa ini, semakin banyak {{inputCurrencySymbol}} anda cuba menukar, semakin kurang {{outputCurrencySymbol}} anda akan terima.",
   "swap.warning.priceImpact.title": "Kesan harga yang tinggi ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Urus niaga anda tidak diserahkan kerana anda menutup apl.",
+  "swap.warning.queuedOrder.approvalFailed": "Transaksi anda tidak diserahkan kerana kelulusan token gagal.",
+  "swap.warning.queuedOrder.stale": "Urus niaga anda tidak diserahkan kerana anda menutup apl atau kelulusan mengambil masa terlalu lama.",
+  "swap.warning.queuedOrder.submissionFailed": "Terdapat masalah menyerahkan transaksi anda.",
+  "swap.warning.queuedOrder.title": "Pertukaran dibatalkan",
+  "swap.warning.queuedOrder.wrap.message": "ETH anda akan kekal dibungkus sebagai WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Urus niaga anda tidak diserahkan kerana transaksi bungkus gagal.",
   "swap.warning.rateLimit.message": "Sila cuba sebentar lagi.",
   "swap.warning.rateLimit.title": "Had kadar melebihi",
   "swap.warning.router.message": "Anda mungkin terputus sambungan atau rangkaian mungkin terputus. Jika masalah berterusan, sila cuba lagi kemudian.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Baki pada rangkaian lain",
   "token.balances.viewOnly": "baki {{ownerAddress}}",
   "token.error.unknown": "Token tidak diketahui",
-  "token.links.contract": "Kontrak",
   "token.links.title": "Pautan",
   "token.links.twitter": "Twitter",
   "token.links.website": "laman web",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Sembunyikan Token",
   "tokens.action.unhide": "Nyahsembunyikan Token",
   "tokens.hidden.label": "Tersembunyi ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Lihat pada {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Tidak dapat memuatkan koleksi NFT",
   "tokens.nfts.collection.label.items": "barang",
   "tokens.nfts.collection.label.owners": "Pemilik",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Tidak terhad",
   "transaction.currency.unknown": "token yang tidak diketahui",
   "transaction.date": "Diserahkan pada {{date}}",
+  "transaction.details.dappName": "Aplikasi",
+  "transaction.details.from": "daripada",
   "transaction.details.networkFee": "Kos rangkaian",
   "transaction.details.transactionId": "ID Transaksi",
   "transaction.network.all": "Semua rangkaian",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Dihantar pada {{externalDappName}}",
   "transaction.status.swap.canceled": "Pertukaran dibatalkan",
   "transaction.status.swap.canceling": "Membatalkan pertukaran",
+  "transaction.status.swap.expired": "Swap tamat tempoh",
   "transaction.status.swap.failed": "Gagal bertukar",
+  "transaction.status.swap.insufficientFunds": "Kekurangan dana",
   "transaction.status.swap.pending": "Bertukar-tukar",
   "transaction.status.swap.success": "Ditukar",
   "transaction.status.swap.successDapp": "Bertukar pada {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Tatal ke bawah untuk menandatangani",
   "walletConnect.request.button.sign": "Tanda",
   "walletConnect.request.details.label.function": "Fungsi",
-  "walletConnect.request.details.label.recipient": "Kepada",
   "walletConnect.request.details.label.sending": "Menghantar",
   "walletConnect.request.error.insufficientFunds": "Anda tidak mempunyai cukup {{currencySymbol}} untuk melengkapkan transaksi ini.",
   "walletConnect.request.error.network": "Ralat sambungan Internet atau rangkaian",
diff --git a/packages/uniswap/src/i18n/locales/translations/nl-NL.json b/packages/uniswap/src/i18n/locales/translations/nl-NL.json
index db4fd5f8bb0..34e180807e7 100644
--- a/packages/uniswap/src/i18n/locales/translations/nl-NL.json
+++ b/packages/uniswap/src/i18n/locales/translations/nl-NL.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Probeer het nog eens",
   "common.button.understand": "Ik begrijp",
   "common.button.view": "Weergave",
+  "common.button.yes": "Ja",
   "common.card.error.description": "Er is iets fout gegaan",
   "common.card.error.title": "Oeps! Er is iets fout gegaan.",
   "common.endAdornment": "en",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Instellingen",
   "common.navigation.systemSettings": "Instellingen",
   "common.text.connected": "Gekoppeld",
+  "common.text.contract": "Contract",
   "common.text.disconnected": "Ontkoppeld",
   "common.text.error": "Fout",
   "common.text.notAvailable": "N.v.t",
+  "common.text.recipient": "Naar",
+  "common.text.sender": "Van",
   "common.text.unknown": "Onbekend",
   "currency.aud": "Australische dollar",
   "currency.brl": "Braziliaanse real",
@@ -171,17 +175,15 @@
   "currency.usd": "Verenigde Staten Dollar",
   "currency.vnd": "Vietnamese Dong",
   "dapp.request.approve.action": "Goedkeuren",
-  "dapp.request.approve.fallbackTitle": "Keur bestedingstokens goed",
-  "dapp.request.approve.helptext": "Geef deze site toegang tot dit token en geef het uit uw portemonnee uit.",
+  "dapp.request.approve.fallbackTitle": "Keur deze site goed voor toegang tot tokens",
+  "dapp.request.approve.helptext": "Geef deze site toegang tot dit token en geef het uit voor transacties. Zorg ervoor dat u deze site vertrouwt.",
   "dapp.request.approve.label": "Portemonnee",
-  "dapp.request.approve.title": "Uitgaven goedkeuren {{tokenSymbol}}",
+  "dapp.request.approve.title": "Toegang tot {{tokenSymbol}}goedkeuren",
   "dapp.request.base.title": "Transactieverzoek",
   "dapp.request.connect.helptext": "Sta toe dat deze site uw portemonneeadres en saldo bekijkt en goedkeuringen voor transacties aanvraagt.",
   "dapp.request.connect.title": "Maak verbinding met de locatie",
   "dapp.request.fallback.calldata.label": "Ruwe data",
   "dapp.request.fallback.function.label": "Functie",
-  "dapp.request.fallback.recipient.label": "Naar",
-  "dapp.request.fallback.sending.label": "Bezig met verzenden",
   "dapp.request.permit2.description": "Permit2 beheert tokengoedkeuringen voor meerdere dapps.",
   "dapp.request.permit2.header": "Tekenvergunning 2",
   "dapp.request.reject.action": "Alles afwijzen",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Oekraïens",
   "language.urdu": "Urdu",
   "language.vietnamese": "Vietnamees",
+  "mobile.appRating.button.decline": "Niet echt",
+  "mobile.appRating.description": "Laat ons weten of je een goede ervaring hebt met deze app",
+  "mobile.appRating.feedback.button.cancel": "Misschien later",
+  "mobile.appRating.feedback.button.send": "Stuur feedback",
+  "mobile.appRating.feedback.description": "Laat ons weten hoe we uw ervaring kunnen verbeteren",
+  "mobile.appRating.feedback.title": "Het spijt ons dat te horen.",
+  "mobile.appRating.title": "Geniet je van Uniswap Wallet?",
   "notification.assetVisibility.hidden": "{{assetName}} verborgen",
   "notification.assetVisibility.unhidden": "{{assetName}} zichtbaar",
   "notification.copied.address": "Adres gekopieerd",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Goedgekeurd {{currencySymbol}} voor gebruik met {{address}}.",
   "notification.transaction.pending": "Transactie in behandeling",
   "notification.transaction.swap.canceled": "Geannuleerde {{inputCurrencySymbol}}-{{outputCurrencySymbol}} ruil.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} voor {{outputCurrencyAmountWithSymbol}} swap verlopen.",
   "notification.transaction.swap.fail": "Het is niet gelukt om {{inputCurrencyAmountWithSymbol}} voor {{outputCurrencyAmountWithSymbol}}te verwisselen.",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} voor {{outputCurrencyAmountWithSymbol}}geruild.",
   "notification.transaction.transfer.canceled": "Geannuleerd {{tokenNameOrAddress}} verzenden.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Ga verder op Uniswap-extensie",
   "notifications.scantastic.title": "Succes!",
   "onboarding.backup.manual.banner": "U kunt dit het beste op een stuk papier schrijven en op een veilige plaats of in een veilige wachtwoordbeheerder bewaren.",
+  "onboarding.backup.manual.error": "Ongeldig of verkeerd gespeld woord",
   "onboarding.backup.manual.placeholder": "Geheim woord",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} voltooid",
   "onboarding.backup.manual.selectedWordPlaceholder": "Selecteer woord",
-  "onboarding.backup.manual.subtitle_one": "Wat is het <highlight/>{{count}}st</highlight/> woord in je herstelzin?",
-  "onboarding.backup.manual.subtitle_two": "Wat is het <highlight/>{{count}}en</highlight/> woord in je herstelzin?",
-  "onboarding.backup.manual.subtitle_few": "Wat is het <highlight/>{{count}}e</highlight/> woord in je herstelzin?",
-  "onboarding.backup.manual.subtitle_other": "Wat is het <highlight/>{{count}}e</highlight/> woord in je herstelzin?",
+  "onboarding.backup.manual.subtitle_one": "Wat is het {{count}}e woord in je herstelzin?",
+  "onboarding.backup.manual.subtitle_two": "Wat is het {{count}}e-woord in je herstelzin?",
+  "onboarding.backup.manual.subtitle_few": "Wat is het {{count}}e woord in je herstelzin?",
+  "onboarding.backup.manual.subtitle_other": "Wat is het {{count}}e woord in je herstelzin?",
   "onboarding.backup.manual.title": "Laten we er zeker van zijn dat je het correct hebt opgenomen",
   "onboarding.backup.option.cloud.description": "Versleutel uw herstelzin met een veilig wachtwoord",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} back-up",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Met back-ups kunt u uw portemonnee herstellen als u de app verwijdert of uw apparaat kwijtraakt",
   "onboarding.backup.title.existing": "Maak een back-up van uw portemonnee",
   "onboarding.backup.title.new": "Kies een back-upmethode",
-  "onboarding.backup.view.disclaimer": "Ik begrijp dat als ik mijn herstelzin kwijtraak, Uniswap Labs mij niet kan helpen deze te herstellen",
+  "onboarding.backup.view.disclaimer": "Ik begrijp dat als ik mijn herstelzin kwijtraak, Uniswap Labs mij niet kan helpen deze te herstellen.",
   "onboarding.backup.view.subtitle.message1": "Lees het volgende aandachtig voordat u verdergaat",
   "onboarding.backup.view.subtitle.message2": "U moet alle twaalf deze geheime woorden invoeren om uw portemonnee te herstellen.",
   "onboarding.backup.view.title": "Schrijf uw herstelzin op",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Klik op het punaisepictogram om de Uniswap-extensie aan uw werkbalk toe te voegen.",
   "onboarding.complete.pin.title": "Pin Uniswap-extensie",
   "onboarding.complete.title": "Je bent klaar",
-  "onboarding.extension.connectMobile.button": "Importeren vanaf uw telefoon",
-  "onboarding.extension.connectMobile.title": "Heb je de Uniswap mobiele app?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Download de mobiele app om een gebruikersnaam te claimen",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Zet u op de bèta-wachtlijst",
   "onboarding.extension.password.subtitle": "U heeft dit nodig om uw portemonnee te ontgrendelen en toegang te krijgen tot uw herstelzin",
   "onboarding.extension.password.title.default": "Maak een wachtwoord",
   "onboarding.extension.password.title.reset": "Stel je wachtwoord opnieuw in",
+  "onboarding.extension.unsupported.description": "Uniswap Extension is momenteel alleen compatibel met Chrome.",
+  "onboarding.extension.unsupported.title": "Deze browser wordt (nog) niet ondersteund",
   "onboarding.import.error.invalidWords_one": "1 woord is ongeldig of verkeerd gespeld",
   "onboarding.import.error.invalidWords_other": "{{count}} woorden zijn ongeldig of verkeerd gespeld",
   "onboarding.import.method.import.message": "Voer uw herstelzin van een andere crypto-portemonnee in",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Typ of plak uw herstelzin van twaalf woorden",
   "onboarding.importMnemonic.title": "Voer uw herstelzin in",
   "onboarding.intro.button.alreadyHave": "Ik heb al een portemonnee",
-  "onboarding.intro.title": "Welkom bij \nUniswap-portemonnee",
+  "onboarding.intro.mobileScan.button": "Scan de QR-code om te importeren",
+  "onboarding.intro.mobileScan.title": "Heb je de Uniswap-app?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Controleer geschiktheid",
   "onboarding.introBetaWaitlist.button.letsGo": "Laten we gaan",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Voer hieronder uw <highlight>uni.eth</highlight> gebruikersnaam in om te controleren of u in aanmerking komt voor de bèta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Je staat nog steeds op de wachtlijst. We laten het je weten in de Uniswap mobiele app wanneer je in aanmerking komt!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "gebruikersnaam",
   "onboarding.landing.button.add": "Voeg een bestaande portemonnee toe",
-  "onboarding.landing.button.create": "Maak een nieuwe portemonnee",
+  "onboarding.landing.button.create": "Maak een portemonnee",
   "onboarding.notification.permission.message": "Om meldingen te ontvangen, schakelt u meldingen voor Uniswap Wallet in de instellingen van uw apparaat in.",
   "onboarding.notification.permission.title": "Toestemming voor meldingen",
   "onboarding.notification.subtitle": "Ontvang een melding wanneer uw overdrachten, ruilen en goedkeuringen zijn voltooid.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Je hebt dit als een alleen-lezen portemonnee",
   "send.recipientSelect.search.empty.message": "Wanneer u tokens naar een portemonnee-adres verzendt, worden ze hier weergegeven",
   "send.recipientSelect.search.empty.title": "Geen portemonnees opgeslagen",
-  "send.recipientSelect.title": "Naar",
   "send.review.modal.title": "Je verzendt",
   "send.review.summary.button.title": "Bevestig het verzenden",
   "send.review.summary.sending": "Bezig met verzenden",
-  "send.review.summary.to": "Naar",
   "send.search.empty.subtitle": "Het door u getypte adres bestaat niet of is verkeerd gespeld.",
   "send.search.empty.title": "geen resultaten gevonden",
   "send.search.placeholder": "Zoek ENS of adres",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Deze portefeuilles is alleen-lezen",
   "setting.recoveryPhrase.account.show": "Herstelzin tonen",
   "setting.recoveryPhrase.action.hide": "Herstelzin verbergen",
-  "setting.recoveryPhrase.remove.button": "Herstelzin verwijderen",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Ik begrijp dat Uniswap Labs mij niet kan helpen mijn portemonnee terug te krijgen als ik dit niet heb gedaan",
+  "setting.recoveryPhrase.remove": "Herstelzin verwijderen",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Ik begrijp dat Uniswap Labs mij niet kan helpen mijn portemonnee terug te krijgen als ik dit niet heb gedaan.",
   "setting.recoveryPhrase.remove.confirm.title": "Ik heb mijn herstelzin opgeslagen",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Zorg ervoor dat u uw herstelzin heeft opgeslagen. Anders verliest u de toegang tot uw geld",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Zorg ervoor dat u uw herstelzin heeft opgeslagen. Anders verliest u de toegang tot uw portemonnee",
   "setting.recoveryPhrase.remove.initial.title": "Voordat u verdergaat",
   "setting.recoveryPhrase.remove.password.error": "Verkeerd wachtwoord. Probeer het nog eens",
-  "setting.recoveryPhrase.remove.password.input": "Voer wachtwoord in",
-  "setting.recoveryPhrase.remove.subtitle": "Voer uw wachtwoord in om door te gaan",
+  "setting.recoveryPhrase.remove.subtitle": "Voer uw wachtwoord in om te bevestigen",
   "setting.recoveryPhrase.remove.title": "U verwijdert uw herstelzin",
-  "setting.recoveryPhrase.view.error": "Verkeerd wachtwoord, probeer het opnieuw",
   "setting.recoveryPhrase.view.warning.message1": "Iedereen die je herstelzin kent, kan toegang krijgen tot je wallet en tegoeden",
   "setting.recoveryPhrase.view.warning.message2": "Bekijk dit privé",
-  "setting.recoveryPhrase.view.warning.message3": "Deel dit met niemand",
-  "setting.recoveryPhrase.view.warning.message4": "Voer het nooit in op websites of apps",
+  "setting.recoveryPhrase.view.warning.message3": "Deel met niemand",
+  "setting.recoveryPhrase.view.warning.message4": "Voer het nooit in op websites of applicaties",
   "setting.recoveryPhrase.view.warning.title": "Voordat u verdergaat",
   "setting.recoveryPhrase.warning.screenshot.message": "Iedereen die toegang krijgt tot uw foto's, heeft toegang tot uw portemonnee. Wij raden u aan om uw woorden op te schrijven.",
   "setting.recoveryPhrase.warning.screenshot.title": "Schermafbeeldingen zijn niet veilig",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Bekijk minder",
   "settings.section.wallet.label.viewOnly": "Alleen-lezen",
   "settings.section.wallet.title": "Portemonnee-instellingen",
-  "settings.setting.appearance.option.auto": "Auto",
   "settings.setting.appearance.option.dark.subtitle": "Gebruik standaard darkmode",
   "settings.setting.appearance.option.dark.title": "Donkere modus",
   "settings.setting.appearance.option.device.subtitle": "Standaard ingesteld op het uiterlijk van uw apparaat",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "We gebruiken anonieme gebruiksgegevens om uw ervaring met Uniswap Labs-producten te verbeteren. Indien uitgeschakeld, volgen we alleen fouten en essentieel gebruik.",
   "settings.setting.privacy.analytics.title": "Analyses toestaan",
   "settings.setting.privacy.title": "Privacy",
-  "settings.setting.recoveryPhrase.remove": "Herstelzin verwijderen",
+  "settings.setting.recoveryPhrase.password.title": "Voer uw wachtwoord in",
   "settings.setting.recoveryPhrase.title": "Herstelzin",
-  "settings.setting.recoveryPhrase.view": "Herstelzin bekijken",
   "settings.setting.smallBalances.title": "Verberg kleine saldi",
-  "settings.setting.theme.title": "Thema",
   "settings.setting.unknownTokens.title": "Verberg onbekende tokens",
   "settings.setting.wallet.action.editLabel": "Etiket bewerken",
   "settings.setting.wallet.action.editProfile": "Bewerk profiel",
@@ -729,6 +734,8 @@
   "settings.version": "Versie {{appVersion}}",
   "swap.button.max": "Max",
   "swap.button.review": "Beoordeling",
+  "swap.button.submitting": "Wissel indienen...",
+  "swap.button.submitting.keep.open": "Houd uw portemonnee open...",
   "swap.button.swap": "Ruil",
   "swap.button.unwrap": "Uitpakken",
   "swap.button.view": "Transactie bekijken",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Je bent offline",
   "swap.warning.priceImpact.message": "Vanwege de hoeveelheid {{outputCurrencySymbol}} liquiditeit die momenteel beschikbaar is, geldt: hoe meer {{inputCurrencySymbol}} u probeert te ruilen, hoe minder {{outputCurrencySymbol}} u ontvangt.",
   "swap.warning.priceImpact.title": "Hoge prijsimpact ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Uw transactie is niet ingediend omdat u de app heeft gesloten.",
+  "swap.warning.queuedOrder.approvalFailed": "Uw transactie is niet ingediend omdat de tokengoedkeuring is mislukt.",
+  "swap.warning.queuedOrder.stale": "Uw transactie is niet verzonden omdat u de app heeft gesloten of omdat de goedkeuring te lang heeft geduurd.",
+  "swap.warning.queuedOrder.submissionFailed": "Er is een probleem opgetreden bij het verzenden van uw transactie.",
+  "swap.warning.queuedOrder.title": "Wissel geannuleerd",
+  "swap.warning.queuedOrder.wrap.message": "Uw ETH blijft verpakt als WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Uw transactie is niet verzonden omdat de wrap-transactie is mislukt.",
   "swap.warning.rateLimit.message": "Probeer het over een paar minuten opnieuw.",
   "swap.warning.rateLimit.title": "Snelheidslimiet overschreden",
   "swap.warning.router.message": "Mogelijk bent u de verbinding kwijtgeraakt of is het netwerk uitgevallen. Als het probleem zich blijft voordoen, probeer het dan later opnieuw.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Tegoeden op andere netwerken",
   "token.balances.viewOnly": "Het saldo van {{ownerAddress}}",
   "token.error.unknown": "Onbekend teken",
-  "token.links.contract": "Contract",
   "token.links.title": "Koppelingen",
   "token.links.twitter": "Twitteren",
   "token.links.website": "Website",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Token verbergen",
   "tokens.action.unhide": "Token zichtbaar maken",
   "tokens.hidden.label": "Verborgen ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Bekijk op {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Kan NFT-verzameling niet laden",
   "tokens.nfts.collection.label.items": "Artikelen",
   "tokens.nfts.collection.label.owners": "Eigenaren",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Onbeperkt",
   "transaction.currency.unknown": "onbekend teken",
   "transaction.date": "Ingezonden op {{date}}",
+  "transaction.details.dappName": "App",
+  "transaction.details.from": "Van",
   "transaction.details.networkFee": "Netwerkkosten",
   "transaction.details.transactionId": "Transactie ID",
   "transaction.network.all": "Alle netwerken",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Verzonden op {{externalDappName}}",
   "transaction.status.swap.canceled": "Wissel geannuleerd",
   "transaction.status.swap.canceling": "Wissel annuleren",
+  "transaction.status.swap.expired": "Wissel verlopen",
   "transaction.status.swap.failed": "Kan niet wisselen",
+  "transaction.status.swap.insufficientFunds": "Onvoldoende middelen",
   "transaction.status.swap.pending": "Wisselen",
   "transaction.status.swap.success": "Verwisseld",
   "transaction.status.swap.successDapp": "Verwisseld op {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Scroll naar beneden om te ondertekenen",
   "walletConnect.request.button.sign": "Teken",
   "walletConnect.request.details.label.function": "Functie",
-  "walletConnect.request.details.label.recipient": "Naar",
   "walletConnect.request.details.label.sending": "Bezig met verzenden",
   "walletConnect.request.error.insufficientFunds": "U heeft niet genoeg {{currencySymbol}} om deze transactie te voltooien.",
   "walletConnect.request.error.network": "Fout met internet- of netwerkverbinding",
diff --git a/packages/uniswap/src/i18n/locales/translations/pt-PT.json b/packages/uniswap/src/i18n/locales/translations/pt-PT.json
index a00b948914a..cc6fca63a94 100644
--- a/packages/uniswap/src/i18n/locales/translations/pt-PT.json
+++ b/packages/uniswap/src/i18n/locales/translations/pt-PT.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Tente novamente",
   "common.button.understand": "Eu entendo",
   "common.button.view": "Visualizar",
+  "common.button.yes": "Sim",
   "common.card.error.description": "Algo deu errado",
   "common.card.error.title": "Ops! Algo deu errado.",
   "common.endAdornment": "e",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Configurações",
   "common.navigation.systemSettings": "Configurações",
   "common.text.connected": "Conectado",
+  "common.text.contract": "Contrato",
   "common.text.disconnected": "Desconectado",
   "common.text.error": "Erro",
   "common.text.notAvailable": "N / D",
+  "common.text.recipient": "Para",
+  "common.text.sender": "De",
   "common.text.unknown": "Desconhecido",
   "currency.aud": "Dólar Australiano",
   "currency.brl": "Real Brasileiro",
@@ -171,17 +175,15 @@
   "currency.usd": "Dólar dos Estados Unidos",
   "currency.vnd": "Dong vietnamita",
   "dapp.request.approve.action": "Aprovar",
-  "dapp.request.approve.fallbackTitle": "Aprovar tokens de gastos",
-  "dapp.request.approve.helptext": "Permita que este site acesse e gaste este token de sua carteira.",
+  "dapp.request.approve.fallbackTitle": "Aprove este site para acessar tokens",
+  "dapp.request.approve.helptext": "Permita que este site acesse e gaste este token em transações. Certifique-se de confiar neste site.",
   "dapp.request.approve.label": "Carteira",
-  "dapp.request.approve.title": "Aprovar gastos {{tokenSymbol}}",
+  "dapp.request.approve.title": "Aprovar acesso a {{tokenSymbol}}",
   "dapp.request.base.title": "Solicitação de transação",
   "dapp.request.connect.helptext": "Permita que este site visualize o endereço e o saldo da sua carteira e solicite aprovações para transações.",
   "dapp.request.connect.title": "Conectar ao site",
   "dapp.request.fallback.calldata.label": "Dados não tratados",
   "dapp.request.fallback.function.label": "Função",
-  "dapp.request.fallback.recipient.label": "Para",
-  "dapp.request.fallback.sending.label": "Enviando",
   "dapp.request.permit2.description": "Permit2 gerencia aprovações de tokens em vários dapps.",
   "dapp.request.permit2.header": "Assinar Permissão2",
   "dapp.request.reject.action": "Rejeitar tudo",
@@ -349,6 +351,13 @@
   "language.ukrainian": "ucraniano",
   "language.urdu": "urdu",
   "language.vietnamese": "Vietnamita",
+  "mobile.appRating.button.decline": "Na verdade",
+  "mobile.appRating.description": "Deixe-nos saber se você está tendo uma boa experiência com este aplicativo",
+  "mobile.appRating.feedback.button.cancel": "Talvez mais tarde",
+  "mobile.appRating.feedback.button.send": "Enviar comentário",
+  "mobile.appRating.feedback.description": "Deixe-nos saber como podemos melhorar sua experiência",
+  "mobile.appRating.feedback.title": "Lamentamos ouvir isso.",
+  "mobile.appRating.title": "Gostando da carteira Uniswap?",
   "notification.assetVisibility.hidden": "{{assetName}} ocultado",
   "notification.assetVisibility.unhidden": "{{assetName}} reexibido",
   "notification.copied.address": "Endereço copiado",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Aprovado {{currencySymbol}} para uso com {{address}}.",
   "notification.transaction.pending": "Transação pendente",
   "notification.transaction.swap.canceled": "Troca {{inputCurrencySymbol}}-{{outputCurrencySymbol}} cancelada.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} para {{outputCurrencyAmountWithSymbol}} a troca expirou.",
   "notification.transaction.swap.fail": "Falha ao trocar {{inputCurrencyAmountWithSymbol}} por {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Trocado {{inputCurrencyAmountWithSymbol}} por {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Envio de {{tokenNameOrAddress}} cancelado.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Continue na extensão Uniswap",
   "notifications.scantastic.title": "Sucesso!",
   "onboarding.backup.manual.banner": "É melhor escrever isso em um pedaço de papel e guardá-lo em um local seguro ou em um gerenciador de senhas seguro.",
+  "onboarding.backup.manual.error": "Palavra inválida ou escrita incorretamente",
   "onboarding.backup.manual.placeholder": "Palavra secreta",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "Selecione a palavra",
-  "onboarding.backup.manual.subtitle_one": "Qual é a palavra <highlight/>{{count}}ª</highlight/> palavra na sua frase de recuperação?",
-  "onboarding.backup.manual.subtitle_two": "Qual é a palavra <highlight/>{{count}}ª</highlight/> palavra na sua frase de recuperação?",
-  "onboarding.backup.manual.subtitle_few": "Qual é a palavra <highlight/>{{count}}ª</highlight/> palavra na sua frase de recuperação?",
-  "onboarding.backup.manual.subtitle_other": "Qual é a palavra <highlight/>{{count}}ª</highlight/> palavra na sua frase de recuperação?",
+  "onboarding.backup.manual.subtitle_one": "Qual é a palavra {{count}}ª palavra na sua frase de recuperação?",
+  "onboarding.backup.manual.subtitle_two": "Qual é a palavra {{count}}ª palavra na sua frase de recuperação?",
+  "onboarding.backup.manual.subtitle_few": "Qual é a palavra {{count}}ª palavra na sua frase de recuperação?",
+  "onboarding.backup.manual.subtitle_other": "Qual é a palavra {{count}}ª palavra na sua frase de recuperação?",
   "onboarding.backup.manual.title": "Vamos ter certeza de que você gravou corretamente",
   "onboarding.backup.option.cloud.description": "Criptografe sua frase de recuperação com uma senha segura",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} cópia de segurança",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Os backups permitem restaurar sua carteira caso você exclua o aplicativo ou perca seu dispositivo",
   "onboarding.backup.title.existing": "Faça backup de sua carteira",
   "onboarding.backup.title.new": "Escolha um método de backup",
-  "onboarding.backup.view.disclaimer": "Entendo que se eu perder minha frase de recuperação, Uniswap Labs não poderá me ajudar a restaurá-la",
+  "onboarding.backup.view.disclaimer": "Entendo que se eu perder minha frase de recuperação, Uniswap Labs não poderá me ajudar a restaurá-la.",
   "onboarding.backup.view.subtitle.message1": "Leia atentamente o seguinte antes de continuar",
   "onboarding.backup.view.subtitle.message2": "Você precisará inserir todas as 12 palavras secretas para recuperar sua carteira.",
   "onboarding.backup.view.title": "Escreva sua frase de recuperação",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Clique no ícone de alfinete para adicionar a extensão Uniswap à sua barra de ferramentas.",
   "onboarding.complete.pin.title": "Extensão Pin Uniswap",
   "onboarding.complete.title": "Você está pronto",
-  "onboarding.extension.connectMobile.button": "Importe do seu telefone",
-  "onboarding.extension.connectMobile.title": "Possui o aplicativo móvel Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Baixe o aplicativo móvel para reivindicar um nome de usuário",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Entre na lista de espera do Beta",
   "onboarding.extension.password.subtitle": "Você precisará disso para desbloquear sua carteira e acessar sua frase de recuperação",
   "onboarding.extension.password.title.default": "Criar senha",
   "onboarding.extension.password.title.reset": "Redefinir sua senha",
+  "onboarding.extension.unsupported.description": "A extensão Uniswap só é compatível com o Chrome no momento.",
+  "onboarding.extension.unsupported.title": "Este navegador não é compatível (ainda)",
   "onboarding.import.error.invalidWords_one": "1 palavra é inválida ou escrita incorretamente",
   "onboarding.import.error.invalidWords_other": "{{count}} palavras são inválidas ou escritas incorretamente",
   "onboarding.import.method.import.message": "Digite sua frase de recuperação de outra carteira de cripto",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Digite ou cole sua frase de recuperação de 12 palavras",
   "onboarding.importMnemonic.title": "Digite sua frase de recuperação",
   "onboarding.intro.button.alreadyHave": "Eu já tenho uma carteira",
-  "onboarding.intro.title": "Bem-vindo à \nCarteira Uniswap",
+  "onboarding.intro.mobileScan.button": "Digitalize o código QR para importar",
+  "onboarding.intro.mobileScan.title": "Tem o aplicativo Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Verifique a elegibilidade",
   "onboarding.introBetaWaitlist.button.letsGo": "Vamos",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Digite seu nome de usuário <highlight>uni.eth</highlight> abaixo para verificar se você é elegível para o Beta.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Você ainda está na lista de espera. Iremos notificá-lo no aplicativo móvel Uniswap quando você se tornar elegível!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "nome de usuário",
   "onboarding.landing.button.add": "Adicionar uma carteira existente",
-  "onboarding.landing.button.create": "Criar uma nova carteira",
+  "onboarding.landing.button.create": "Crie uma carteira",
   "onboarding.notification.permission.message": "Para receber notificações, ative as notificações da Carteira Uniswap nas configurações do seu dispositivo.",
   "onboarding.notification.permission.title": "Permissão de notificações",
   "onboarding.notification.subtitle": "Seja notificado quando suas transferências, trocas e aprovações forem concluídas.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Você tem isso como uma carteira somente para visualização",
   "send.recipientSelect.search.empty.message": "Quando você envia tokens para um endereço de carteira, eles aparecerão aqui",
   "send.recipientSelect.search.empty.title": "Nenhuma carteira salva",
-  "send.recipientSelect.title": "Para",
   "send.review.modal.title": "Você está enviando",
   "send.review.summary.button.title": "Confirmar envio",
   "send.review.summary.sending": "Enviando",
-  "send.review.summary.to": "Para",
   "send.search.empty.subtitle": "O endereço que você digitou não existe ou está escrito incorretamente.",
   "send.search.empty.title": "Nenhum resultado encontrado",
   "send.search.placeholder": "Pesquise ENS ou endereço",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Esta carteira é somente para visualização",
   "setting.recoveryPhrase.account.show": "Mostrar frase de recuperação",
   "setting.recoveryPhrase.action.hide": "Ocultar frase de recuperação",
-  "setting.recoveryPhrase.remove.button": "Remover frase de recuperação",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Entendo que o Uniswap Labs não poderá me ajudar a recuperar minha carteira se eu não conseguir fazê-lo",
+  "setting.recoveryPhrase.remove": "Remover frase de recuperação",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Entendo que o Uniswap Labs não poderá me ajudar a recuperar minha carteira se eu não conseguir fazê-lo.",
   "setting.recoveryPhrase.remove.confirm.title": "Salvei minha frase de recuperação",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Certifique-se de salvar sua frase de recuperação. Caso contrário, você perderá o acesso aos seus fundos",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Certifique-se de salvar sua frase de recuperação. Caso contrário, você perderá o acesso às suas carteiras",
   "setting.recoveryPhrase.remove.initial.title": "Antes de continuar",
   "setting.recoveryPhrase.remove.password.error": "Senha incorreta. Tente novamente",
-  "setting.recoveryPhrase.remove.password.input": "Digite a senha",
-  "setting.recoveryPhrase.remove.subtitle": "Digite sua senha para continuar",
+  "setting.recoveryPhrase.remove.subtitle": "Digite sua senha para confirmar",
   "setting.recoveryPhrase.remove.title": "Você está removendo sua frase de recuperação",
-  "setting.recoveryPhrase.view.error": "Senha errada, tente novamente",
   "setting.recoveryPhrase.view.warning.message1": "Qualquer pessoa que saiba sua frase de recuperação poderá acessar sua carteira e seus fundos",
   "setting.recoveryPhrase.view.warning.message2": "Veja isso em particular",
-  "setting.recoveryPhrase.view.warning.message3": "Não compartilhe isso com ninguém",
-  "setting.recoveryPhrase.view.warning.message4": "Nunca entrar para nenhum site ou app",
+  "setting.recoveryPhrase.view.warning.message3": "Não compartilhe com ninguém",
+  "setting.recoveryPhrase.view.warning.message4": "Nunca insira-o em nenhum site ou aplicativo",
   "setting.recoveryPhrase.view.warning.title": "Antes de continuar",
   "setting.recoveryPhrase.warning.screenshot.message": "Qualquer pessoa que tenha acesso às suas fotos pode acessar sua carteira. Recomendamos que ao invés você escreva suas palavras.",
   "setting.recoveryPhrase.warning.screenshot.title": "Capturas de tela não são seguras",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Ver menos",
   "settings.section.wallet.label.viewOnly": "Somente visualização",
   "settings.section.wallet.title": "Configurações da carteira",
-  "settings.setting.appearance.option.auto": "Auto",
   "settings.setting.appearance.option.dark.subtitle": "Sempre usar o modo escuro",
   "settings.setting.appearance.option.dark.title": "Modo escuro",
   "settings.setting.appearance.option.device.subtitle": "Usar a aparência do seu dispositivo",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Usamos dados de uso anônimos para aprimorar sua experiência nos produtos Uniswap Labs. Quando desativado, rastreamos apenas erros e usos essenciais.",
   "settings.setting.privacy.analytics.title": "Permitir analytics",
   "settings.setting.privacy.title": "Privacidade",
-  "settings.setting.recoveryPhrase.remove": "Remover frase de recuperação",
+  "settings.setting.recoveryPhrase.password.title": "Coloque sua senha",
   "settings.setting.recoveryPhrase.title": "Frase de recuperação",
-  "settings.setting.recoveryPhrase.view": "Ver frase de recuperação",
   "settings.setting.smallBalances.title": "Ocultar saldos pequenos",
-  "settings.setting.theme.title": "Tema",
   "settings.setting.unknownTokens.title": "Ocultar tokens desconhecidos",
   "settings.setting.wallet.action.editLabel": "Editar rótulo",
   "settings.setting.wallet.action.editProfile": "Editar Perfil",
@@ -729,6 +734,8 @@
   "settings.version": "Versão {{appVersion}}",
   "swap.button.max": "Máx.",
   "swap.button.review": "Revisar",
+  "swap.button.submitting": "Enviando troca...",
+  "swap.button.submitting.keep.open": "Mantenha sua carteira aberta...",
   "swap.button.swap": "Trocar",
   "swap.button.unwrap": "Desembrulhar",
   "swap.button.view": "Ver transação",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Você está offline",
   "swap.warning.priceImpact.message": "Devido ao valor de liquidez de {{outputCurrencySymbol}} disponível atualmente, quanto mais {{inputCurrencySymbol}} você tentar trocar, menos {{outputCurrencySymbol}} receberá.",
   "swap.warning.priceImpact.title": "Impacto de alto preço ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Sua transação não foi enviada porque você fechou o aplicativo.",
+  "swap.warning.queuedOrder.approvalFailed": "Sua transação não foi enviada porque a aprovação do token falhou.",
+  "swap.warning.queuedOrder.stale": "Sua transação não foi enviada porque você fechou o aplicativo ou a aprovação demorou muito.",
+  "swap.warning.queuedOrder.submissionFailed": "Ocorreu um problema ao enviar sua transação.",
+  "swap.warning.queuedOrder.title": "Troca cancelada",
+  "swap.warning.queuedOrder.wrap.message": "Seu ETH permanecerá empacotado como WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Sua transação não foi enviada porque a transação final falhou.",
   "swap.warning.rateLimit.message": "Por favor, tente novamente em alguns minutos.",
   "swap.warning.rateLimit.title": "Limite de taxa excedido",
   "swap.warning.router.message": "Você pode ter perdido a conexão ou a rede pode estar inoperante. Se o problema persistir, tente novamente mais tarde.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Saldos em outras redes",
   "token.balances.viewOnly": "Saldo de {{ownerAddress}}",
   "token.error.unknown": "Token desconhecido",
-  "token.links.contract": "Contrato",
   "token.links.title": "Ligações",
   "token.links.twitter": "Twitter",
   "token.links.website": "Local na rede Internet",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Ocultar Token",
   "tokens.action.unhide": "Mostrar Token",
   "tokens.hidden.label": "Ocultos ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Ver em {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Não foi possível carregar a coleção NFT",
   "tokens.nfts.collection.label.items": "Itens",
   "tokens.nfts.collection.label.owners": "Donos",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Ilimitado",
   "transaction.currency.unknown": "token desconhecido",
   "transaction.date": "Enviado em {{date}}",
+  "transaction.details.dappName": "Aplicativo",
+  "transaction.details.from": "De",
   "transaction.details.networkFee": "Custo da rede",
   "transaction.details.transactionId": "ID da transação",
   "transaction.network.all": "Todas as redes",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Enviado em {{externalDappName}}",
   "transaction.status.swap.canceled": "Troca cancelada",
   "transaction.status.swap.canceling": "Cancelando troca",
+  "transaction.status.swap.expired": "Troca expirada",
   "transaction.status.swap.failed": "Falha ao trocar",
+  "transaction.status.swap.insufficientFunds": "Fundos insuficientes",
   "transaction.status.swap.pending": "Trocando",
   "transaction.status.swap.success": "Trocado",
   "transaction.status.swap.successDapp": "Trocado em {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Role para baixo para assinar",
   "walletConnect.request.button.sign": "Assinar",
   "walletConnect.request.details.label.function": "Função",
-  "walletConnect.request.details.label.recipient": "Para",
   "walletConnect.request.details.label.sending": "Enviando",
   "walletConnect.request.error.insufficientFunds": "Você não tem {{currencySymbol}} suficiente para concluir esta transação.",
   "walletConnect.request.error.network": "Erro de conexão com a Internet ou rede",
diff --git a/packages/uniswap/src/i18n/locales/translations/ru-RU.json b/packages/uniswap/src/i18n/locales/translations/ru-RU.json
index 1eeb559ac67..f190dbecd41 100644
--- a/packages/uniswap/src/i18n/locales/translations/ru-RU.json
+++ b/packages/uniswap/src/i18n/locales/translations/ru-RU.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Попробуйте еще раз",
   "common.button.understand": "Я понимаю",
   "common.button.view": "Вид",
+  "common.button.yes": "Да",
   "common.card.error.description": "Что-то пошло не так",
   "common.card.error.title": "Упс! Что-то пошло не так.",
   "common.endAdornment": "и",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Настройки",
   "common.navigation.systemSettings": "Настройки",
   "common.text.connected": "Связанный",
+  "common.text.contract": "Договор",
   "common.text.disconnected": "Отключено",
   "common.text.error": "Ошибка",
   "common.text.notAvailable": "Н/Д",
+  "common.text.recipient": "К",
+  "common.text.sender": "От",
   "common.text.unknown": "Неизвестный",
   "currency.aud": "Австралийский доллар",
   "currency.brl": "Бразильский реал",
@@ -171,17 +175,15 @@
   "currency.usd": "Американский доллар",
   "currency.vnd": "Вьетнамский донг",
   "dapp.request.approve.action": "Утвердить",
-  "dapp.request.approve.fallbackTitle": "Утвердить жетоны расходов",
-  "dapp.request.approve.helptext": "Разрешите этому сайту получить доступ и потратить этот токен из вашего кошелька.",
+  "dapp.request.approve.fallbackTitle": "Одобрите этот сайт для доступа к токенам",
+  "dapp.request.approve.helptext": "Разрешить этому сайту доступ и использование этого токена для транзакций. Убедитесь, что вы доверяете этому сайту.",
   "dapp.request.approve.label": "Кошелек",
-  "dapp.request.approve.title": "Одобрить расходы {{tokenSymbol}}",
+  "dapp.request.approve.title": "Разрешить доступ к {{tokenSymbol}}",
   "dapp.request.base.title": "Запрос транзакции",
   "dapp.request.connect.helptext": "Разрешите этому сайту просматривать адрес вашего кошелька, баланс и запрашивать одобрение транзакций.",
   "dapp.request.connect.title": "Подключиться к сайту",
   "dapp.request.fallback.calldata.label": "Необработанные данные",
   "dapp.request.fallback.function.label": "Функция",
-  "dapp.request.fallback.recipient.label": "К",
-  "dapp.request.fallback.sending.label": "Отправка",
   "dapp.request.permit2.description": "Permit2 управляет утверждениями токенов в нескольких децентрализованных приложениях.",
   "dapp.request.permit2.header": "Подписать Разрешение2",
   "dapp.request.reject.action": "Отклонить все",
@@ -349,6 +351,13 @@
   "language.ukrainian": "украинец",
   "language.urdu": "Урду",
   "language.vietnamese": "вьетнамский",
+  "mobile.appRating.button.decline": "Не совсем",
+  "mobile.appRating.description": "Дайте нам знать, если вам понравилось это приложение",
+  "mobile.appRating.feedback.button.cancel": "Может быть позже",
+  "mobile.appRating.feedback.button.send": "Отправить отзыв",
+  "mobile.appRating.feedback.description": "Дайте нам знать, как мы можем улучшить ваш опыт",
+  "mobile.appRating.feedback.title": "Нам жаль это слышать.",
+  "mobile.appRating.title": "Наслаждаетесь кошельком Uniswap?",
   "notification.assetVisibility.hidden": "{{assetName}} скрыто",
   "notification.assetVisibility.unhidden": "{{assetName}} скрыто",
   "notification.copied.address": "Адрес скопирован",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Утверждено {{currencySymbol}} для использования с {{address}}.",
   "notification.transaction.pending": "Транзакция ожидает рассмотрения",
   "notification.transaction.swap.canceled": "Отменён{{outputCurrencySymbol}} {{inputCurrencySymbol}}.",
+  "notification.transaction.swap.expired": "Срок замены {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}} истек.",
   "notification.transaction.swap.fail": "Не удалось заменить {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Поменял {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Отменено {{tokenNameOrAddress}} отправить.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Продолжить расширение Uniswap",
   "notifications.scantastic.title": "Успешно!",
   "onboarding.backup.manual.banner": "Лучше всего написать это на листе бумаги и хранить в надежном месте или в безопасном менеджере паролей.",
+  "onboarding.backup.manual.error": "Неверное или неправильно написанное слово",
   "onboarding.backup.manual.placeholder": "Секретное слово",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} завершено",
   "onboarding.backup.manual.selectedWordPlaceholder": "Выберите слово",
-  "onboarding.backup.manual.subtitle_one": "Какое слово <highlight/>{{count}}</highlight/> в вашей фразе восстановления?",
-  "onboarding.backup.manual.subtitle_two": "Какое слово <highlight/>{{count}}и</highlight/> в вашей фразе восстановления?",
-  "onboarding.backup.manual.subtitle_few": "Какое слово <highlight/>{{count}}</highlight/> в вашей фразе восстановления?",
-  "onboarding.backup.manual.subtitle_other": "Какое слово <highlight/>{{count}}</highlight/> в вашей фразе восстановления?",
+  "onboarding.backup.manual.subtitle_one": "Какое {{count}}-е слово в вашей фразе восстановления?",
+  "onboarding.backup.manual.subtitle_two": "Какое {{count}}-е слово в вашей фразе восстановления?",
+  "onboarding.backup.manual.subtitle_few": "Какое {{count}}слово в вашей фразе восстановления?",
+  "onboarding.backup.manual.subtitle_other": "Какое {{count}}-е слово в вашей фразе восстановления?",
   "onboarding.backup.manual.title": "Давайте убедимся, что вы все правильно записали",
   "onboarding.backup.option.cloud.description": "Зашифруйте фразу восстановления надежным паролем",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} резервная копия",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Резервные копии позволяют восстановить кошелек, если вы удалите приложение или потеряете устройство.",
   "onboarding.backup.title.existing": "Создайте резервную копию своего кошелька",
   "onboarding.backup.title.new": "Выберите метод резервного копирования",
-  "onboarding.backup.view.disclaimer": "Я понимаю, что если я потеряю фразу восстановления, Uniswap Labs не сможет помочь мне восстановить ее.",
+  "onboarding.backup.view.disclaimer": "Я понимаю, что если я потеряю фразу восстановления, Uniswap Labs не сможет мне помочь ее восстановить.",
   "onboarding.backup.view.subtitle.message1": "Прежде чем продолжить, внимательно прочитайте следующее",
   "onboarding.backup.view.subtitle.message2": "Вам нужно будет ввести все 12 этих секретных слов, чтобы восстановить свой кошелек.",
   "onboarding.backup.view.title": "Запишите фразу восстановления",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Щелкните значок булавки, чтобы добавить расширение Uniswap на панель инструментов.",
   "onboarding.complete.pin.title": "Расширение Pin Uniswap",
   "onboarding.complete.title": "Все готово",
-  "onboarding.extension.connectMobile.button": "Импортируйте с телефона",
-  "onboarding.extension.connectMobile.title": "У вас есть мобильное приложение Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Загрузите мобильное приложение, чтобы запросить имя пользователя",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Встаньте в список ожидания бета-тестирования",
   "onboarding.extension.password.subtitle": "Это понадобится вам, чтобы разблокировать кошелек и получить доступ к фразе восстановления.",
   "onboarding.extension.password.title.default": "Придумайте пароль",
   "onboarding.extension.password.title.reset": "Сбросить пароль",
+  "onboarding.extension.unsupported.description": "Расширение Uniswap на данный момент совместимо только с Chrome.",
+  "onboarding.extension.unsupported.title": "Этот браузер не поддерживается (пока)",
   "onboarding.import.error.invalidWords_one": "1 слово неверно или написано с ошибкой",
   "onboarding.import.error.invalidWords_other": "{{count}} слова недействительны или написаны с ошибками.",
   "onboarding.import.method.import.message": "Введите фразу восстановления из другого криптокошелька.",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Введите или вставьте фразу восстановления из 12 слов.",
   "onboarding.importMnemonic.title": "Введите фразу восстановления",
   "onboarding.intro.button.alreadyHave": "У меня уже есть кошелек",
-  "onboarding.intro.title": "Добро пожаловать в \nкошелек Uniswap",
+  "onboarding.intro.mobileScan.button": "Сканируйте QR-код для импорта",
+  "onboarding.intro.mobileScan.title": "У вас есть приложение Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Проверьте право на участие",
   "onboarding.introBetaWaitlist.button.letsGo": "Пойдем",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Введите свое имя пользователя <highlight>uni.eth</highlight> ниже, чтобы проверить, имеете ли вы право на участие в бета-тестировании.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Вы все еще в списке ожидания. Мы уведомим вас в мобильном приложении Uniswap, когда вы получите право на участие!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "имя пользователя",
   "onboarding.landing.button.add": "Добавить существующий кошелек",
-  "onboarding.landing.button.create": "Создать новый кошелек",
+  "onboarding.landing.button.create": "Создать кошелек",
   "onboarding.notification.permission.message": "Чтобы получать уведомления, включите уведомления для Uniswap Wallet в настройках вашего устройства.",
   "onboarding.notification.permission.title": "Разрешение на уведомления",
   "onboarding.notification.subtitle": "Получайте уведомления, когда ваши переводы, обмены и утверждения будут завершены.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "У вас есть этот кошелек только для просмотра.",
   "send.recipientSelect.search.empty.message": "Когда вы отправляете токены на адрес кошелька, они появятся здесь.",
   "send.recipientSelect.search.empty.title": "Кошельки не сохранены",
-  "send.recipientSelect.title": "К",
   "send.review.modal.title": "Вы отправляете",
   "send.review.summary.button.title": "Подтвердить отправку",
   "send.review.summary.sending": "Отправка",
-  "send.review.summary.to": "К",
   "send.search.empty.subtitle": "Введенный вами адрес либо не существует, либо написан неправильно.",
   "send.search.empty.title": "результатов не найдено",
   "send.search.placeholder": "Найдите ENS или адрес",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Этот кошелек доступен только для просмотра",
   "setting.recoveryPhrase.account.show": "Показать фразу восстановления",
   "setting.recoveryPhrase.action.hide": "Скрыть фразу восстановления",
-  "setting.recoveryPhrase.remove.button": "Удалить фразу восстановления",
+  "setting.recoveryPhrase.remove": "Удалить фразу восстановления",
   "setting.recoveryPhrase.remove.confirm.subtitle": "Я понимаю, что Uniswap Labs не сможет помочь мне восстановить мой кошелек, если я этого не сделаю.",
   "setting.recoveryPhrase.remove.confirm.title": "Я сохранил фразу восстановления",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Убедитесь, что вы сохранили фразу восстановления. В противном случае вы потеряете доступ к своим средствам.",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Убедитесь, что вы сохранили фразу восстановления. В противном случае вы потеряете доступ к своим кошелькам.",
   "setting.recoveryPhrase.remove.initial.title": "Прежде чем продолжить",
   "setting.recoveryPhrase.remove.password.error": "Неправильный пароль. Попробуйте еще раз",
-  "setting.recoveryPhrase.remove.password.input": "Введите пароль",
-  "setting.recoveryPhrase.remove.subtitle": "Введите свой пароль, чтобы продолжить",
+  "setting.recoveryPhrase.remove.subtitle": "Введите свой пароль для подтверждения",
   "setting.recoveryPhrase.remove.title": "Вы удаляете фразу восстановления",
-  "setting.recoveryPhrase.view.error": "Неправильный пароль, попробуйте еще раз",
   "setting.recoveryPhrase.view.warning.message1": "Любой, кто знает вашу фразу восстановления, может получить доступ к вашему кошельку и средствам.",
   "setting.recoveryPhrase.view.warning.message2": "Посмотреть это приватно",
-  "setting.recoveryPhrase.view.warning.message3": "Не делитесь этим ни с кем",
-  "setting.recoveryPhrase.view.warning.message4": "Никогда не вводите его на сайты или приложения",
+  "setting.recoveryPhrase.view.warning.message3": "Не делитесь ни с кем",
+  "setting.recoveryPhrase.view.warning.message4": "Никогда не вводите его ни на какие веб-сайты или в приложения.",
   "setting.recoveryPhrase.view.warning.title": "Прежде чем продолжить",
   "setting.recoveryPhrase.warning.screenshot.message": "Любой, кто получит доступ к вашим фотографиям, сможет получить доступ к вашему кошельку. Вместо этого мы рекомендуем вам записывать свои слова.",
   "setting.recoveryPhrase.warning.screenshot.title": "Скриншоты не защищены",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Посмотреть меньше",
   "settings.section.wallet.label.viewOnly": "Только просмотр",
   "settings.section.wallet.title": "Настройки кошелька",
-  "settings.setting.appearance.option.auto": "Авто",
   "settings.setting.appearance.option.dark.subtitle": "Всегда используйте темный режим",
   "settings.setting.appearance.option.dark.title": "Темный режим",
   "settings.setting.appearance.option.device.subtitle": "По умолчанию внешний вид вашего устройства",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Мы используем анонимные данные об использовании, чтобы улучшить ваше взаимодействие с продуктами Uniswap Labs. Если этот параметр отключен, мы отслеживаем только ошибки и существенное использование.",
   "settings.setting.privacy.analytics.title": "Разрешить аналитику",
   "settings.setting.privacy.title": "Конфиденциальность",
-  "settings.setting.recoveryPhrase.remove": "Удалить фразу восстановления",
+  "settings.setting.recoveryPhrase.password.title": "Введите ваш пароль",
   "settings.setting.recoveryPhrase.title": "Восстановительная фраза",
-  "settings.setting.recoveryPhrase.view": "Посмотреть фразу восстановления",
   "settings.setting.smallBalances.title": "Скрыть небольшие остатки",
-  "settings.setting.theme.title": "Тема",
   "settings.setting.unknownTokens.title": "Скрыть неизвестные токены",
   "settings.setting.wallet.action.editLabel": "Изменить ярлык",
   "settings.setting.wallet.action.editProfile": "Редактировать профиль",
@@ -729,6 +734,8 @@
   "settings.version": "Версия {{appVersion}}",
   "swap.button.max": "Макс",
   "swap.button.review": "Обзор",
+  "swap.button.submitting": "Отправляем обмен...",
+  "swap.button.submitting.keep.open": "Держите кошелек открытым...",
   "swap.button.swap": "Менять",
   "swap.button.unwrap": "Развернуть",
   "swap.button.view": "Посмотреть транзакцию",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Ты не в сети",
   "swap.warning.priceImpact.message": "Из-за доступной в настоящее время суммы {{outputCurrencySymbol}} ликвидности, чем больше {{inputCurrencySymbol}} вы попытаетесь обменять, тем меньше {{outputCurrencySymbol}} вы получите.",
   "swap.warning.priceImpact.title": "Влияние высокой цены ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Ваша транзакция не была отправлена, поскольку вы закрыли приложение.",
+  "swap.warning.queuedOrder.approvalFailed": "Ваша транзакция не была отправлена, поскольку не удалось утвердить токен.",
+  "swap.warning.queuedOrder.stale": "Ваша транзакция не была отправлена, потому что вы закрыли приложение или одобрение заняло слишком много времени.",
+  "swap.warning.queuedOrder.submissionFailed": "Возникла проблема с отправкой транзакции.",
+  "swap.warning.queuedOrder.title": "Обмен отменен",
+  "swap.warning.queuedOrder.wrap.message": "Ваш ETH останется завернутым как WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Ваша транзакция не была отправлена, поскольку транзакция переноса не удалась.",
   "swap.warning.rateLimit.message": "Пожалуйста, повторите попытку через несколько минут.",
   "swap.warning.rateLimit.title": "Ограничение скорости превышено",
   "swap.warning.router.message": "Возможно, у вас потеряно соединение или сеть не работает. Если проблема не устранена, повторите попытку позже.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Балансы в других сетях",
   "token.balances.viewOnly": "{{ownerAddress}}баланс",
   "token.error.unknown": "Неизвестный токен",
-  "token.links.contract": "Договор",
   "token.links.title": "Ссылки",
   "token.links.twitter": "Твиттер",
   "token.links.website": "Веб-сайт",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Скрыть токен",
   "tokens.action.unhide": "Показать токен",
   "tokens.hidden.label": "Скрытый ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Посмотреть {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Не удалось загрузить коллекцию NFT.",
   "tokens.nfts.collection.label.items": "Предметы",
   "tokens.nfts.collection.label.owners": "Владельцы",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Безлимитный",
   "transaction.currency.unknown": "неизвестный токен",
   "transaction.date": "Отправлено {{date}}",
+  "transaction.details.dappName": "Приложение",
+  "transaction.details.from": "От",
   "transaction.details.networkFee": "Стоимость сети",
   "transaction.details.transactionId": "ID транзакции",
   "transaction.network.all": "Все сети",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Отправлено {{externalDappName}}",
   "transaction.status.swap.canceled": "Отмененный обмен",
   "transaction.status.swap.canceling": "Отмена обмена",
+  "transaction.status.swap.expired": "Срок действия свопа истек",
   "transaction.status.swap.failed": "Не удалось поменять местами",
+  "transaction.status.swap.insufficientFunds": "Недостаточно средств",
   "transaction.status.swap.pending": "Обмен",
   "transaction.status.swap.success": "поменяно местами",
   "transaction.status.swap.successDapp": "Заменено на {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Прокрутите вниз, чтобы подписать",
   "walletConnect.request.button.sign": "Знак",
   "walletConnect.request.details.label.function": "Функция",
-  "walletConnect.request.details.label.recipient": "К",
   "walletConnect.request.details.label.sending": "Отправка",
   "walletConnect.request.error.insufficientFunds": "У вас недостаточно {{currencySymbol}} для завершения этой транзакции.",
   "walletConnect.request.error.network": "Ошибка подключения к Интернету или сети",
diff --git a/packages/uniswap/src/i18n/locales/translations/th-TH.json b/packages/uniswap/src/i18n/locales/translations/th-TH.json
index aecdce26218..1ea20ec5921 100644
--- a/packages/uniswap/src/i18n/locales/translations/th-TH.json
+++ b/packages/uniswap/src/i18n/locales/translations/th-TH.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "ลองอีกครั้ง",
   "common.button.understand": "ฉันเข้าใจ",
   "common.button.view": "ดู",
+  "common.button.yes": "ใช่",
   "common.card.error.description": "บางอย่างผิดพลาด",
   "common.card.error.title": "อ๊ะ! บางอย่างผิดพลาด.",
   "common.endAdornment": "และ",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "การตั้งค่า",
   "common.navigation.systemSettings": "การตั้งค่า",
   "common.text.connected": "เชื่อมต่อแล้ว",
+  "common.text.contract": "สัญญา",
   "common.text.disconnected": "ตัดการเชื่อมต่อแล้ว",
   "common.text.error": "ข้อผิดพลาด",
   "common.text.notAvailable": "ไม่มี",
+  "common.text.recipient": "ถึง",
+  "common.text.sender": "จาก",
   "common.text.unknown": "ไม่ทราบ",
   "currency.aud": "ดอลลาร์ออสเตรเลีย",
   "currency.brl": "เรียลบราซิล",
@@ -171,17 +175,15 @@
   "currency.usd": "ดอลลาร์สหรัฐ",
   "currency.vnd": "ดองเวียดนาม",
   "dapp.request.approve.action": "อนุมัติ",
-  "dapp.request.approve.fallbackTitle": "อนุมัติโทเค็นการใช้จ่าย",
-  "dapp.request.approve.helptext": "อนุญาตให้ไซต์นี้เข้าถึงและใช้โทเค็นนี้จากกระเป๋าเงินของคุณ",
+  "dapp.request.approve.fallbackTitle": "อนุมัติไซต์นี้ให้เข้าถึงโทเค็น",
+  "dapp.request.approve.helptext": "อนุญาตให้ไซต์นี้เข้าถึงและใช้โทเค็นนี้เพื่อการทำธุรกรรม ตรวจสอบให้แน่ใจว่าคุณเชื่อถือไซต์นี้",
   "dapp.request.approve.label": "กระเป๋าสตางค์",
-  "dapp.request.approve.title": "อนุมัติการใช้จ่าย {{tokenSymbol}}",
+  "dapp.request.approve.title": "อนุมัติการเข้าถึง {{tokenSymbol}}",
   "dapp.request.base.title": "คำขอธุรกรรม",
   "dapp.request.connect.helptext": "อนุญาตให้ไซต์นี้ดูที่อยู่กระเป๋าเงินของคุณ ยอดคงเหลือ และขออนุมัติการทำธุรกรรม",
   "dapp.request.connect.title": "เชื่อมต่อกับไซต์",
   "dapp.request.fallback.calldata.label": "ข้อมูลดิบ",
   "dapp.request.fallback.function.label": "การทำงาน",
-  "dapp.request.fallback.recipient.label": "ถึง",
-  "dapp.request.fallback.sending.label": "การส่ง",
   "dapp.request.permit2.description": "Permit2 จัดการการอนุมัติโทเค็นในหลาย ๆ DApp",
   "dapp.request.permit2.header": "ลงนามอนุญาต2",
   "dapp.request.reject.action": "ปฏิเสธทั้งหมด",
@@ -349,6 +351,13 @@
   "language.ukrainian": "ภาษายูเครน",
   "language.urdu": "ภาษาอูรดู",
   "language.vietnamese": "ภาษาเวียดนาม",
+  "mobile.appRating.button.decline": "ไม่เชิง",
+  "mobile.appRating.description": "แจ้งให้เราทราบหากคุณมีประสบการณ์ที่ดีกับแอพนี้",
+  "mobile.appRating.feedback.button.cancel": "ไว้ก่อน",
+  "mobile.appRating.feedback.button.send": "ส่งความคิดเห็น",
+  "mobile.appRating.feedback.description": "แจ้งให้เราทราบว่าเราจะปรับปรุงประสบการณ์ของคุณได้อย่างไร",
+  "mobile.appRating.feedback.title": "เราเสียใจที่ได้ทราบเช่นนั้น",
+  "mobile.appRating.title": "เพลิดเพลินกับ Uniswap Wallet ไหม?",
   "notification.assetVisibility.hidden": "{{assetName}} ซ่อนอยู่",
   "notification.assetVisibility.unhidden": "{{assetName}} ไม่ได้ซ่อนไว้",
   "notification.copied.address": "คัดลอกที่อยู่แล้ว",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "อนุมัติ {{currencySymbol}} สำหรับใช้กับ {{address}}",
   "notification.transaction.pending": "การทำธุรกรรมที่รอดำเนินการ",
   "notification.transaction.swap.canceled": "ยกเลิกการสลับ {{inputCurrencySymbol}}-{{outputCurrencySymbol}}",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} สำหรับ {{outputCurrencyAmountWithSymbol}} การแลกเปลี่ยนหมดอายุแล้ว",
   "notification.transaction.swap.fail": "ไม่สามารถสลับ {{inputCurrencyAmountWithSymbol}} ต่อ {{outputCurrencyAmountWithSymbol}}",
   "notification.transaction.swap.success": "สลับ {{inputCurrencyAmountWithSymbol}} ต่อ {{outputCurrencyAmountWithSymbol}}",
   "notification.transaction.transfer.canceled": "ยกเลิก {{tokenNameOrAddress}} ส่ง",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "ดำเนินการต่อในส่วนขยาย Uniswap",
   "notifications.scantastic.title": "ความสำเร็จ!",
   "onboarding.backup.manual.banner": "ทางที่ดีควรเขียนสิ่งนี้ลงบนกระดาษและเก็บไว้ในที่ปลอดภัยหรือในเครื่องมือจัดการรหัสผ่านที่ปลอดภัย",
+  "onboarding.backup.manual.error": "คำไม่ถูกต้องหรือสะกดผิด",
   "onboarding.backup.manual.placeholder": "ข้อความลับ",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} เสร็จสมบูรณ์",
   "onboarding.backup.manual.selectedWordPlaceholder": "เลือกคำ",
-  "onboarding.backup.manual.subtitle_one": "<highlight/>{{count}}st</highlight/> คำในวลีการกู้คืนของคุณคืออะไร?",
-  "onboarding.backup.manual.subtitle_two": "<highlight/>{{count}}nd</highlight/> คำในวลีการกู้คืนของคุณคืออะไร?",
-  "onboarding.backup.manual.subtitle_few": "<highlight/>{{count}}rd</highlight/> คำในวลีการกู้คืนของคุณคืออะไร?",
-  "onboarding.backup.manual.subtitle_other": "<highlight/>{{count}}th</highlight/> คำในวลีการกู้คืนของคุณคืออะไร?",
+  "onboarding.backup.manual.subtitle_one": "{{count}}st คำในวลีการกู้คืนของคุณคืออะไร?",
+  "onboarding.backup.manual.subtitle_two": "คำ {{count}}ในวลีกู้คืนของคุณคืออะไร",
+  "onboarding.backup.manual.subtitle_few": "คำ {{count}}rd ในวลีกู้คืนของคุณคืออะไร",
+  "onboarding.backup.manual.subtitle_other": "คำ {{count}}ในวลีกู้คืนของคุณคืออะไร",
   "onboarding.backup.manual.title": "ตรวจสอบให้แน่ใจว่าคุณได้บันทึกอย่างถูกต้อง",
   "onboarding.backup.option.cloud.description": "เข้ารหัสวลีกู้คืนของคุณด้วยรหัสผ่านที่ปลอดภัย",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} สำรองข้อมูล",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "คลิกไอคอนหมุดเพื่อเพิ่มส่วนขยาย Uniswap ลงในแถบเครื่องมือของคุณ",
   "onboarding.complete.pin.title": "ปักหมุดส่วนขยาย Uniswap",
   "onboarding.complete.title": "คุณทุกชุด",
-  "onboarding.extension.connectMobile.button": "นำเข้าจากโทรศัพท์ของคุณ",
-  "onboarding.extension.connectMobile.title": "มีแอพมือถือ Uniswap ไหม?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "ดาวน์โหลดแอปมือถือเพื่ออ้างสิทธิ์ชื่อผู้ใช้",
   "onboarding.extension.getOnTheBetaWaitlist.title": "เข้าสู่รายชื่อรอเบต้า",
   "onboarding.extension.password.subtitle": "คุณจะต้องใช้สิ่งนี้เพื่อปลดล็อคกระเป๋าเงินของคุณและเข้าถึงวลีกู้คืนของคุณ",
   "onboarding.extension.password.title.default": "สร้างรหัสผ่าน",
   "onboarding.extension.password.title.reset": "รีเซ็ตรหัสผ่านของคุณ",
+  "onboarding.extension.unsupported.description": "ส่วนขยาย Uniswap ใช้งานได้กับ Chrome เท่านั้นในขณะนี้",
+  "onboarding.extension.unsupported.title": "เบราว์เซอร์นี้ยังไม่รองรับ (ยัง)",
   "onboarding.import.error.invalidWords_one": "1 คำไม่ถูกต้องหรือสะกดผิด",
   "onboarding.import.error.invalidWords_other": "{{count}} คำไม่ถูกต้องหรือสะกดผิด",
   "onboarding.import.method.import.message": "ป้อนวลีกู้คืนของคุณจากกระเป๋าเงินดิจิตอลเข้ารหัสอื่น",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "พิมพ์หรือวางวลีกู้คืน 12 คำของคุณ",
   "onboarding.importMnemonic.title": "ป้อนวลีการกู้คืนของคุณ",
   "onboarding.intro.button.alreadyHave": "ฉันมีกระเป๋าเงินอยู่แล้ว",
-  "onboarding.intro.title": "ยินดีต้อนรับสู่ \nUniswap Wallet",
+  "onboarding.intro.mobileScan.button": "สแกนรหัส QR เพื่อนำเข้า",
+  "onboarding.intro.mobileScan.title": "มีแอป Uniswap ไหม?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "ตรวจสอบสิทธิ์",
   "onboarding.introBetaWaitlist.button.letsGo": "ไปกันเถอะ",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "ป้อนชื่อผู้ใช้ <highlight>uni.eth</highlight> ของคุณด้านล่างเพื่อตรวจสอบว่าคุณมีสิทธิ์ใช้เบต้าหรือไม่",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "คุณยังอยู่ในรายชื่อรอ เราจะแจ้งให้คุณทราบในแอปมือถือ Uniswap เมื่อคุณมีสิทธิ์!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "ชื่อผู้ใช้",
   "onboarding.landing.button.add": "เพิ่มกระเป๋าเงินที่มีอยู่",
-  "onboarding.landing.button.create": "สร้างกระเป๋าสตางค์ใหม่",
+  "onboarding.landing.button.create": "สร้างกระเป๋าเงิน",
   "onboarding.notification.permission.message": "หากต้องการรับการแจ้งเตือน ให้เปิดการแจ้งเตือนสำหรับ Uniswap Wallet ในการตั้งค่าอุปกรณ์ของคุณ",
   "onboarding.notification.permission.title": "อนุญาตการแจ้งเตือน",
   "onboarding.notification.subtitle": "รับการแจ้งเตือนเมื่อการโอน การแลกเปลี่ยน และการอนุมัติของคุณเสร็จสมบูรณ์",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "คุณมีสิ่งนี้เป็นกระเป๋าเงินแบบดูอย่างเดียว",
   "send.recipientSelect.search.empty.message": "เมื่อคุณส่งโทเค็นไปยังที่อยู่กระเป๋าเงิน โทเค็นเหล่านั้นจะปรากฏที่นี่",
   "send.recipientSelect.search.empty.title": "ไม่มีกระเป๋าเงินที่บันทึกไว้",
-  "send.recipientSelect.title": "ถึง",
   "send.review.modal.title": "คุณกำลังส่ง",
   "send.review.summary.button.title": "ยืนยันการส่ง",
   "send.review.summary.sending": "การส่ง",
-  "send.review.summary.to": "ถึง",
   "send.search.empty.subtitle": "ที่อยู่ที่คุณพิมพ์ไม่มีอยู่หรือสะกดไม่ถูกต้อง",
   "send.search.empty.title": "ไม่พบผลลัพธ์",
   "send.search.placeholder": "ค้นหา ENS หรือที่อยู่",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "กระเป๋าเงินนี้สามารถดูได้อย่างเดียว",
   "setting.recoveryPhrase.account.show": "แสดงวลีการกู้คืน",
   "setting.recoveryPhrase.action.hide": "ซ่อนวลีการกู้คืน",
-  "setting.recoveryPhrase.remove.button": "ลบวลีการกู้คืน",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "ฉันเข้าใจว่า Uniswap Labs ไม่สามารถช่วยฉันกู้คืนกระเป๋าเงินของฉันได้หากไม่ดำเนินการ",
+  "setting.recoveryPhrase.remove": "ลบวลีการกู้คืน",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "ฉันเข้าใจว่า Uniswap Labs ไม่สามารถช่วยฉันกู้คืนกระเป๋าเงินของฉันได้หากไม่ดำเนินการ.",
   "setting.recoveryPhrase.remove.confirm.title": "ฉันบันทึกวลีการกู้คืนของฉันแล้ว",
-  "setting.recoveryPhrase.remove.initial.subtitle": "ตรวจสอบให้แน่ใจว่าคุณได้บันทึกวลีการกู้คืนของคุณแล้ว คุณจะสูญเสียการเข้าถึงเงินทุนของคุณมิฉะนั้น",
+  "setting.recoveryPhrase.remove.initial.subtitle": "ตรวจสอบให้แน่ใจว่าคุณได้บันทึกวลีการกู้คืนของคุณแล้ว คุณจะสูญเสียการเข้าถึงกระเป๋าเงินของคุณมิฉะนั้น",
   "setting.recoveryPhrase.remove.initial.title": "ก่อนที่คุณจะดำเนินการต่อ",
   "setting.recoveryPhrase.remove.password.error": "รหัสผ่านผิด. ลองอีกครั้ง",
-  "setting.recoveryPhrase.remove.password.input": "ใส่รหัสผ่าน",
-  "setting.recoveryPhrase.remove.subtitle": "ป้อนรหัสผ่านของคุณเพื่อดำเนินการต่อ",
+  "setting.recoveryPhrase.remove.subtitle": "ป้อนรหัสผ่านของคุณเพื่อยืนยัน",
   "setting.recoveryPhrase.remove.title": "คุณกำลังลบวลีการกู้คืนของคุณ",
-  "setting.recoveryPhrase.view.error": "รหัสผ่านผิด โปรดลองอีกครั้ง",
   "setting.recoveryPhrase.view.warning.message1": "ใครก็ตามที่รู้วลีการกู้คืนของคุณสามารถเข้าถึงกระเป๋าเงินและเงินทุนของคุณได้",
   "setting.recoveryPhrase.view.warning.message2": "ดูสิ่งนี้เป็นการส่วนตัว",
-  "setting.recoveryPhrase.view.warning.message3": "อย่าแบ่งปันสิ่งนี้กับใคร",
-  "setting.recoveryPhrase.view.warning.message4": "อย่าเข้าไปในเว็บไซต์หรือแอพใด ๆ",
+  "setting.recoveryPhrase.view.warning.message3": "อย่าแบ่งปันกับใคร",
+  "setting.recoveryPhrase.view.warning.message4": "อย่าเข้าไปในเว็บไซต์หรือแอปพลิเคชันใด ๆ",
   "setting.recoveryPhrase.view.warning.title": "ก่อนที่คุณจะดำเนินการต่อ",
   "setting.recoveryPhrase.warning.screenshot.message": "ใครก็ตามที่เข้าถึงรูปถ่ายของคุณได้ก็สามารถเข้าถึงกระเป๋าเงินของคุณได้ เราขอแนะนำให้คุณจดคำศัพท์ของคุณแทน",
   "setting.recoveryPhrase.warning.screenshot.title": "ภาพหน้าจอไม่ปลอดภัย",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "ดูน้อยลง",
   "settings.section.wallet.label.viewOnly": "สำหรับดูเท่านั้น",
   "settings.section.wallet.title": "การตั้งค่ากระเป๋าเงิน",
-  "settings.setting.appearance.option.auto": "อัตโนมัติ",
   "settings.setting.appearance.option.dark.subtitle": "ใช้โหมดมืดเสมอ",
   "settings.setting.appearance.option.dark.title": "โหมดมืด",
   "settings.setting.appearance.option.device.subtitle": "ค่าเริ่มต้นเป็นลักษณะที่ปรากฏของอุปกรณ์ของคุณ",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "เราใช้ข้อมูลการใช้งานที่ไม่ระบุชื่อเพื่อปรับปรุงประสบการณ์ของคุณในผลิตภัณฑ์ Uniswap Labs เมื่อปิดใช้งาน เราจะติดตามเฉพาะข้อผิดพลาดและการใช้งานที่จำเป็นเท่านั้น",
   "settings.setting.privacy.analytics.title": "อนุญาตการวิเคราะห์",
   "settings.setting.privacy.title": "ความเป็นส่วนตัว",
-  "settings.setting.recoveryPhrase.remove": "ลบวลีการกู้คืน",
+  "settings.setting.recoveryPhrase.password.title": "ใส่รหัสผ่านของคุณ",
   "settings.setting.recoveryPhrase.title": "วลีการกู้คืน",
-  "settings.setting.recoveryPhrase.view": "ดูวลีการกู้คืน",
   "settings.setting.smallBalances.title": "ซ่อนยอดคงเหลือขนาดเล็ก",
-  "settings.setting.theme.title": "ธีม",
   "settings.setting.unknownTokens.title": "ซ่อนโทเค็นที่ไม่รู้จัก",
   "settings.setting.wallet.action.editLabel": "แก้ไขป้ายกำกับ",
   "settings.setting.wallet.action.editProfile": "แก้ไขโปรไฟล์",
@@ -729,6 +734,8 @@
   "settings.version": "เวอร์ชัน {{appVersion}}",
   "swap.button.max": "สูงสุด",
   "swap.button.review": "ทบทวน",
+  "swap.button.submitting": "กำลังส่งการแลกเปลี่ยน...",
+  "swap.button.submitting.keep.open": "เปิดกระเป๋าสตางค์ของคุณไว้...",
   "swap.button.swap": "แลกเปลี่ยน",
   "swap.button.unwrap": "แกะ",
   "swap.button.view": "ดูธุรกรรม",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "คุณออฟไลน์อยู่",
   "swap.warning.priceImpact.message": "เนื่องจากปริมาณ {{outputCurrencySymbol}} สภาพคล่องที่มีอยู่ในปัจจุบัน ยิ่งคุณพยายามสลับ {{inputCurrencySymbol}} มากเท่าไร คุณก็จะได้รับ {{outputCurrencySymbol}} น้อยลงเท่านั้น",
   "swap.warning.priceImpact.title": "ผลกระทบต่อราคาสูง ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "ไม่ได้ส่งธุรกรรมของคุณเนื่องจากคุณปิดแอป",
+  "swap.warning.queuedOrder.approvalFailed": "ไม่ได้ส่งธุรกรรมของคุณเนื่องจากการอนุมัติโทเค็นล้มเหลว",
+  "swap.warning.queuedOrder.stale": "ไม่ได้ส่งธุรกรรมของคุณเนื่องจากคุณปิดแอปหรือการอนุมัติใช้เวลานานเกินไป",
+  "swap.warning.queuedOrder.submissionFailed": "เกิดปัญหาในการส่งธุรกรรมของคุณ",
+  "swap.warning.queuedOrder.title": "ยกเลิกการแลกเปลี่ยนแล้ว",
+  "swap.warning.queuedOrder.wrap.message": "ETH ของคุณจะยังคงถูกห่อไว้เป็น WETH",
+  "swap.warning.queuedOrder.wrapFailed": "ไม่ได้ส่งธุรกรรมของคุณเนื่องจากธุรกรรม Wrap ล้มเหลว",
   "swap.warning.rateLimit.message": "โปรดลองอีกครั้งในไม่กี่นาที.",
   "swap.warning.rateLimit.title": "เกินขีดจำกัดอัตรา",
   "swap.warning.router.message": "คุณอาจสูญเสียการเชื่อมต่อหรือเครือข่ายอาจล่ม หากปัญหายังคงอยู่ โปรดลองอีกครั้งในภายหลัง",
@@ -805,7 +819,6 @@
   "token.balances.other": "ยอดคงเหลือในเครือข่ายอื่น",
   "token.balances.viewOnly": "ความสมดุลของ {{ownerAddress}}",
   "token.error.unknown": "โทเค็นที่ไม่รู้จัก",
-  "token.links.contract": "สัญญา",
   "token.links.title": "ลิงค์",
   "token.links.twitter": "ทวิตเตอร์",
   "token.links.website": "เว็บไซต์",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "ซ่อนโทเค็น",
   "tokens.action.unhide": "เลิกซ่อนโทเค็น",
   "tokens.hidden.label": "ซ่อนเร้น ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "ดูบน {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "ไม่สามารถโหลดคอลเลกชัน NFT",
   "tokens.nfts.collection.label.items": "รายการ",
   "tokens.nfts.collection.label.owners": "เจ้าของ",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "ไม่ จำกัด",
   "transaction.currency.unknown": "โทเค็นที่ไม่รู้จัก",
   "transaction.date": "ส่งเมื่อ {{date}}",
+  "transaction.details.dappName": "แอป",
+  "transaction.details.from": "จาก",
   "transaction.details.networkFee": "ต้นทุนเครือข่าย",
   "transaction.details.transactionId": "รหัสธุรกรรม",
   "transaction.network.all": "ทุกเครือข่าย",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "ส่งเมื่อ {{externalDappName}}",
   "transaction.status.swap.canceled": "ยกเลิกการแลกแล้ว",
   "transaction.status.swap.canceling": "กำลังยกเลิกการแลกเปลี่ยน",
+  "transaction.status.swap.expired": "สวอปหมดอายุแล้ว",
   "transaction.status.swap.failed": "การแลกเปลี่ยนล้มเหลว",
+  "transaction.status.swap.insufficientFunds": "เงินทุนไม่เพียงพอ",
   "transaction.status.swap.pending": "การแลกเปลี่ยน",
   "transaction.status.swap.success": "สลับแล้ว",
   "transaction.status.swap.successDapp": "สลับไปที่ {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "เลื่อนลงเพื่อลงนาม",
   "walletConnect.request.button.sign": "เข้าสู่ระบบ",
   "walletConnect.request.details.label.function": "การทำงาน",
-  "walletConnect.request.details.label.recipient": "ถึง",
   "walletConnect.request.details.label.sending": "การส่ง",
   "walletConnect.request.error.insufficientFunds": "คุณมี {{currencySymbol}} ไม่เพียงพอที่จะทำธุรกรรมนี้ให้เสร็จสิ้น",
   "walletConnect.request.error.network": "ข้อผิดพลาดการเชื่อมต่ออินเทอร์เน็ตหรือเครือข่าย",
diff --git a/packages/uniswap/src/i18n/locales/translations/tr-TR.json b/packages/uniswap/src/i18n/locales/translations/tr-TR.json
index f2857c9a496..478151b06cc 100644
--- a/packages/uniswap/src/i18n/locales/translations/tr-TR.json
+++ b/packages/uniswap/src/i18n/locales/translations/tr-TR.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Tekrar deneyin",
   "common.button.understand": "Anladım",
   "common.button.view": "Görüş",
+  "common.button.yes": "Evet",
   "common.card.error.description": "Bir şeyler yanlış gitti",
   "common.card.error.title": "Hata! Bir şeyler yanlış gitti.",
   "common.endAdornment": "Ve",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Ayarlar",
   "common.navigation.systemSettings": "Ayarlar",
   "common.text.connected": "Bağlı",
+  "common.text.contract": "Sözleşme",
   "common.text.disconnected": "Bağlantı kesildi",
   "common.text.error": "Hata",
   "common.text.notAvailable": "Yok",
+  "common.text.recipient": "İle",
+  "common.text.sender": "İtibaren",
   "common.text.unknown": "Bilinmeyen",
   "currency.aud": "Avustralya Doları",
   "currency.brl": "Brezilya Reali",
@@ -171,17 +175,15 @@
   "currency.usd": "Amerikan Doları",
   "currency.vnd": "Vietnam Dongu",
   "dapp.request.approve.action": "Onaylamak",
-  "dapp.request.approve.fallbackTitle": "Harcama belirteçlerini onaylayın",
-  "dapp.request.approve.helptext": "Bu sitenin bu jetona erişmesine ve cüzdanınızdan harcama yapmasına izin verin.",
+  "dapp.request.approve.fallbackTitle": "Belirteçlere erişmek için bu siteyi onaylayın",
+  "dapp.request.approve.helptext": "Bu sitenin bu jetona erişmesine ve işlemler için harcamasına izin verin. Bu siteye güvendiğinizden emin olun.",
   "dapp.request.approve.label": "Cüzdan",
-  "dapp.request.approve.title": "Harcamayı onayla {{tokenSymbol}}",
+  "dapp.request.approve.title": "{{tokenSymbol}}erişimini onaylayın",
   "dapp.request.base.title": "İşlem isteği",
   "dapp.request.connect.helptext": "Bu sitenin cüzdan adresinizi, bakiyenizi görüntülemesine ve işlemler için onay istemesine izin verin.",
   "dapp.request.connect.title": "Siteye bağlan",
   "dapp.request.fallback.calldata.label": "İşlenmemiş veri",
   "dapp.request.fallback.function.label": "İşlev",
-  "dapp.request.fallback.recipient.label": "İle",
-  "dapp.request.fallback.sending.label": "Gönderiliyor",
   "dapp.request.permit2.description": "Permit2, birden fazla dapp genelinde token onaylarını yönetir.",
   "dapp.request.permit2.header": "İmza İzni2",
   "dapp.request.reject.action": "Tümünü reddet",
@@ -349,6 +351,13 @@
   "language.ukrainian": "Ukrayna",
   "language.urdu": "Urduca",
   "language.vietnamese": "Vietnam",
+  "mobile.appRating.button.decline": "Tam olarak değil",
+  "mobile.appRating.description": "Bu uygulamayla iyi bir deneyim yaşıyorsanız bize bildirin",
+  "mobile.appRating.feedback.button.cancel": "Belki sonra",
+  "mobile.appRating.feedback.button.send": "Geribildirim yolla",
+  "mobile.appRating.feedback.description": "Deneyiminizi nasıl geliştirebileceğimizi bize bildirin",
+  "mobile.appRating.feedback.title": "Bunu duyduğumuza üzüldük.",
+  "mobile.appRating.title": "Uniswap Cüzdan'ı beğeniyor musunuz?",
   "notification.assetVisibility.hidden": "{{assetName}} gizli",
   "notification.assetVisibility.unhidden": "{{assetName}} gizlenmemiş",
   "notification.copied.address": "Adres kopyalandı",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "{{address}}ile kullanım için {{currencySymbol}} onaylandı.",
   "notification.transaction.pending": "İşlem beklemede",
   "notification.transaction.swap.canceled": "{{inputCurrencySymbol}}{{outputCurrencySymbol}} iptal edildi.",
+  "notification.transaction.swap.expired": "{{outputCurrencyAmountWithSymbol}} için {{inputCurrencyAmountWithSymbol}} takasın süresi doldu.",
   "notification.transaction.swap.fail": "{{inputCurrencyAmountWithSymbol}} {{outputCurrencyAmountWithSymbol}}ile değiştirilemedi.",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} {{outputCurrencyAmountWithSymbol}}değiştirdik.",
   "notification.transaction.transfer.canceled": "{{tokenNameOrAddress}} gönderim iptal edildi.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Uniswap Uzantısına devam edin",
   "notifications.scantastic.title": "Başarı!",
   "onboarding.backup.manual.banner": "Bunu bir kağıda yazıp güvenli bir yerde veya güvenli bir şifre yöneticisinde saklamak en iyisidir.",
+  "onboarding.backup.manual.error": "Geçersiz veya yanlış yazılmış kelime",
   "onboarding.backup.manual.placeholder": "Gizli kelime",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} tamamlandı",
   "onboarding.backup.manual.selectedWordPlaceholder": "Kelime seç",
-  "onboarding.backup.manual.subtitle_one": "Kurtarma cümlenizdeki <highlight/>{{count}}st</highlight/> kelimesi nedir?",
-  "onboarding.backup.manual.subtitle_two": "Kurtarma cümlenizdeki <highlight/>{{count}}ve</highlight/> kelimesi nedir?",
-  "onboarding.backup.manual.subtitle_few": "Kurtarma cümlenizdeki <highlight/>{{count}}rd</highlight/> kelimesi nedir?",
-  "onboarding.backup.manual.subtitle_other": "Kurtarma cümlenizdeki <highlight/>{{count}}inci</highlight/> kelimesi nedir?",
+  "onboarding.backup.manual.subtitle_one": "Kurtarma cümlenizdeki {{count}}ilk kelime nedir?",
+  "onboarding.backup.manual.subtitle_two": "Kurtarma ifadenizdeki {{count}}. kelime nedir?",
+  "onboarding.backup.manual.subtitle_few": "Kurtarma ifadenizdeki {{count}}. kelime nedir?",
+  "onboarding.backup.manual.subtitle_other": "Kurtarma cümlenizdeki {{count}}'inci kelime nedir?",
   "onboarding.backup.manual.title": "Doğru kaydettiğinizden emin olalım",
   "onboarding.backup.option.cloud.description": "Kurtarma ifadenizi güvenli bir parolayla şifreleyin",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} yedekleme",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Yedeklemeler, uygulamayı silerseniz veya cihazınızı kaybederseniz cüzdanınızı geri yüklemenize olanak tanır",
   "onboarding.backup.title.existing": "Cüzdanınızı yedekleyin",
   "onboarding.backup.title.new": "Bir yedekleme yöntemi seçin",
-  "onboarding.backup.view.disclaimer": "Kurtarma ifademi kaybedersem Uniswap Labs'in onu geri yüklememe yardımcı olamayacağını anlıyorum",
+  "onboarding.backup.view.disclaimer": "Kurtarma ifademi kaybedersem Uniswap Labs'in onu geri yüklememe yardımcı olamayacağını anlıyorum.",
   "onboarding.backup.view.subtitle.message1": "Devam etmeden önce aşağıdakileri dikkatlice okuyun",
   "onboarding.backup.view.subtitle.message2": "Cüzdanınızı kurtarmak için bu gizli kelimelerin 12'sini de girmeniz gerekecek.",
   "onboarding.backup.view.title": "Kurtarma ifadenizi yazın",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Uniswap Uzantısını araç çubuğunuza eklemek için raptiye simgesine tıklayın.",
   "onboarding.complete.pin.title": "Uniswap Uzantısını Pinle",
   "onboarding.complete.title": "Hazırsınız",
-  "onboarding.extension.connectMobile.button": "Telefonunuzdan içe aktarın",
-  "onboarding.extension.connectMobile.title": "Uniswap mobil uygulamasına sahip misiniz?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Kullanıcı adı talep etmek için mobil uygulamayı indirin",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Beta bekleme listesine girin",
   "onboarding.extension.password.subtitle": "Cüzdanınızın kilidini açmak ve kurtarma ifadenize erişmek için buna ihtiyacınız olacak",
   "onboarding.extension.password.title.default": "Şifre oluştur",
   "onboarding.extension.password.title.reset": "Şifrenizi sıfırlayın",
+  "onboarding.extension.unsupported.description": "Uniswap Uzantısı şu anda yalnızca Chrome ile uyumludur.",
+  "onboarding.extension.unsupported.title": "Bu tarayıcı desteklenmiyor (henüz)",
   "onboarding.import.error.invalidWords_one": "1 kelime geçersiz veya yanlış yazılmış",
   "onboarding.import.error.invalidWords_other": "{{count}} kelimeler geçersiz veya yanlış yazılmış",
   "onboarding.import.method.import.message": "Başka bir kripto cüzdanından kurtarma ifadenizi girin",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "12 kelimelik kurtarma ifadenizi yazın veya yapıştırın",
   "onboarding.importMnemonic.title": "Kurtarma ifadenizi girin",
   "onboarding.intro.button.alreadyHave": "Zaten bir cüzdanım var",
-  "onboarding.intro.title": "\nUniswap Cüzdan'a hoş geldiniz",
+  "onboarding.intro.mobileScan.button": "İçe aktarmak için QR kodunu tarayın",
+  "onboarding.intro.mobileScan.title": "Uniswap uygulamanız var mı?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Uygunluğu kontrol edin",
   "onboarding.introBetaWaitlist.button.letsGo": "Hadi gidelim",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Beta için uygun olup olmadığınızı kontrol etmek için aşağıya <highlight>uni.eth</highlight> kullanıcı adınızı girin.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Hala bekleme listesindesin. Uygun olduğunuzda sizi Uniswap mobil uygulamasında bilgilendireceğiz!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "Kullanıcı adı",
   "onboarding.landing.button.add": "Mevcut bir cüzdanı ekleyin",
-  "onboarding.landing.button.create": "Yeni bir cüzdan oluştur",
+  "onboarding.landing.button.create": "Cüzdan oluştur",
   "onboarding.notification.permission.message": "Bildirim almak için cihazınızın ayarlarında Uniswap Cüzdan bildirimlerini açın.",
   "onboarding.notification.permission.title": "Bildirim izni",
   "onboarding.notification.subtitle": "Transferleriniz, takaslarınız ve onaylarınız tamamlandığında bildirim alın.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Bunu salt görüntülenebilir bir cüzdan olarak kullanıyorsunuz",
   "send.recipientSelect.search.empty.message": "Tokenları bir cüzdan adresine gönderdiğinizde burada görünürler",
   "send.recipientSelect.search.empty.title": "Kaydedilmiş cüzdan yok",
-  "send.recipientSelect.title": "İle",
   "send.review.modal.title": "gönderiyorsun",
   "send.review.summary.button.title": "Göndermeyi onayla",
   "send.review.summary.sending": "Gönderiliyor",
-  "send.review.summary.to": "İle",
   "send.search.empty.subtitle": "Yazdığınız adres ya mevcut değil ya da yanlış yazılmış.",
   "send.search.empty.title": "Sonuç bulunamadı",
   "send.search.placeholder": "ENS veya adresi arayın",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Bu cüzdan salt görüntülenebilir",
   "setting.recoveryPhrase.account.show": "Kurtarma ifadesini göster",
   "setting.recoveryPhrase.action.hide": "Kurtarma ifadesini gizle",
-  "setting.recoveryPhrase.remove.button": "Kurtarma ifadesini kaldır",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Bunu başaramazsam Uniswap Labs'ın cüzdanımı kurtarmama yardım edemeyeceğini biliyorum",
+  "setting.recoveryPhrase.remove": "Kurtarma ifadesini kaldır",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Bunu başaramazsam Uniswap Labs'ın cüzdanımı kurtarmama yardım edemeyeceğini biliyorum.",
   "setting.recoveryPhrase.remove.confirm.title": "Kurtarma ifademi kaydettim",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Kurtarma ifadenizi kaydettiğinizden emin olun. Aksi takdirde fonlarınıza erişiminizi kaybedeceksiniz",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Kurtarma ifadenizi kaydettiğinizden emin olun. Aksi takdirde cüzdanlarınıza erişiminizi kaybedeceksiniz",
   "setting.recoveryPhrase.remove.initial.title": "Devam etmeden önce",
   "setting.recoveryPhrase.remove.password.error": "Yanlış şifre. Tekrar deneyin",
-  "setting.recoveryPhrase.remove.password.input": "Parolanı Gir",
-  "setting.recoveryPhrase.remove.subtitle": "Devam etmek için şifrenizi girin",
+  "setting.recoveryPhrase.remove.subtitle": "Onaylamak için şifrenizi girin",
   "setting.recoveryPhrase.remove.title": "Kurtarma ifadenizi kaldırıyorsunuz",
-  "setting.recoveryPhrase.view.error": "Yanlış şifre, tekrar deneyin",
   "setting.recoveryPhrase.view.warning.message1": "Kurtarma ifadenizi bilen herkes cüzdanınıza ve paranıza erişebilir",
   "setting.recoveryPhrase.view.warning.message2": "Bunu özel olarak görüntüle",
-  "setting.recoveryPhrase.view.warning.message3": "Bunu kimseyle paylaşmayın",
-  "setting.recoveryPhrase.view.warning.message4": "Hiçbir web sitesine veya uygulamaya asla girmeyin",
+  "setting.recoveryPhrase.view.warning.message3": "Kimseyle paylaşmayın",
+  "setting.recoveryPhrase.view.warning.message4": "Asla herhangi bir web sitesine veya uygulamaya girmeyin",
   "setting.recoveryPhrase.view.warning.title": "Devam etmeden önce",
   "setting.recoveryPhrase.warning.screenshot.message": "Fotoğraflarınıza erişim sağlayan herkes cüzdanınıza erişebilir. Bunun yerine kelimelerinizi yazmanızı öneririz.",
   "setting.recoveryPhrase.warning.screenshot.title": "Ekran görüntüleri güvenli değil",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Daha az görüntüle",
   "settings.section.wallet.label.viewOnly": "Sadece Görüntüle",
   "settings.section.wallet.title": "Cüzdan ayarları",
-  "settings.setting.appearance.option.auto": "Oto",
   "settings.setting.appearance.option.dark.subtitle": "Her zaman karanlık modu kullan",
   "settings.setting.appearance.option.dark.title": "Karanlık mod",
   "settings.setting.appearance.option.device.subtitle": "Cihazınızın görünümünü varsayılan olarak ayarlayın",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Uniswap Labs ürünlerindeki deneyiminizi geliştirmek için anonim kullanım verilerini kullanıyoruz. Devre dışı bırakıldığında yalnızca hataları ve temel kullanımı izleriz.",
   "settings.setting.privacy.analytics.title": "Analitiklere izin ver",
   "settings.setting.privacy.title": "Mahremiyet",
-  "settings.setting.recoveryPhrase.remove": "Kurtarma ifadesini kaldır",
+  "settings.setting.recoveryPhrase.password.title": "Şifrenizi girin",
   "settings.setting.recoveryPhrase.title": "Kurtarma ifadesi",
-  "settings.setting.recoveryPhrase.view": "Kurtarma ifadesini görüntüle",
   "settings.setting.smallBalances.title": "Küçük bakiyeleri gizle",
-  "settings.setting.theme.title": "Tema",
   "settings.setting.unknownTokens.title": "Bilinmeyen belirteçleri gizle",
   "settings.setting.wallet.action.editLabel": "Etiketi düzenle",
   "settings.setting.wallet.action.editProfile": "Profili Düzenle",
@@ -729,6 +734,8 @@
   "settings.version": "Sürüm {{appVersion}}",
   "swap.button.max": "Maksimum",
   "swap.button.review": "Gözden geçirmek",
+  "swap.button.submitting": "Takas gönderiliyor...",
+  "swap.button.submitting.keep.open": "Cüzdanınızı açık tutun...",
   "swap.button.swap": "Takas",
   "swap.button.unwrap": "Paketi aç",
   "swap.button.view": "İşlemi görüntüle",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Çevrimdışısınız",
   "swap.warning.priceImpact.message": "Şu anda mevcut olan {{outputCurrencySymbol}} likidite miktarı nedeniyle, ne kadar çok {{inputCurrencySymbol}} takas etmeye çalışırsanız, o kadar az {{outputCurrencySymbol}} alırsınız.",
   "swap.warning.priceImpact.title": "Yüksek fiyat etkisi ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Uygulamayı kapattığınız için işleminiz gönderilemedi.",
+  "swap.warning.queuedOrder.approvalFailed": "Belirteç onayı başarısız olduğundan işleminiz gönderilemedi.",
+  "swap.warning.queuedOrder.stale": "Uygulamayı kapattığınız veya onayın çok uzun sürdüğü için işleminiz gönderilemedi.",
+  "swap.warning.queuedOrder.submissionFailed": "İşleminiz gönderilirken bir sorun oluştu.",
+  "swap.warning.queuedOrder.title": "Değiştirme iptal edildi",
+  "swap.warning.queuedOrder.wrap.message": "ETH'niz WETH olarak sarılı kalacaktır.",
+  "swap.warning.queuedOrder.wrapFailed": "Sarma işlemi başarısız olduğundan işleminiz gönderilemedi.",
   "swap.warning.rateLimit.message": "Lütfen birkaç dakika içinde tekrar deneyin.",
   "swap.warning.rateLimit.title": "Hız limiti aşıldı",
   "swap.warning.router.message": "Bağlantınızı kaybetmiş olabilirsiniz veya ağınız kapalı olabilir. Sorun devam ederse lütfen daha sonra tekrar deneyin.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Diğer ağlardaki bakiyeler",
   "token.balances.viewOnly": "{{ownerAddress}}bakiyesi",
   "token.error.unknown": "Bilinmeyen jeton",
-  "token.links.contract": "Sözleşme",
   "token.links.title": "Bağlantılar",
   "token.links.twitter": "heyecan",
   "token.links.website": "İnternet sitesi",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Jetonu Gizle",
   "tokens.action.unhide": "Jetonu Göster",
   "tokens.hidden.label": "Gizli ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "{{blockExplorerName}}tarihinde görüntüle",
   "tokens.nfts.collection.error.load.title": "NFT koleksiyonu yüklenemedi",
   "tokens.nfts.collection.label.items": "Öğeler",
   "tokens.nfts.collection.label.owners": "Sahipler",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Sınırsız",
   "transaction.currency.unknown": "bilinmeyen jeton",
   "transaction.date": "{{date}}tarihinde gönderildi",
+  "transaction.details.dappName": "Uygulama",
+  "transaction.details.from": "İtibaren",
   "transaction.details.networkFee": "Ağ maliyeti",
   "transaction.details.transactionId": "İşlem Kimliği",
   "transaction.network.all": "Tüm ağlar",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "{{externalDappName}}tarihinde gönderildi",
   "transaction.status.swap.canceled": "Takas iptal edildi",
   "transaction.status.swap.canceling": "Takasın iptal edilmesi",
+  "transaction.status.swap.expired": "Takasın süresi doldu",
   "transaction.status.swap.failed": "Değiştirilemedi",
+  "transaction.status.swap.insufficientFunds": "Yetersiz bakiye",
   "transaction.status.swap.pending": "Değiştirme",
   "transaction.status.swap.success": "Değiştirildi",
   "transaction.status.swap.successDapp": "{{externalDappName}}tarihinde değiştirildi",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "İmzalamak için aşağı kaydırın",
   "walletConnect.request.button.sign": "İmza",
   "walletConnect.request.details.label.function": "İşlev",
-  "walletConnect.request.details.label.recipient": "İle",
   "walletConnect.request.details.label.sending": "Gönderiliyor",
   "walletConnect.request.error.insufficientFunds": "Bu işlemi tamamlamak için yeterli {{currencySymbol}} yok.",
   "walletConnect.request.error.network": "İnternet veya ağ bağlantısı hatası",
diff --git a/packages/uniswap/src/i18n/locales/translations/uk-UA.json b/packages/uniswap/src/i18n/locales/translations/uk-UA.json
index a1c1a154953..8219e4be109 100644
--- a/packages/uniswap/src/i18n/locales/translations/uk-UA.json
+++ b/packages/uniswap/src/i18n/locales/translations/uk-UA.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Спробуйте знову",
   "common.button.understand": "Я розумію",
   "common.button.view": "Переглянути",
+  "common.button.yes": "Так",
   "common.card.error.description": "Щось пішло не так",
   "common.card.error.title": "Ой! Щось пішло не так.",
   "common.endAdornment": "і",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Налаштування",
   "common.navigation.systemSettings": "Налаштування",
   "common.text.connected": "Підключено",
+  "common.text.contract": "Договір",
   "common.text.disconnected": "Відключено",
   "common.text.error": "Помилка",
   "common.text.notAvailable": "N/A",
+  "common.text.recipient": "до",
+  "common.text.sender": "Від",
   "common.text.unknown": "Невідомий",
   "currency.aud": "Австралійський долар",
   "currency.brl": "бразильський реал",
@@ -171,17 +175,15 @@
   "currency.usd": "Долар США",
   "currency.vnd": "В'єтнамський донг",
   "dapp.request.approve.action": "Затвердити",
-  "dapp.request.approve.fallbackTitle": "Затвердити маркери витрат",
-  "dapp.request.approve.helptext": "Дозвольте цьому сайту отримати доступ і витратити цей маркер із вашого гаманця.",
+  "dapp.request.approve.fallbackTitle": "Схвалити цей сайт для доступу до маркерів",
+  "dapp.request.approve.helptext": "Дозвольте цьому сайту отримувати доступ і витрачати цей маркер на транзакції. Переконайтеся, що ви довіряєте цьому сайту.",
   "dapp.request.approve.label": "Гаманець",
-  "dapp.request.approve.title": "Затвердити витрати {{tokenSymbol}}",
+  "dapp.request.approve.title": "Схвалити доступ до {{tokenSymbol}}",
   "dapp.request.base.title": "Запит на транзакцію",
   "dapp.request.connect.helptext": "Дозвольте цьому сайту переглядати адресу вашого гаманця, баланс і запитувати схвалення транзакцій.",
   "dapp.request.connect.title": "Підключитися до сайту",
   "dapp.request.fallback.calldata.label": "Необроблені дані",
   "dapp.request.fallback.function.label": "функція",
-  "dapp.request.fallback.recipient.label": "до",
-  "dapp.request.fallback.sending.label": "Відправка",
   "dapp.request.permit2.description": "Permit2 керує схваленням токенів у кількох прикладних програмах.",
   "dapp.request.permit2.header": "Підписати дозвіл 2",
   "dapp.request.reject.action": "Відкинути всі",
@@ -349,6 +351,13 @@
   "language.ukrainian": "українська",
   "language.urdu": "урду",
   "language.vietnamese": "в'єтнамська",
+  "mobile.appRating.button.decline": "Не зовсім",
+  "mobile.appRating.description": "Повідомте нас, якщо вам подобається цей додаток",
+  "mobile.appRating.feedback.button.cancel": "Можливо пізніше",
+  "mobile.appRating.feedback.button.send": "Надіслати відгук",
+  "mobile.appRating.feedback.description": "Повідомте нам, як ми можемо покращити ваш досвід",
+  "mobile.appRating.feedback.title": "Нам прикро це чути.",
+  "mobile.appRating.title": "Подобається гаманець Uniswap?",
   "notification.assetVisibility.hidden": "{{assetName}} приховано",
   "notification.assetVisibility.unhidden": "{{assetName}} відкритих",
   "notification.copied.address": "Адресу скопійовано",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Схвалено {{currencySymbol}} для використання з {{address}}.",
   "notification.transaction.pending": "Трансакція очікує на розгляд",
   "notification.transaction.swap.canceled": "Скасовано обмін {{inputCurrencySymbol}}-{{outputCurrencySymbol}}.",
+  "notification.transaction.swap.expired": "Термін дії обміну {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}} минув.",
   "notification.transaction.swap.fail": "Не вдалося поміняти {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Поміняно {{inputCurrencyAmountWithSymbol}} на {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Скасовано {{tokenNameOrAddress}} відправок.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Продовжте використовувати розширення Uniswap",
   "notifications.scantastic.title": "Успіх!",
   "onboarding.backup.manual.banner": "Найкраще написати це на аркуші паперу та зберігати в безпечному місці або в безпечному менеджері паролів.",
+  "onboarding.backup.manual.error": "Недійсне або неправильно написане слово",
   "onboarding.backup.manual.placeholder": "Таємне слово",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "Виберіть слово",
-  "onboarding.backup.manual.subtitle_one": "Яке <highlight/>{{count}}st</highlight/> слово у вашій фразі відновлення?",
-  "onboarding.backup.manual.subtitle_two": "Яке <highlight/>{{count}}і</highlight/> слово у вашій фразі відновлення?",
-  "onboarding.backup.manual.subtitle_few": "Яке <highlight/>{{count}}rd</highlight/> слово у вашій фразі відновлення?",
-  "onboarding.backup.manual.subtitle_other": "Яке <highlight/>{{count}}й</highlight/> слово у вашій фразі відновлення?",
+  "onboarding.backup.manual.subtitle_one": "Яке {{count}}перше слово у вашій фразі відновлення?",
+  "onboarding.backup.manual.subtitle_two": "Яке {{count}}друге слово у вашій фразі відновлення?",
+  "onboarding.backup.manual.subtitle_few": "Яке {{count}}третє слово у вашій фразі відновлення?",
+  "onboarding.backup.manual.subtitle_other": "Яке {{count}}слово у вашій фразі відновлення?",
   "onboarding.backup.manual.title": "Давайте переконаємося, що ви записали його правильно",
   "onboarding.backup.option.cloud.description": "Зашифруйте свою фразу відновлення безпечним паролем",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} резервна копія",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Резервні копії дозволяють відновити гаманець, якщо ви видалите програму або втратите пристрій",
   "onboarding.backup.title.existing": "Зробіть резервну копію свого гаманця",
   "onboarding.backup.title.new": "Виберіть метод резервного копіювання",
-  "onboarding.backup.view.disclaimer": "Я розумію, що якщо я втрачу свою фразу відновлення, Uniswap Labs не зможе допомогти мені її відновити",
+  "onboarding.backup.view.disclaimer": "Я розумію, що якщо я втрачу свою фразу відновлення, Uniswap Labs не зможе допомогти мені її відновити.",
   "onboarding.backup.view.subtitle.message1": "Перш ніж продовжити, уважно прочитайте наступне",
   "onboarding.backup.view.subtitle.message2": "Вам потрібно буде ввести всі 12 цих секретних слів, щоб відновити свій гаманець.",
   "onboarding.backup.view.title": "Запишіть фразу відновлення",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Натисніть значок шпильки, щоб додати розширення Uniswap на панель інструментів.",
   "onboarding.complete.pin.title": "Pin Uniswap Extension",
   "onboarding.complete.title": "Ви готові",
-  "onboarding.extension.connectMobile.button": "Імпортуйте з телефону",
-  "onboarding.extension.connectMobile.title": "Маєте мобільний додаток Uniswap?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Завантажте мобільний додаток, щоб отримати ім’я користувача",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Запишіться в список очікування бета-версії",
   "onboarding.extension.password.subtitle": "Це знадобиться, щоб розблокувати гаманець і отримати доступ до фрази відновлення",
   "onboarding.extension.password.title.default": "Створити пароль",
   "onboarding.extension.password.title.reset": "Скинути пароль",
+  "onboarding.extension.unsupported.description": "Розширення Uniswap зараз сумісне лише з Chrome.",
+  "onboarding.extension.unsupported.title": "Цей браузер (поки що) не підтримується",
   "onboarding.import.error.invalidWords_one": "1 слово недійсне або написане з помилкою",
   "onboarding.import.error.invalidWords_other": "{{count}} слова недійсні або написані з помилками",
   "onboarding.import.method.import.message": "Введіть фразу відновлення з іншого криптогаманця",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Введіть або вставте фразу відновлення з 12 слів",
   "onboarding.importMnemonic.title": "Введіть фразу відновлення",
   "onboarding.intro.button.alreadyHave": "У мене вже є гаманець",
-  "onboarding.intro.title": "Ласкаво просимо до \nUniswap Wallet",
+  "onboarding.intro.mobileScan.button": "Відскануйте QR-код, щоб імпортувати",
+  "onboarding.intro.mobileScan.title": "У вас є програма Uniswap?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Перевірте відповідність вимогам",
   "onboarding.introBetaWaitlist.button.letsGo": "Ходімо",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Введіть нижче своє ім’я користувача <highlight>uni.eth</highlight> , щоб перевірити, чи маєте ви право на бета-версію.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Ви все ще в списку очікування. Ми повідомимо вас у мобільному додатку Uniswap, коли ви отримаєте право!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "ім'я користувача",
   "onboarding.landing.button.add": "Додайте наявний гаманець",
-  "onboarding.landing.button.create": "Створіть новий гаманець",
+  "onboarding.landing.button.create": "Створіть гаманець",
   "onboarding.notification.permission.message": "Щоб отримувати сповіщення, увімкніть сповіщення для Uniswap Wallet у налаштуваннях свого пристрою.",
   "onboarding.notification.permission.title": "Дозвіл на сповіщення",
   "onboarding.notification.subtitle": "Отримуйте сповіщення, коли ваші передачі, обміни та затвердження завершаться.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Ви маєте це як гаманець лише для перегляду",
   "send.recipientSelect.search.empty.message": "Коли ви надсилаєте токени на адресу гаманця, вони відображатимуться тут",
   "send.recipientSelect.search.empty.title": "Гаманці не збережено",
-  "send.recipientSelect.title": "до",
   "send.review.modal.title": "Ви надсилаєте",
   "send.review.summary.button.title": "Підтвердити відправку",
   "send.review.summary.sending": "Відправка",
-  "send.review.summary.to": "до",
   "send.search.empty.subtitle": "Адреса, яку ви ввели, або не існує, або написана неправильно.",
   "send.search.empty.title": "Нічого не знайдено",
   "send.search.placeholder": "Шукайте ENS або адресу",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "Цей гаманець доступний лише для перегляду",
   "setting.recoveryPhrase.account.show": "Показати фразу відновлення",
   "setting.recoveryPhrase.action.hide": "Приховати фразу відновлення",
-  "setting.recoveryPhrase.remove.button": "Видалити фразу відновлення",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Я розумію, що Uniswap Labs не зможе допомогти мені відновити мій гаманець, якщо я цього не зроблю",
+  "setting.recoveryPhrase.remove": "Видалити фразу відновлення",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Я розумію, що Uniswap Labs не зможе допомогти мені відновити мій гаманець, якщо я цього не зроблю.",
   "setting.recoveryPhrase.remove.confirm.title": "Я зберіг фразу відновлення",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Переконайтеся, що ви зберегли фразу відновлення. В іншому випадку ви втратите доступ до своїх коштів",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Переконайтеся, що ви зберегли фразу відновлення. Інакше ви втратите доступ до своїх гаманців",
   "setting.recoveryPhrase.remove.initial.title": "Перш ніж продовжити",
   "setting.recoveryPhrase.remove.password.error": "Неправильний пароль. Спробуйте знову",
-  "setting.recoveryPhrase.remove.password.input": "Введіть пароль",
-  "setting.recoveryPhrase.remove.subtitle": "Введіть свій пароль, щоб продовжити",
+  "setting.recoveryPhrase.remove.subtitle": "Введіть пароль для підтвердження",
   "setting.recoveryPhrase.remove.title": "Ви видаляєте свою фразу відновлення",
-  "setting.recoveryPhrase.view.error": "Неправильний пароль, спробуйте ще раз",
   "setting.recoveryPhrase.view.warning.message1": "Кожен, хто знає вашу фразу відновлення, може отримати доступ до вашого гаманця та коштів",
   "setting.recoveryPhrase.view.warning.message2": "Перегляньте це приватно",
-  "setting.recoveryPhrase.view.warning.message3": "Нікому не діліться цим",
-  "setting.recoveryPhrase.view.warning.message4": "Ніколи не вводьте його на будь-які веб-сайти чи додатки",
+  "setting.recoveryPhrase.view.warning.message3": "Ні з ким не діліться",
+  "setting.recoveryPhrase.view.warning.message4": "Ніколи не вводьте його на будь-які веб-сайти чи програми",
   "setting.recoveryPhrase.view.warning.title": "Перш ніж продовжити",
   "setting.recoveryPhrase.warning.screenshot.message": "Кожен, хто отримує доступ до ваших фотографій, може отримати доступ до вашого гаманця. Радимо замість цього записати свої слова.",
   "setting.recoveryPhrase.warning.screenshot.title": "Скріншоти незахищені",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Переглянути менше",
   "settings.section.wallet.label.viewOnly": "Лише перегляд",
   "settings.section.wallet.title": "Налаштування гаманця",
-  "settings.setting.appearance.option.auto": "Авто",
   "settings.setting.appearance.option.dark.subtitle": "Завжди використовуйте темний режим",
   "settings.setting.appearance.option.dark.title": "Темний режим",
   "settings.setting.appearance.option.device.subtitle": "За замовчуванням зовнішній вигляд вашого пристрою",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Ми використовуємо анонімні дані про використання, щоб покращити ваш досвід використання продуктів Uniswap Labs. Якщо вимкнено, ми відстежуємо лише помилки та важливі використання.",
   "settings.setting.privacy.analytics.title": "Дозволити аналітику",
   "settings.setting.privacy.title": "Конфіденційність",
-  "settings.setting.recoveryPhrase.remove": "Видалити фразу відновлення",
+  "settings.setting.recoveryPhrase.password.title": "Введіть ваш пароль",
   "settings.setting.recoveryPhrase.title": "Фраза відновлення",
-  "settings.setting.recoveryPhrase.view": "Переглянути фразу відновлення",
   "settings.setting.smallBalances.title": "Приховайте невеликі залишки",
-  "settings.setting.theme.title": "Тема",
   "settings.setting.unknownTokens.title": "Приховати невідомі маркери",
   "settings.setting.wallet.action.editLabel": "Редагувати мітку",
   "settings.setting.wallet.action.editProfile": "Редагувати профіль",
@@ -729,6 +734,8 @@
   "settings.version": "Версія {{appVersion}}",
   "swap.button.max": "Макс",
   "swap.button.review": "огляд",
+  "swap.button.submitting": "Надсилання обміну...",
+  "swap.button.submitting.keep.open": "Тримайте гаманець відкритим...",
   "swap.button.swap": "Обмін",
   "swap.button.unwrap": "Розгорніть",
   "swap.button.view": "Переглянути транзакцію",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Ви офлайн",
   "swap.warning.priceImpact.message": "Через обсяг {{outputCurrencySymbol}} ліквідності, який зараз доступний, чим більше {{inputCurrencySymbol}} ви спробуєте обміняти, тим менше {{outputCurrencySymbol}} ви отримаєте.",
   "swap.warning.priceImpact.title": "Високий вплив на ціну ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Вашу трансакцію не надіслано, оскільки ви закрили програму.",
+  "swap.warning.queuedOrder.approvalFailed": "Вашу транзакцію не надіслано, оскільки не вдалося схвалити маркер.",
+  "swap.warning.queuedOrder.stale": "Вашу трансакцію не було надіслано, оскільки ви закрили програму або затвердження тривало занадто довго.",
+  "swap.warning.queuedOrder.submissionFailed": "Під час надсилання транзакції виникла проблема.",
+  "swap.warning.queuedOrder.title": "Обмін скасовано",
+  "swap.warning.queuedOrder.wrap.message": "Ваш ETH залишиться загорнутим як WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Вашу трансакцію не було надіслано, оскільки не вдалося згорнути транзакцію.",
   "swap.warning.rateLimit.message": "Повторіть спробу через кілька хвилин.",
   "swap.warning.rateLimit.title": "Ліміт швидкості перевищено",
   "swap.warning.router.message": "Можливо, ви втратили з’єднання або мережа не працює. Якщо проблема не зникає, спробуйте пізніше.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Залишки в інших мережах",
   "token.balances.viewOnly": "{{ownerAddress}}балансу",
   "token.error.unknown": "Невідомий маркер",
-  "token.links.contract": "Договір",
   "token.links.title": "Посилання",
   "token.links.twitter": "Twitter",
   "token.links.website": "Веб-сайт",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Приховати маркер",
   "tokens.action.unhide": "Показати маркер",
   "tokens.hidden.label": "Приховано ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Переглянути на {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Не вдалося завантажити колекцію NFT",
   "tokens.nfts.collection.label.items": "Предмети",
   "tokens.nfts.collection.label.owners": "Власники",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Необмежений",
   "transaction.currency.unknown": "невідомий маркер",
   "transaction.date": "Надіслано {{date}}",
+  "transaction.details.dappName": "додаток",
+  "transaction.details.from": "Від",
   "transaction.details.networkFee": "Вартість мережі",
   "transaction.details.transactionId": "ID транзакції",
   "transaction.network.all": "Всі мережі",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Надіслано {{externalDappName}}",
   "transaction.status.swap.canceled": "Скасований обмін",
   "transaction.status.swap.canceling": "Скасування обміну",
+  "transaction.status.swap.expired": "Термін обміну минув",
   "transaction.status.swap.failed": "Не вдалося поміняти",
+  "transaction.status.swap.insufficientFunds": "Недостатньо коштів",
   "transaction.status.swap.pending": "Обмін",
   "transaction.status.swap.success": "Поміняно місцями",
   "transaction.status.swap.successDapp": "Поміняно на {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Прокрутіть вниз, щоб підписати",
   "walletConnect.request.button.sign": "Знак",
   "walletConnect.request.details.label.function": "функція",
-  "walletConnect.request.details.label.recipient": "до",
   "walletConnect.request.details.label.sending": "Відправка",
   "walletConnect.request.error.insufficientFunds": "У вас недостатньо {{currencySymbol}} , щоб завершити цю трансакцію.",
   "walletConnect.request.error.network": "Помилка підключення до Інтернету або мережі",
diff --git a/packages/uniswap/src/i18n/locales/translations/ur-PK.json b/packages/uniswap/src/i18n/locales/translations/ur-PK.json
index 168ad3ba76a..5d9c0a3ea82 100644
--- a/packages/uniswap/src/i18n/locales/translations/ur-PK.json
+++ b/packages/uniswap/src/i18n/locales/translations/ur-PK.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "دوبارہ کوشش کریں",
   "common.button.understand": "میں سمجھتا ہوں۔",
   "common.button.view": "دیکھیں",
+  "common.button.yes": "جی ہاں",
   "common.card.error.description": "کچھ غلط ہو گیا",
   "common.card.error.title": "افوہ! کچھ غلط ہو گیا.",
   "common.endAdornment": "اور",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "ترتیبات",
   "common.navigation.systemSettings": "ترتیبات",
   "common.text.connected": "جڑا ہوا",
+  "common.text.contract": "معاہدہ",
   "common.text.disconnected": "منقطع",
   "common.text.error": "خرابی",
   "common.text.notAvailable": "N / A",
+  "common.text.recipient": "کو",
+  "common.text.sender": "سے",
   "common.text.unknown": "نامعلوم",
   "currency.aud": "آسٹریلوی ڈالر",
   "currency.brl": "برازیلین ریال",
@@ -171,17 +175,15 @@
   "currency.usd": "امریکی ڈالر",
   "currency.vnd": "ویتنامی ڈونگ",
   "dapp.request.approve.action": "منظور کرو",
-  "dapp.request.approve.fallbackTitle": "اخراجات کے ٹوکن کو منظور کریں۔",
-  "dapp.request.approve.helptext": "اس سائٹ کو اپنے بٹوے سے اس ٹوکن تک رسائی اور خرچ کرنے کی اجازت دیں۔",
+  "dapp.request.approve.fallbackTitle": "ٹوکن تک رسائی کے لیے اس سائٹ کو منظور کریں۔",
+  "dapp.request.approve.helptext": "اس سائٹ کو لین دین کے لیے اس ٹوکن تک رسائی اور خرچ کرنے کی اجازت دیں۔ یقینی بنائیں کہ آپ اس سائٹ پر بھروسہ کرتے ہیں۔",
   "dapp.request.approve.label": "پرس",
-  "dapp.request.approve.title": "{{tokenSymbol}}خرچ کی منظوری دیں۔",
+  "dapp.request.approve.title": "{{tokenSymbol}}تک رسائی کی منظوری دیں۔",
   "dapp.request.base.title": "لین دین کی درخواست",
   "dapp.request.connect.helptext": "اس سائٹ کو آپ کے بٹوے کا پتہ، بیلنس دیکھنے اور لین دین کے لیے منظوری کی درخواست کرنے کی اجازت دیں۔",
   "dapp.request.connect.title": "سائٹ سے جڑیں۔",
   "dapp.request.fallback.calldata.label": "خام ڈیٹا",
   "dapp.request.fallback.function.label": "فنکشن",
-  "dapp.request.fallback.recipient.label": "کو",
-  "dapp.request.fallback.sending.label": "بھیج رہا ہے۔",
   "dapp.request.permit2.description": "Permit2 متعدد ڈیپ میں ٹوکن منظوریوں کا انتظام کرتا ہے۔",
   "dapp.request.permit2.header": "پرمٹ 2 پر دستخط کریں۔",
   "dapp.request.reject.action": "سب کو مسترد کریں۔",
@@ -349,6 +351,13 @@
   "language.ukrainian": "یوکرینی",
   "language.urdu": "اردو",
   "language.vietnamese": "ویتنامی",
+  "mobile.appRating.button.decline": "واقعی نہیں۔",
+  "mobile.appRating.description": "ہمیں بتائیں کہ کیا آپ کو اس ایپ کے ساتھ اچھا تجربہ ہے۔",
+  "mobile.appRating.feedback.button.cancel": "شاید بعد میں",
+  "mobile.appRating.feedback.button.send": "رائے بھیجیں",
+  "mobile.appRating.feedback.description": "ہمیں بتائیں کہ ہم آپ کے تجربے کو کیسے بہتر بنا سکتے ہیں۔",
+  "mobile.appRating.feedback.title": "ہمیں یہ سن کر افسوس ہوا۔",
+  "mobile.appRating.title": "Unswap والیٹ سے لطف اندوز ہو رہے ہیں؟",
   "notification.assetVisibility.hidden": "{{assetName}} پوشیدہ",
   "notification.assetVisibility.unhidden": "{{assetName}} چھپا ہوا ہے۔",
   "notification.copied.address": "پتہ کاپی ہو گیا۔",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "{{address}}کے ساتھ استعمال کے لیے {{currencySymbol}} کی منظوری دی گئی۔",
   "notification.transaction.pending": "لین دین زیر التواء ہے۔",
   "notification.transaction.swap.canceled": "{{inputCurrencySymbol}}-{{outputCurrencySymbol}} تبادلہ منسوخ کر دیا گیا۔",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} برائے {{outputCurrencyAmountWithSymbol}} سویپ کی میعاد ختم ہو گئی۔",
   "notification.transaction.swap.fail": "{{outputCurrencyAmountWithSymbol}}کے لیے {{inputCurrencyAmountWithSymbol}} تبدیل کرنے میں ناکام۔",
   "notification.transaction.swap.success": "{{outputCurrencyAmountWithSymbol}}کے بدلے {{inputCurrencyAmountWithSymbol}} تبدیل کیا۔",
   "notification.transaction.transfer.canceled": "{{tokenNameOrAddress}} بھیجنا منسوخ کر دیا گیا۔",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "یونی سویپ ایکسٹینشن پر جاری رکھیں",
   "notifications.scantastic.title": "کامیابی!",
   "onboarding.backup.manual.banner": "اسے کاغذ کے ٹکڑے پر لکھنا اور اسے کسی محفوظ جگہ یا محفوظ پاس ورڈ مینیجر میں محفوظ کرنا بہتر ہے۔",
+  "onboarding.backup.manual.error": "غلط یا غلط ہجے والا لفظ",
   "onboarding.backup.manual.placeholder": "خفیہ لفظ",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}مکمل ہوا{{totalStepsCount}}",
   "onboarding.backup.manual.selectedWordPlaceholder": "لفظ منتخب کریں۔",
-  "onboarding.backup.manual.subtitle_one": "آپ کے بازیافت کے فقرے میں <highlight/>{{count}}st</highlight/> لفظ کیا ہے؟",
-  "onboarding.backup.manual.subtitle_two": "آپ کے بازیافت کے فقرے میں <highlight/>{{count}}nd</highlight/> لفظ کیا ہے؟",
-  "onboarding.backup.manual.subtitle_few": "آپ کے بازیافت کے فقرے میں <highlight/>{{count}}rd</highlight/> لفظ کیا ہے؟",
-  "onboarding.backup.manual.subtitle_other": "آپ کے بازیافت کے فقرے میں <highlight/>{{count}}واں</highlight/> لفظ کیا ہے؟",
+  "onboarding.backup.manual.subtitle_one": "آپ کے بازیافت کے فقرے میں {{count}}st لفظ کیا ہے؟",
+  "onboarding.backup.manual.subtitle_two": "آپ کے بازیافت کے فقرے میں {{count}}nd لفظ کیا ہے؟",
+  "onboarding.backup.manual.subtitle_few": "آپ کے بازیابی کے جملے میں {{count}}rd لفظ کیا ہے؟",
+  "onboarding.backup.manual.subtitle_other": "آپ کے بازیابی کے جملے میں {{count}}واں لفظ کیا ہے؟",
   "onboarding.backup.manual.title": "آئیے یقینی بنائیں کہ آپ نے اسے صحیح طریقے سے ریکارڈ کیا ہے۔",
   "onboarding.backup.option.cloud.description": "ایک محفوظ پاس ورڈ کے ساتھ اپنے بازیابی کے جملے کو خفیہ کریں۔",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} بیک اپ",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "اگر آپ ایپ کو حذف کر دیتے ہیں یا اپنا آلہ کھو دیتے ہیں تو بیک اپ آپ کو اپنا بٹوہ بحال کرنے دیتے ہیں۔",
   "onboarding.backup.title.existing": "اپنے بٹوے کا بیک اپ لیں۔",
   "onboarding.backup.title.new": "بیک اپ کا طریقہ منتخب کریں۔",
-  "onboarding.backup.view.disclaimer": "میں سمجھتا ہوں کہ اگر میں اپنا بازیابی کا جملہ کھو دیتا ہوں، تو Uniswap Labs اسے بحال کرنے میں میری مدد نہیں کر سکتی",
+  "onboarding.backup.view.disclaimer": "میں سمجھتا ہوں کہ اگر میں اپنا بازیابی کا جملہ کھو دیتا ہوں، تو Uniswap Labs اسے بحال کرنے میں میری مدد نہیں کر سکتی.",
   "onboarding.backup.view.subtitle.message1": "جاری رکھنے سے پہلے درج ذیل کو غور سے پڑھیں",
   "onboarding.backup.view.subtitle.message2": "اپنے بٹوے کو بازیافت کرنے کے لیے آپ کو ان تمام 12 خفیہ الفاظ درج کرنے ہوں گے۔",
   "onboarding.backup.view.title": "اپنی بازیابی کا جملہ لکھیں۔",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "اپنے ٹول بار میں یونی سویپ ایکسٹینشن شامل کرنے کے لیے پن آئیکن پر کلک کریں۔",
   "onboarding.complete.pin.title": "پن یونی سویپ ایکسٹینشن",
   "onboarding.complete.title": "آپ بالکل تیار ہیں۔",
-  "onboarding.extension.connectMobile.button": "اپنے فون سے درآمد کریں۔",
-  "onboarding.extension.connectMobile.title": "Unswap موبائل ایپ ہے؟",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "صارف نام کا دعوی کرنے کے لیے موبائل ایپ ڈاؤن لوڈ کریں۔",
   "onboarding.extension.getOnTheBetaWaitlist.title": "بیٹا انتظار کی فہرست میں شامل ہوں۔",
   "onboarding.extension.password.subtitle": "آپ کو اپنے بٹوے کو غیر مقفل کرنے اور اپنے بازیابی کے جملہ تک رسائی حاصل کرنے کے لیے اس کی ضرورت ہوگی۔",
   "onboarding.extension.password.title.default": "پاسورڈ بنائیں",
   "onboarding.extension.password.title.reset": "آپ کا پاس ورڈ دوبارہ ترتیب دیں",
+  "onboarding.extension.unsupported.description": "Unswap ایکسٹینشن ابھی صرف کروم کے ساتھ مطابقت رکھتا ہے۔",
+  "onboarding.extension.unsupported.title": "یہ براؤزر تعاون یافتہ نہیں ہے (ابھی تک)",
   "onboarding.import.error.invalidWords_one": "1 لفظ غلط یا غلط ہجے والا ہے۔",
   "onboarding.import.error.invalidWords_other": "{{count}} الفاظ غلط یا غلط ہجے ہیں۔",
   "onboarding.import.method.import.message": "کسی دوسرے کرپٹو والیٹ سے اپنی بازیابی کا جملہ درج کریں۔",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "اپنے 12 الفاظ پر مشتمل ریکوری کا جملہ ٹائپ یا پیسٹ کریں۔",
   "onboarding.importMnemonic.title": "اپنی بازیابی کا جملہ درج کریں۔",
   "onboarding.intro.button.alreadyHave": "میرے پاس پہلے سے ہی پرس ہے۔",
-  "onboarding.intro.title": "\nUnswap Wallet میں خوش آمدید",
+  "onboarding.intro.mobileScan.button": "درآمد کرنے کے لیے QR کوڈ اسکین کریں۔",
+  "onboarding.intro.mobileScan.title": "Uniswap ایپ ہے؟",
   "onboarding.introBetaWaitlist.button.checkEligibility": "اہلیت چیک کریں۔",
   "onboarding.introBetaWaitlist.button.letsGo": "چلو",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "ذیل میں اپنا <highlight>uni.eth</highlight> صارف نام درج کریں تاکہ یہ معلوم ہو سکے کہ آیا آپ بیٹا کے لیے اہل ہیں۔",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "آپ ابھی بھی انتظار کی فہرست میں ہیں۔ جب آپ اہل ہو جائیں گے تو ہم آپ کو Uniswap موبائل ایپ میں مطلع کریں گے!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "صارف نام",
   "onboarding.landing.button.add": "ایک موجودہ پرس شامل کریں۔",
-  "onboarding.landing.button.create": "ایک نیا پرس بنائیں",
+  "onboarding.landing.button.create": "ایک پرس بنائیں",
   "onboarding.notification.permission.message": "اطلاعات موصول کرنے کے لیے، اپنے آلے کی ترتیبات میں Unswap Wallet کے لیے اطلاعات کو آن کریں۔",
   "onboarding.notification.permission.title": "اطلاعات کی اجازت",
   "onboarding.notification.subtitle": "جب آپ کی منتقلی، تبادلہ، اور منظوری مکمل ہو جائے تو اطلاع حاصل کریں۔",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "آپ کے پاس یہ صرف دیکھنے کے لیے والیٹ کے طور پر ہے۔",
   "send.recipientSelect.search.empty.message": "جب آپ بٹوے کے پتے پر ٹوکن بھیجتے ہیں، تو وہ یہاں نظر آئیں گے۔",
   "send.recipientSelect.search.empty.title": "کوئی بٹوہ محفوظ نہیں ہوا۔",
-  "send.recipientSelect.title": "کو",
   "send.review.modal.title": "آپ بھیج رہے ہیں۔",
   "send.review.summary.button.title": "بھیجنے کی تصدیق کریں۔",
   "send.review.summary.sending": "بھیج رہا ہے۔",
-  "send.review.summary.to": "کو",
   "send.search.empty.subtitle": "آپ نے جو ایڈریس ٹائپ کیا ہے وہ یا تو موجود نہیں ہے یا ہجے غلط ہے۔",
   "send.search.empty.title": "کوئی نتیجہ نہیں",
   "send.search.placeholder": "ENS یا پتہ تلاش کریں۔",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "یہ پرس صرف دیکھنے کے لیے ہے۔",
   "setting.recoveryPhrase.account.show": "بازیابی کا جملہ دکھائیں۔",
   "setting.recoveryPhrase.action.hide": "بازیابی کا جملہ چھپائیں۔",
-  "setting.recoveryPhrase.remove.button": "بازیافت کا جملہ ہٹا دیں۔",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "میں سمجھتا ہوں کہ اگر میں ایسا کرنے میں ناکام ہو گیا تو Uniswap Labs میرے بٹوے کو بازیافت کرنے میں میری مدد نہیں کر سکتی",
+  "setting.recoveryPhrase.remove": "بازیافت کا جملہ ہٹا دیں۔",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "میں سمجھتا ہوں کہ اگر میں ایسا کرنے میں ناکام ہو گیا تو Uniswap Labs میرے بٹوے کو بازیافت کرنے میں میری مدد نہیں کر سکتی.",
   "setting.recoveryPhrase.remove.confirm.title": "میں نے اپنا ریکوری جملہ محفوظ کر لیا۔",
-  "setting.recoveryPhrase.remove.initial.subtitle": "یقینی بنائیں کہ آپ نے اپنا بازیابی جملہ محفوظ کر لیا ہے۔ دوسری صورت میں آپ اپنے فنڈز تک رسائی کھو دیں گے۔",
+  "setting.recoveryPhrase.remove.initial.subtitle": "یقینی بنائیں کہ آپ نے اپنا بازیابی جملہ محفوظ کر لیا ہے۔ بصورت دیگر آپ اپنے بٹوے تک رسائی کھو دیں گے۔",
   "setting.recoveryPhrase.remove.initial.title": "اس سے پہلے کہ آپ جاری رکھیں",
   "setting.recoveryPhrase.remove.password.error": "غلط پاس ورڈ. دوبارہ کوشش کریں",
-  "setting.recoveryPhrase.remove.password.input": "پاس ورڈ درج کریں",
-  "setting.recoveryPhrase.remove.subtitle": "جاری رکھنے کے لیے اپنا پاس ورڈ درج کریں۔",
+  "setting.recoveryPhrase.remove.subtitle": "تصدیق کے لیے اپنا پاس ورڈ درج کریں۔",
   "setting.recoveryPhrase.remove.title": "آپ اپنا بازیابی کا جملہ ہٹا رہے ہیں۔",
-  "setting.recoveryPhrase.view.error": "غلط پاس ورڈ، دوبارہ کوشش کریں۔",
   "setting.recoveryPhrase.view.warning.message1": "کوئی بھی جو آپ کی بازیابی کے فقرے کو جانتا ہے وہ آپ کے بٹوے اور فنڈز تک رسائی حاصل کر سکتا ہے۔",
   "setting.recoveryPhrase.view.warning.message2": "اسے نجی طور پر دیکھیں",
-  "setting.recoveryPhrase.view.warning.message3": "اسے کسی کے ساتھ شیئر نہ کریں۔",
-  "setting.recoveryPhrase.view.warning.message4": "اسے کبھی بھی کسی ویب سائٹ یا ایپس میں داخل نہ کریں۔",
+  "setting.recoveryPhrase.view.warning.message3": "کسی کے ساتھ شیئر نہ کریں۔",
+  "setting.recoveryPhrase.view.warning.message4": "اسے کبھی بھی کسی ویب سائٹ یا ایپلیکیشن میں داخل نہ کریں۔",
   "setting.recoveryPhrase.view.warning.title": "اس سے پہلے کہ آپ جاری رکھیں",
   "setting.recoveryPhrase.warning.screenshot.message": "آپ کی تصاویر تک رسائی حاصل کرنے والا کوئی بھی شخص آپ کے بٹوے تک رسائی حاصل کر سکتا ہے۔ ہمارا مشورہ ہے کہ آپ اس کے بجائے اپنے الفاظ لکھ لیں۔",
   "setting.recoveryPhrase.warning.screenshot.title": "اسکرین شاٹس محفوظ نہیں ہیں۔",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "کم دیکھیں",
   "settings.section.wallet.label.viewOnly": "صرف دیکھنے کے لیے",
   "settings.section.wallet.title": "والیٹ کی ترتیبات",
-  "settings.setting.appearance.option.auto": "آٹو",
   "settings.setting.appearance.option.dark.subtitle": "ہمیشہ ڈارک موڈ استعمال کریں۔",
   "settings.setting.appearance.option.dark.title": "ڈارک موڈ",
   "settings.setting.appearance.option.device.subtitle": "آپ کے آلے کی ظاہری شکل کے مطابق",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "ہم Unswap Labs پروڈکٹس میں آپ کے تجربے کو بڑھانے کے لیے گمنام استعمال کا ڈیٹا استعمال کرتے ہیں۔ غیر فعال ہونے پر، ہم صرف غلطیوں اور ضروری استعمال کو ٹریک کرتے ہیں۔",
   "settings.setting.privacy.analytics.title": "تجزیات کی اجازت دیں۔",
   "settings.setting.privacy.title": "رازداری",
-  "settings.setting.recoveryPhrase.remove": "بازیافت کا جملہ ہٹا دیں۔",
+  "settings.setting.recoveryPhrase.password.title": "اپنا پاس ورڈ درج کریں",
   "settings.setting.recoveryPhrase.title": "بازیابی کا جملہ",
-  "settings.setting.recoveryPhrase.view": "بحالی کا جملہ دیکھیں",
   "settings.setting.smallBalances.title": "چھوٹے بیلنس چھپائیں۔",
-  "settings.setting.theme.title": "خیالیہ",
   "settings.setting.unknownTokens.title": "نامعلوم ٹوکنز چھپائیں۔",
   "settings.setting.wallet.action.editLabel": "لیبل میں ترمیم کریں۔",
   "settings.setting.wallet.action.editProfile": "پروفائل میں ترمیم کریں",
@@ -729,6 +734,8 @@
   "settings.version": "ورژن {{appVersion}}",
   "swap.button.max": "زیادہ سے زیادہ",
   "swap.button.review": "جائزہ لیں",
+  "swap.button.submitting": "تبادلہ جمع کرایا جا رہا ہے...",
+  "swap.button.submitting.keep.open": "اپنا بٹوہ کھلا رکھیں...",
   "swap.button.swap": "تبادلہ",
   "swap.button.unwrap": "کھولنا",
   "swap.button.view": "لین دین دیکھیں",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "آپ آف لائن ہیں۔",
   "swap.warning.priceImpact.message": "فی الحال دستیاب {{outputCurrencySymbol}} لیکویڈیٹی کی مقدار کی وجہ سے، آپ جتنا زیادہ {{inputCurrencySymbol}} تبادلہ کرنے کی کوشش کریں گے، آپ کو اتنا ہی کم {{outputCurrencySymbol}} ملے گا۔",
   "swap.warning.priceImpact.title": "زیادہ قیمت کا اثر ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "آپ کا ٹرانزیکشن جمع نہیں ہو سکا کیونکہ آپ نے ایپ بند کر دی تھی۔",
+  "swap.warning.queuedOrder.approvalFailed": "ٹوکن کی منظوری ناکام ہونے کی وجہ سے آپ کا لین دین جمع نہیں ہو سکا۔",
+  "swap.warning.queuedOrder.stale": "آپ کا ٹرانزیکشن جمع نہیں ہو سکا کیونکہ آپ نے ایپ بند کر دی تھی یا منظوری میں کافی وقت لگا تھا۔",
+  "swap.warning.queuedOrder.submissionFailed": "آپ کی ٹرانزیکشن جمع کرانے میں ایک مسئلہ تھا۔",
+  "swap.warning.queuedOrder.title": "تبادلہ منسوخ کر دیا گیا۔",
+  "swap.warning.queuedOrder.wrap.message": "آپ کا ETH WETH کے طور پر لپٹا رہے گا۔",
+  "swap.warning.queuedOrder.wrapFailed": "آپ کا لین دین جمع نہیں ہو سکا کیونکہ ریپ ٹرانزیکشن ناکام ہو گیا۔",
   "swap.warning.rateLimit.message": "براہ کرم چند منٹوں میں دوبارہ کوشش کریں۔",
   "swap.warning.rateLimit.title": "شرح کی حد سے تجاوز کر گیا۔",
   "swap.warning.router.message": "ہو سکتا ہے آپ کا کنکشن ختم ہو گیا ہو یا نیٹ ورک بند ہو جائے۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم بعد میں دوبارہ کوشش کریں۔",
@@ -805,7 +819,6 @@
   "token.balances.other": "دوسرے نیٹ ورکس پر بیلنس",
   "token.balances.viewOnly": "{{ownerAddress}}کا بیلنس",
   "token.error.unknown": "نامعلوم ٹوکن",
-  "token.links.contract": "معاہدہ",
   "token.links.title": "لنکس",
   "token.links.twitter": "ٹویٹر",
   "token.links.website": "ویب سائٹ",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "ٹوکن چھپائیں۔",
   "tokens.action.unhide": "ٹوکن چھپائیں",
   "tokens.hidden.label": "پوشیدہ ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "{{blockExplorerName}}پر دیکھیں",
   "tokens.nfts.collection.error.load.title": "NFT مجموعہ لوڈ نہیں ہو سکا",
   "tokens.nfts.collection.label.items": "اشیاء",
   "tokens.nfts.collection.label.owners": "مالکان",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "لا محدود",
   "transaction.currency.unknown": "نامعلوم ٹوکن",
   "transaction.date": "{{date}}پر جمع کرایا گیا۔",
+  "transaction.details.dappName": "ایپ",
+  "transaction.details.from": "سے",
   "transaction.details.networkFee": "نیٹ ورک کی قیمت",
   "transaction.details.transactionId": "ٹرانزیکشن ID",
   "transaction.network.all": "تمام نیٹ ورکس",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "{{externalDappName}}پر بھیجا گیا۔",
   "transaction.status.swap.canceled": "منسوخ شدہ تبادلہ",
   "transaction.status.swap.canceling": "تبادلہ منسوخ کرنا",
+  "transaction.status.swap.expired": "تبادلہ کی میعاد ختم ہوگئی",
   "transaction.status.swap.failed": "تبادلہ کرنے میں ناکام",
+  "transaction.status.swap.insufficientFunds": "ناکافی فنڈز",
   "transaction.status.swap.pending": "تبادلہ کرنا",
   "transaction.status.swap.success": "ادل بدل",
   "transaction.status.swap.successDapp": "{{externalDappName}}پر تبدیل کیا گیا۔",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "سائن کرنے کے لیے نیچے سکرول کریں۔",
   "walletConnect.request.button.sign": "دستخط",
   "walletConnect.request.details.label.function": "فنکشن",
-  "walletConnect.request.details.label.recipient": "کو",
   "walletConnect.request.details.label.sending": "بھیج رہا ہے۔",
   "walletConnect.request.error.insufficientFunds": "اس لین دین کو مکمل کرنے کے لیے آپ کے پاس کافی {{currencySymbol}} نہیں ہے۔",
   "walletConnect.request.error.network": "انٹرنیٹ یا نیٹ ورک کنکشن کی خرابی۔",
diff --git a/packages/uniswap/src/i18n/locales/translations/vi-VN.json b/packages/uniswap/src/i18n/locales/translations/vi-VN.json
index 64786f31007..1d0266419b4 100644
--- a/packages/uniswap/src/i18n/locales/translations/vi-VN.json
+++ b/packages/uniswap/src/i18n/locales/translations/vi-VN.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "Thử lại",
   "common.button.understand": "Tôi hiểu",
   "common.button.view": "Xem",
+  "common.button.yes": "Đúng",
   "common.card.error.description": "Đã xảy ra lỗi",
   "common.card.error.title": "Ối! Đã xảy ra lỗi.",
   "common.endAdornment": "Và",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "Cài đặt",
   "common.navigation.systemSettings": "Cài đặt",
   "common.text.connected": "Đã kết nối",
+  "common.text.contract": "Hợp đồng",
   "common.text.disconnected": "Đã ngắt kết nối",
   "common.text.error": "Lỗi",
   "common.text.notAvailable": "không áp dụng",
+  "common.text.recipient": "ĐẾN",
+  "common.text.sender": "Từ",
   "common.text.unknown": "không xác định",
   "currency.aud": "Đô la Úc",
   "currency.brl": "Real Brazil",
@@ -171,17 +175,15 @@
   "currency.usd": "Đô la Mĩ",
   "currency.vnd": "đồng Việt Nam",
   "dapp.request.approve.action": "Chấp thuận",
-  "dapp.request.approve.fallbackTitle": "Phê duyệt mã thông báo chi tiêu",
-  "dapp.request.approve.helptext": "Cho phép trang web này truy cập và chi tiêu mã thông báo này từ ví của bạn.",
+  "dapp.request.approve.fallbackTitle": "Phê duyệt trang web này để truy cập mã thông báo",
+  "dapp.request.approve.helptext": "Cho phép trang web này truy cập và sử dụng mã thông báo này cho các giao dịch. Hãy chắc chắn rằng bạn tin tưởng trang web này.",
   "dapp.request.approve.label": "Cái ví",
-  "dapp.request.approve.title": "Phê duyệt chi tiêu {{tokenSymbol}}",
+  "dapp.request.approve.title": "Phê duyệt quyền truy cập vào {{tokenSymbol}}",
   "dapp.request.base.title": "Yêu cầu giao dịch",
   "dapp.request.connect.helptext": "Cho phép trang web này xem địa chỉ ví, số dư của bạn và yêu cầu phê duyệt các giao dịch.",
   "dapp.request.connect.title": "Kết nối với trang web",
   "dapp.request.fallback.calldata.label": "Dữ liệu thô",
   "dapp.request.fallback.function.label": "Chức năng",
-  "dapp.request.fallback.recipient.label": "ĐẾN",
-  "dapp.request.fallback.sending.label": "Gửi",
   "dapp.request.permit2.description": "Permit2 quản lý việc phê duyệt mã thông báo trên nhiều dapp.",
   "dapp.request.permit2.header": "Ký giấy phép2",
   "dapp.request.reject.action": "Từ chối tất cả",
@@ -349,6 +351,13 @@
   "language.ukrainian": "tiếng Ukraina",
   "language.urdu": "tiếng Urdu",
   "language.vietnamese": "Tiếng Việt",
+  "mobile.appRating.button.decline": "Không thực sự",
+  "mobile.appRating.description": "Hãy cho chúng tôi biết nếu bạn có trải nghiệm tốt với ứng dụng này",
+  "mobile.appRating.feedback.button.cancel": "Có lẽ sau này",
+  "mobile.appRating.feedback.button.send": "Gửi phản hồi",
+  "mobile.appRating.feedback.description": "Hãy cho chúng tôi biết cách chúng tôi có thể cải thiện trải nghiệm của bạn",
+  "mobile.appRating.feedback.title": "Chúng tôi rất tiếc khi nghe điều đó.",
+  "mobile.appRating.title": "Bạn đang tận hưởng Ví Uniswap?",
   "notification.assetVisibility.hidden": "{{assetName}} ẩn",
   "notification.assetVisibility.unhidden": "{{assetName}} được hiển thị",
   "notification.copied.address": "Đã sao chép địa chỉ",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "Được phê duyệt {{currencySymbol}} để sử dụng với {{address}}.",
   "notification.transaction.pending": "Giao dịch đang chờ xử lý",
   "notification.transaction.swap.canceled": "Đã hủy {{inputCurrencySymbol}}-{{outputCurrencySymbol}} trao đổi.",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} cho {{outputCurrencyAmountWithSymbol}} trao đổi đã hết hạn.",
   "notification.transaction.swap.fail": "Không thể đổi {{inputCurrencyAmountWithSymbol}} lấy {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.swap.success": "Hoán đổi {{inputCurrencyAmountWithSymbol}} lấy {{outputCurrencyAmountWithSymbol}}.",
   "notification.transaction.transfer.canceled": "Đã hủy {{tokenNameOrAddress}} lần gửi.",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "Tiếp tục mở rộng Uniswap",
   "notifications.scantastic.title": "Thành công!",
   "onboarding.backup.manual.banner": "Tốt nhất bạn nên viết nội dung này ra một tờ giấy và cất giữ ở nơi an toàn hoặc trong trình quản lý mật khẩu an toàn.",
+  "onboarding.backup.manual.error": "Từ không hợp lệ hoặc sai chính tả",
   "onboarding.backup.manual.placeholder": "Từ bí mật",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}{{totalStepsCount}} hoàn thành",
   "onboarding.backup.manual.selectedWordPlaceholder": "Chọn từ",
-  "onboarding.backup.manual.subtitle_one": "Từ <highlight/>{{count}}st</highlight/> trong cụm từ khôi phục của bạn là gì?",
-  "onboarding.backup.manual.subtitle_two": "Từ <highlight/>{{count}}nd</highlight/> trong cụm từ khôi phục của bạn là gì?",
-  "onboarding.backup.manual.subtitle_few": "Từ <highlight/>{{count}}thứ</highlight/> trong cụm từ khôi phục của bạn là gì?",
-  "onboarding.backup.manual.subtitle_other": "Từ <highlight/>{{count}}thứ</highlight/> trong cụm từ khôi phục của bạn là gì?",
+  "onboarding.backup.manual.subtitle_one": "Từ đầu tiên {{count}}trong cụm từ khôi phục của bạn là gì?",
+  "onboarding.backup.manual.subtitle_two": "Từ thứ {{count}}trong cụm từ khôi phục của bạn là gì?",
+  "onboarding.backup.manual.subtitle_few": "Từ thứ {{count}}trong cụm từ khôi phục của bạn là gì?",
+  "onboarding.backup.manual.subtitle_other": "Từ thứ {{count}}trong cụm từ khôi phục của bạn là gì?",
   "onboarding.backup.manual.title": "Hãy đảm bảo rằng bạn đã ghi lại chính xác",
   "onboarding.backup.option.cloud.description": "Mã hóa cụm từ khôi phục của bạn bằng mật khẩu an toàn",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} dự phòng",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "Bản sao lưu cho phép bạn khôi phục ví của mình nếu bạn xóa ứng dụng hoặc mất thiết bị",
   "onboarding.backup.title.existing": "Sao lưu ví của bạn",
   "onboarding.backup.title.new": "Chọn phương pháp sao lưu",
-  "onboarding.backup.view.disclaimer": "Tôi hiểu rằng nếu tôi làm mất cụm từ khôi phục, Uniswap Labs không thể giúp tôi khôi phục nó",
+  "onboarding.backup.view.disclaimer": "Tôi hiểu rằng nếu tôi làm mất cụm từ khôi phục, Uniswap Labs không thể giúp tôi khôi phục nó.",
   "onboarding.backup.view.subtitle.message1": "Đọc kỹ phần sau trước khi tiếp tục",
   "onboarding.backup.view.subtitle.message2": "Bạn sẽ cần nhập tất cả 12 từ bí mật này để lấy lại ví của mình.",
   "onboarding.backup.view.title": "Viết ra cụm từ khôi phục của bạn",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "Nhấp vào biểu tượng ghim để thêm Tiện ích mở rộng Uniswap vào thanh công cụ của bạn.",
   "onboarding.complete.pin.title": "Ghim tiện ích mở rộng Uniswap",
   "onboarding.complete.title": "Bạn đã sẵn sàng",
-  "onboarding.extension.connectMobile.button": "Nhập từ điện thoại của bạn",
-  "onboarding.extension.connectMobile.title": "Bạn có ứng dụng di động Uniswap không?",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "Tải xuống ứng dụng di động để yêu cầu tên người dùng",
   "onboarding.extension.getOnTheBetaWaitlist.title": "Tham gia danh sách chờ Beta",
   "onboarding.extension.password.subtitle": "Bạn sẽ cần thông tin này để mở khóa ví và truy cập cụm từ khôi phục của mình",
   "onboarding.extension.password.title.default": "Tạo mật khẩu",
   "onboarding.extension.password.title.reset": "Đặt lại mật khẩu của bạn",
+  "onboarding.extension.unsupported.description": "Tiện ích mở rộng Uniswap hiện chỉ tương thích với Chrome.",
+  "onboarding.extension.unsupported.title": "Trình duyệt này chưa được hỗ trợ (chưa)",
   "onboarding.import.error.invalidWords_one": "1 từ không hợp lệ hoặc sai chính tả",
   "onboarding.import.error.invalidWords_other": "{{count}} từ không hợp lệ hoặc sai chính tả",
   "onboarding.import.method.import.message": "Nhập cụm từ khôi phục của bạn từ một ví tiền điện tử khác",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "Nhập hoặc dán cụm từ khôi phục 12 từ của bạn",
   "onboarding.importMnemonic.title": "Nhập cụm từ khôi phục của bạn",
   "onboarding.intro.button.alreadyHave": "Tôi đã có ví rồi",
-  "onboarding.intro.title": "Chào mừng bạn đến với \nVí Uniswap",
+  "onboarding.intro.mobileScan.button": "Quét mã QR để nhập",
+  "onboarding.intro.mobileScan.title": "Bạn có ứng dụng Uniswap không?",
   "onboarding.introBetaWaitlist.button.checkEligibility": "Kiểm tra tính đủ điều kiện",
   "onboarding.introBetaWaitlist.button.letsGo": "Đi nào",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "Nhập tên người dùng <highlight>uni.eth</highlight> của bạn bên dưới để kiểm tra xem bạn có đủ điều kiện tham gia bản Beta hay không.",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "Bạn vẫn còn trong danh sách chờ. Chúng tôi sẽ thông báo cho bạn trong ứng dụng di động Uniswap khi bạn đủ điều kiện!",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "tên tài khoản",
   "onboarding.landing.button.add": "Thêm ví hiện có",
-  "onboarding.landing.button.create": "Tạo một ví mới",
+  "onboarding.landing.button.create": "Tạo ví",
   "onboarding.notification.permission.message": "Để nhận thông báo, hãy bật thông báo cho Ví Uniswap trong cài đặt thiết bị của bạn.",
   "onboarding.notification.permission.title": "Quyền thông báo",
   "onboarding.notification.subtitle": "Nhận thông báo khi quá trình chuyển, hoán đổi và phê duyệt của bạn hoàn tất.",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "Bạn có ví này dưới dạng ví chỉ xem",
   "send.recipientSelect.search.empty.message": "Khi bạn gửi mã thông báo đến địa chỉ ví, chúng sẽ hiển thị ở đây",
   "send.recipientSelect.search.empty.title": "Không có ví nào được lưu",
-  "send.recipientSelect.title": "ĐẾN",
   "send.review.modal.title": "Bạn đang gửi",
   "send.review.summary.button.title": "Xác nhận gửi",
   "send.review.summary.sending": "Gửi",
-  "send.review.summary.to": "ĐẾN",
   "send.search.empty.subtitle": "Địa chỉ bạn nhập không tồn tại hoặc viết sai chính tả.",
   "send.search.empty.title": "không có kết quả nào được tìm thấy",
   "send.search.placeholder": "Tìm kiếm ENS hoặc địa chỉ",
@@ -612,19 +622,17 @@
   "send.warning.viewOnly.title": "Ví này ở chế độ chỉ xem",
   "setting.recoveryPhrase.account.show": "Hiển thị cụm từ khôi phục",
   "setting.recoveryPhrase.action.hide": "Ẩn cụm từ khôi phục",
-  "setting.recoveryPhrase.remove.button": "Xóa cụm từ khôi phục",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "Tôi hiểu rằng Uniswap Labs không thể giúp tôi khôi phục ví nếu tôi không làm như vậy",
+  "setting.recoveryPhrase.remove": "Xóa cụm từ khôi phục",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "Tôi hiểu rằng Uniswap Labs không thể giúp tôi khôi phục ví nếu tôi không làm như vậy.",
   "setting.recoveryPhrase.remove.confirm.title": "Tôi đã lưu cụm từ khôi phục của mình",
-  "setting.recoveryPhrase.remove.initial.subtitle": "Đảm bảo bạn đã lưu cụm từ khôi phục của mình. Bạn sẽ mất quyền truy cập vào tiền của mình nếu không",
+  "setting.recoveryPhrase.remove.initial.subtitle": "Đảm bảo bạn đã lưu cụm từ khôi phục của mình. Nếu không, bạn sẽ mất quyền truy cập vào ví của mình",
   "setting.recoveryPhrase.remove.initial.title": "Trước khi bạn tiếp tục",
   "setting.recoveryPhrase.remove.password.error": "Sai mật khẩu. Thử lại",
-  "setting.recoveryPhrase.remove.password.input": "Nhập mật khẩu",
-  "setting.recoveryPhrase.remove.subtitle": "Nhập mật khẩu của bạn để tiếp tục",
+  "setting.recoveryPhrase.remove.subtitle": "Nhập mật khẩu của bạn để xác nhận",
   "setting.recoveryPhrase.remove.title": "Bạn đang xóa cụm từ khôi phục của mình",
-  "setting.recoveryPhrase.view.error": "Sai mật khẩu, hãy thử lại",
   "setting.recoveryPhrase.view.warning.message1": "Bất kỳ ai biết cụm từ khôi phục của bạn đều có thể truy cập vào ví và tiền của bạn",
   "setting.recoveryPhrase.view.warning.message2": "Xem cái này ở chế độ riêng tư",
-  "setting.recoveryPhrase.view.warning.message3": "Đừng chia sẻ điều này với bất cứ ai",
+  "setting.recoveryPhrase.view.warning.message3": "Không chia sẻ với bất cứ ai",
   "setting.recoveryPhrase.view.warning.message4": "Không bao giờ nhập nó vào bất kỳ trang web hoặc ứng dụng nào",
   "setting.recoveryPhrase.view.warning.title": "Trước khi bạn tiếp tục",
   "setting.recoveryPhrase.warning.screenshot.message": "Bất kỳ ai có quyền truy cập vào ảnh của bạn đều có thể truy cập vào ví của bạn. Thay vào đó, chúng tôi khuyên bạn nên viết ra lời nói của mình.",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "Xem ít hơn",
   "settings.section.wallet.label.viewOnly": "Chỉ xem",
   "settings.section.wallet.title": "Cài đặt ví",
-  "settings.setting.appearance.option.auto": "Tự động",
   "settings.setting.appearance.option.dark.subtitle": "Luôn sử dụng chế độ tối",
   "settings.setting.appearance.option.dark.title": "Chế độ tối",
   "settings.setting.appearance.option.device.subtitle": "Mặc định cho giao diện thiết bị của bạn",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "Chúng tôi sử dụng dữ liệu sử dụng ẩn danh để nâng cao trải nghiệm của bạn trên các sản phẩm Uniswap Labs. Khi bị tắt, chúng tôi chỉ theo dõi lỗi và việc sử dụng thiết yếu.",
   "settings.setting.privacy.analytics.title": "Cho phép phân tích",
   "settings.setting.privacy.title": "Sự riêng tư",
-  "settings.setting.recoveryPhrase.remove": "Xóa cụm từ khôi phục",
+  "settings.setting.recoveryPhrase.password.title": "Nhập mật khẩu của bạn",
   "settings.setting.recoveryPhrase.title": "Cụm từ khôi phục",
-  "settings.setting.recoveryPhrase.view": "Xem cụm từ khôi phục",
   "settings.setting.smallBalances.title": "Ẩn số dư nhỏ",
-  "settings.setting.theme.title": "chủ đề",
   "settings.setting.unknownTokens.title": "Ẩn mã thông báo không xác định",
   "settings.setting.wallet.action.editLabel": "Chỉnh sửa nhãn",
   "settings.setting.wallet.action.editProfile": "Chỉnh sửa hồ sơ",
@@ -729,6 +734,8 @@
   "settings.version": "Phiên bản {{appVersion}}",
   "swap.button.max": "Tối đa",
   "swap.button.review": "Ôn tập",
+  "swap.button.submitting": "Đang gửi trao đổi...",
+  "swap.button.submitting.keep.open": "Giữ ví của bạn luôn mở...",
   "swap.button.swap": "Tráo đổi",
   "swap.button.unwrap": "Mở gói",
   "swap.button.view": "Xem giao dịch",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "Bạn đang ngoại tuyến",
   "swap.warning.priceImpact.message": "Do số lượng {{outputCurrencySymbol}} thanh khoản hiện có sẵn, bạn càng cố gắng hoán đổi nhiều {{inputCurrencySymbol}} thì bạn sẽ nhận được càng ít {{outputCurrencySymbol}} .",
   "swap.warning.priceImpact.title": "Tác động giá cao ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "Giao dịch của bạn không được gửi vì bạn đã đóng ứng dụng.",
+  "swap.warning.queuedOrder.approvalFailed": "Giao dịch của bạn không được gửi vì phê duyệt mã thông báo không thành công.",
+  "swap.warning.queuedOrder.stale": "Giao dịch của bạn không được gửi vì bạn đã đóng ứng dụng hoặc quá trình phê duyệt mất quá nhiều thời gian.",
+  "swap.warning.queuedOrder.submissionFailed": "Đã xảy ra sự cố khi gửi giao dịch của bạn.",
+  "swap.warning.queuedOrder.title": "Hoán đổi đã bị hủy",
+  "swap.warning.queuedOrder.wrap.message": "ETH của bạn sẽ vẫn được gói dưới dạng WETH.",
+  "swap.warning.queuedOrder.wrapFailed": "Giao dịch của bạn không được gửi vì giao dịch gói không thành công.",
   "swap.warning.rateLimit.message": "Vui lòng thử lại trong vài phút.",
   "swap.warning.rateLimit.title": "Vượt quá giới hạn tốc độ",
   "swap.warning.router.message": "Có thể bạn đã mất kết nối hoặc mạng có thể bị hỏng. Nếu sự cố vẫn tiếp diễn, vui lòng thử lại sau.",
@@ -805,7 +819,6 @@
   "token.balances.other": "Số dư trên các mạng khác",
   "token.balances.viewOnly": "số dư {{ownerAddress}}",
   "token.error.unknown": "Mã thông báo không xác định",
-  "token.links.contract": "Hợp đồng",
   "token.links.title": "Liên kết",
   "token.links.twitter": "Twitter",
   "token.links.website": "Trang mạng",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "Ẩn mã thông báo",
   "tokens.action.unhide": "Bỏ ẩn mã thông báo",
   "tokens.hidden.label": "Ẩn ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "Xem trên {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "Không thể tải bộ sưu tập NFT",
   "tokens.nfts.collection.label.items": "Mặt hàng",
   "tokens.nfts.collection.label.owners": "Những chủ sở hữu",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "Vô hạn",
   "transaction.currency.unknown": "mã thông báo không xác định",
   "transaction.date": "Đã đăng vào {{date}}",
+  "transaction.details.dappName": "Ứng dụng",
+  "transaction.details.from": "Từ",
   "transaction.details.networkFee": "Chi phí mạng",
   "transaction.details.transactionId": "ID giao dịch",
   "transaction.network.all": "Tất cả các mạng",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "Đã gửi vào {{externalDappName}}",
   "transaction.status.swap.canceled": "Hoán đổi đã hủy",
   "transaction.status.swap.canceling": "Hủy trao đổi",
+  "transaction.status.swap.expired": "Hoán đổi đã hết hạn",
   "transaction.status.swap.failed": "Không thể trao đổi",
+  "transaction.status.swap.insufficientFunds": "Không đủ tiền",
   "transaction.status.swap.pending": "Hoán đổi",
   "transaction.status.swap.success": "Đã hoán đổi",
   "transaction.status.swap.successDapp": "Đã hoán đổi {{externalDappName}}",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "Cuộn xuống để ký",
   "walletConnect.request.button.sign": "Dấu hiệu",
   "walletConnect.request.details.label.function": "Chức năng",
-  "walletConnect.request.details.label.recipient": "ĐẾN",
   "walletConnect.request.details.label.sending": "Gửi",
   "walletConnect.request.error.insufficientFunds": "Bạn không có đủ {{currencySymbol}} để hoàn tất giao dịch này.",
   "walletConnect.request.error.network": "Lỗi kết nối Internet hoặc mạng",
diff --git a/packages/uniswap/src/i18n/locales/translations/zh-CN.json b/packages/uniswap/src/i18n/locales/translations/zh-CN.json
index 0204db23304..7c389171007 100644
--- a/packages/uniswap/src/i18n/locales/translations/zh-CN.json
+++ b/packages/uniswap/src/i18n/locales/translations/zh-CN.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "再试一次",
   "common.button.understand": "我明白",
   "common.button.view": "显示",
+  "common.button.yes": "是的",
   "common.card.error.description": "出了些问题",
   "common.card.error.title": "哎呀！出了些问题。",
   "common.endAdornment": "和",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "设置",
   "common.navigation.systemSettings": "设置",
   "common.text.connected": "已连接",
+  "common.text.contract": "合同",
   "common.text.disconnected": "已断开连接",
   "common.text.error": "错误",
   "common.text.notAvailable": "不适用",
+  "common.text.recipient": "接受者",
+  "common.text.sender": "从",
   "common.text.unknown": "未知",
   "currency.aud": "澳元",
   "currency.brl": "巴西雷亚尔",
@@ -171,17 +175,15 @@
   "currency.usd": "美国美元",
   "currency.vnd": "越南盾",
   "dapp.request.approve.action": "批准",
-  "dapp.request.approve.fallbackTitle": "批准消费代币",
-  "dapp.request.approve.helptext": "允许该网站访问您的钱包并使用该代币。",
+  "dapp.request.approve.fallbackTitle": "批准此站点访问令牌",
+  "dapp.request.approve.helptext": "允许此网站访问并使用此代币进行交易。请确保您信任此网站。",
   "dapp.request.approve.label": "钱包",
-  "dapp.request.approve.title": "批准支出 {{tokenSymbol}}",
+  "dapp.request.approve.title": "批准访问 {{tokenSymbol}}",
   "dapp.request.base.title": "交易请求",
   "dapp.request.connect.helptext": "允许该网站查看您的钱包地址、余额并请求交易批准。",
   "dapp.request.connect.title": "连接到网站",
   "dapp.request.fallback.calldata.label": "原始数据",
   "dapp.request.fallback.function.label": "功能",
-  "dapp.request.fallback.recipient.label": "接受者",
-  "dapp.request.fallback.sending.label": "发送",
   "dapp.request.permit2.description": "Permit2 管理多个 dapp 的代币批准。",
   "dapp.request.permit2.header": "签到许可证2",
   "dapp.request.reject.action": "全部拒绝",
@@ -349,6 +351,13 @@
   "language.ukrainian": "乌克兰语",
   "language.urdu": "乌尔都语",
   "language.vietnamese": "越南语",
+  "mobile.appRating.button.decline": "并不真地",
+  "mobile.appRating.description": "如果您使用此应用的体验良好，请告诉我们",
+  "mobile.appRating.feedback.button.cancel": "稍后再说",
+  "mobile.appRating.feedback.button.send": "发送反馈",
+  "mobile.appRating.feedback.description": "让我们知道如何改善您的体验",
+  "mobile.appRating.feedback.title": "我们很遗憾听到这个消息。",
+  "mobile.appRating.title": "喜欢 Uniswap 钱包吗？",
   "notification.assetVisibility.hidden": "{{assetName}} 隐藏",
   "notification.assetVisibility.unhidden": "{{assetName}} 显示",
   "notification.copied.address": "地址已复制",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "授权 {{currencySymbol}} 与 {{address}} 一起使用。",
   "notification.transaction.pending": "交易待处理",
   "notification.transaction.swap.canceled": "已取消兑换 {{inputCurrencySymbol}}-{{outputCurrencySymbol}}。",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} 与 {{outputCurrencyAmountWithSymbol}} 的交换已过期。",
   "notification.transaction.swap.fail": "兑换 {{inputCurrencyAmountWithSymbol}} 为 {{outputCurrencyAmountWithSymbol}} 失败",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} 已兑换成 {{outputCurrencyAmountWithSymbol}}",
   "notification.transaction.transfer.canceled": "已取消发送 {{tokenNameOrAddress}} 。",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "继续使用 Uniswap 扩展",
   "notifications.scantastic.title": "成功!",
   "onboarding.backup.manual.banner": "最好将其写在纸上并将其存储在安全的地方或安全的密码管理器中。",
+  "onboarding.backup.manual.error": "单词无效或拼写错误",
   "onboarding.backup.manual.placeholder": "悄悄话",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} 已完成",
   "onboarding.backup.manual.selectedWordPlaceholder": "选择单词",
-  "onboarding.backup.manual.subtitle_one": "您的恢复短语中的 <highlight/>{{count}}</highlight/> 单词是什么？",
-  "onboarding.backup.manual.subtitle_two": "您的恢复短语中的 <highlight/>{{count}}</highlight/> 单词是什么？",
-  "onboarding.backup.manual.subtitle_few": "您的恢复短语中的 <highlight/>{{count}}</highlight/> 单词是什么？",
-  "onboarding.backup.manual.subtitle_other": "您的恢复短语中的 <highlight/>{{count}}</highlight/> 单词是什么？",
+  "onboarding.backup.manual.subtitle_one": "您的恢复短语中的 {{count}} 单词是什么？",
+  "onboarding.backup.manual.subtitle_two": "您的恢复短语中的 {{count}} 单词是什么？",
+  "onboarding.backup.manual.subtitle_few": "您的恢复短语中的 {{count}} 单词是什么？",
+  "onboarding.backup.manual.subtitle_other": "您的恢复短语中的 {{count}} 单词是什么？",
   "onboarding.backup.manual.title": "让我们确保您已正确记录",
   "onboarding.backup.option.cloud.description": "使用安全密码加密你的恢复短语",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} 备份",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "如果你删除 APP 或丢失手机，备份可以用来恢复你的钱包",
   "onboarding.backup.title.existing": "备份你的钱包",
   "onboarding.backup.title.new": "选择备份方法",
-  "onboarding.backup.view.disclaimer": "我了解如果我丢失了恢复短语，Uniswap Labs 无法帮助我恢复它",
+  "onboarding.backup.view.disclaimer": "我了解如果我丢失了恢复短语，Uniswap Labs 无法帮助我恢复它.",
   "onboarding.backup.view.subtitle.message1": "在继续之前请仔细阅读以下内容",
   "onboarding.backup.view.subtitle.message2": "您需要输入全部这 12 个密码才能恢复您的钱包。",
   "onboarding.backup.view.title": "写下您的恢复短语",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "单击图钉图标将 Uniswap 扩展添加到您的工具栏。",
   "onboarding.complete.pin.title": "固定 Uniswap 扩展",
   "onboarding.complete.title": "一切就绪",
-  "onboarding.extension.connectMobile.button": "从您的手机导入",
-  "onboarding.extension.connectMobile.title": "有 Uniswap 应用程序吗？",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "下载移动应用程序以获取用户名",
   "onboarding.extension.getOnTheBetaWaitlist.title": "加入 Beta 版候补名单",
   "onboarding.extension.password.subtitle": "您需要它来解锁您的钱包并访问您的恢复短语",
   "onboarding.extension.password.title.default": "创建密码",
   "onboarding.extension.password.title.reset": "重置你的密码",
+  "onboarding.extension.unsupported.description": "Uniswap 扩展程序目前仅与 Chrome 兼容。",
+  "onboarding.extension.unsupported.title": "该浏览器尚不受支持",
   "onboarding.import.error.invalidWords_one": "1 个单词无效或拼写错误",
   "onboarding.import.error.invalidWords_other": "{{count}} 单词无效或拼写错误",
   "onboarding.import.method.import.message": "输入另一个加密钱包中的恢复短语",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "输入或粘贴 12 或 字的恢复短语",
   "onboarding.importMnemonic.title": "输入你的恢复短语",
   "onboarding.intro.button.alreadyHave": "我已经有钱包了",
-  "onboarding.intro.title": "欢迎来到<></> Uniswap 钱包",
+  "onboarding.intro.mobileScan.button": "扫描二维码导入",
+  "onboarding.intro.mobileScan.title": "有 Uniswap 应用程序吗？",
   "onboarding.introBetaWaitlist.button.checkEligibility": "检查资格",
   "onboarding.introBetaWaitlist.button.letsGo": "我们走吧",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "在下面输入您的 <highlight>uni.eth</highlight> 用户名，以检查您是否有资格参加 Beta 测试。",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "您仍在候补名单中。当您符合资格时，我们会在 Uniswap 移动应用中通知您！",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "用户名",
   "onboarding.landing.button.add": "添加已有钱包",
-  "onboarding.landing.button.create": "创建一个新钱包",
+  "onboarding.landing.button.create": "创建钱包",
   "onboarding.notification.permission.message": "要接收通知，请在设备设置中开启 Uniswap 钱包的通知。",
   "onboarding.notification.permission.title": "通知权限",
   "onboarding.notification.subtitle": "当你的兑换和授发送完成时收到实时通知。",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "您将其作为仅供查看的钱包",
   "send.recipientSelect.search.empty.message": "当你将代币发送到钱包地址时，它们将显示在这里",
   "send.recipientSelect.search.empty.title": "没有保存钱包",
-  "send.recipientSelect.title": "接受者",
   "send.review.modal.title": "您正在发送",
   "send.review.summary.button.title": "确认发送",
   "send.review.summary.sending": "发送",
-  "send.review.summary.to": "接受者",
   "send.search.empty.subtitle": "你输入的地址不存在或拼写错误。",
   "send.search.empty.title": "未找到结果",
   "send.search.placeholder": "搜索 ENS 或地址",
@@ -612,20 +622,18 @@
   "send.warning.viewOnly.title": "这是一个仅查看钱包",
   "setting.recoveryPhrase.account.show": "显示恢复短语",
   "setting.recoveryPhrase.action.hide": "隐藏恢复短语",
-  "setting.recoveryPhrase.remove.button": "删除恢复短语",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "我了解如果我未能这样做，Uniswap Labs 无法帮助我找回钱包",
+  "setting.recoveryPhrase.remove": "删除恢复短语",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "我了解如果我未能这样做，Uniswap Labs 无法帮助我找回钱包.",
   "setting.recoveryPhrase.remove.confirm.title": "我保存了恢复短语",
-  "setting.recoveryPhrase.remove.initial.subtitle": "确保您已保存恢复短语。否则您将无法使用您的资金",
+  "setting.recoveryPhrase.remove.initial.subtitle": "确保你已保存恢复短语。否则你将无法访问你的钱包",
   "setting.recoveryPhrase.remove.initial.title": "在继续之前",
   "setting.recoveryPhrase.remove.password.error": "密码错误。再试一次",
-  "setting.recoveryPhrase.remove.password.input": "输入密码",
-  "setting.recoveryPhrase.remove.subtitle": "输入您的密码以继续",
+  "setting.recoveryPhrase.remove.subtitle": "输入您的密码以确认",
   "setting.recoveryPhrase.remove.title": "您正在删除恢复短语",
-  "setting.recoveryPhrase.view.error": "密码错误，请重试",
   "setting.recoveryPhrase.view.warning.message1": "任何知道您的恢复短语的人都可以访问您的钱包和资金",
   "setting.recoveryPhrase.view.warning.message2": "私下查看此内容",
-  "setting.recoveryPhrase.view.warning.message3": "不要与任何人分享此内容",
-  "setting.recoveryPhrase.view.warning.message4": "永远不要输入任何网站或应用",
+  "setting.recoveryPhrase.view.warning.message3": "不要与任何人分享",
+  "setting.recoveryPhrase.view.warning.message4": "切勿将其输入到任何网站或应用程序",
   "setting.recoveryPhrase.view.warning.title": "在继续之前",
   "setting.recoveryPhrase.warning.screenshot.message": "任何有权访问你照片的人都可以访问你的钱包。我们建议写下你的恢复短语。",
   "setting.recoveryPhrase.warning.screenshot.title": "屏幕截图不安全",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "显示更少",
   "settings.section.wallet.label.viewOnly": "仅查看",
   "settings.section.wallet.title": "钱包设定",
-  "settings.setting.appearance.option.auto": "自动",
   "settings.setting.appearance.option.dark.subtitle": "一直使用深色主题",
   "settings.setting.appearance.option.dark.title": "深色主题",
   "settings.setting.appearance.option.device.subtitle": "默认为你设备的显示设置",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "我们使用匿名使用数据来增强您对 Uniswap Labs 产品的体验。禁用后，我们仅跟踪错误和基本用法。",
   "settings.setting.privacy.analytics.title": "允许分析",
   "settings.setting.privacy.title": "隐私",
-  "settings.setting.recoveryPhrase.remove": "删除恢复短语",
+  "settings.setting.recoveryPhrase.password.title": "输入密码",
   "settings.setting.recoveryPhrase.title": "恢复短语",
-  "settings.setting.recoveryPhrase.view": "查看恢复短语",
   "settings.setting.smallBalances.title": "隐藏小额余额",
-  "settings.setting.theme.title": "主题",
   "settings.setting.unknownTokens.title": "隐藏未知代币",
   "settings.setting.wallet.action.editLabel": "编辑标签",
   "settings.setting.wallet.action.editProfile": "编辑个人资料",
@@ -729,6 +734,8 @@
   "settings.version": "版本 {{appVersion}}",
   "swap.button.max": "总余额",
   "swap.button.review": "预览",
+  "swap.button.submitting": "提交交换...",
+  "swap.button.submitting.keep.open": "保持你的钱包开放...",
   "swap.button.swap": "兑换",
   "swap.button.unwrap": "拆封",
   "swap.button.view": "查看交易",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "你离线了",
   "swap.warning.priceImpact.message": "由于目前可用的 {{outputCurrencySymbol}} 流动性量，你尝试兑换的 {{inputCurrencySymbol}} 数量越多，你将获得的 {{outputCurrencySymbol}} 就越少。",
   "swap.warning.priceImpact.title": "高价格影响 ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "由于您关闭了应用程序，因此您的交易未提交。",
+  "swap.warning.queuedOrder.approvalFailed": "由于令牌批准失败，您的交易未提交。",
+  "swap.warning.queuedOrder.stale": "由于您关闭了应用程序或审批时间过长，您的交易未提交。",
+  "swap.warning.queuedOrder.submissionFailed": "提交交易时出现问题。",
+  "swap.warning.queuedOrder.title": "已取消掉期",
+  "swap.warning.queuedOrder.wrap.message": "你的 ETH 仍将被包装为 WETH。",
+  "swap.warning.queuedOrder.wrapFailed": "由于包装交易失败，您的交易未提交。",
   "swap.warning.rateLimit.message": "请在几分钟后再试一次。",
   "swap.warning.rateLimit.title": "超过限速",
   "swap.warning.router.message": "你可能已失去连接或网络可能已关闭。如果问题仍然存在，请稍后重试。",
@@ -805,7 +819,6 @@
   "token.balances.other": "其他网络上的余额",
   "token.balances.viewOnly": "{{ownerAddress}}的余额",
   "token.error.unknown": "未知代币",
-  "token.links.contract": "合同",
   "token.links.title": "链接",
   "token.links.twitter": "推特",
   "token.links.website": "网站",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "隐藏代币",
   "tokens.action.unhide": "取消隐藏代币",
   "tokens.hidden.label": "隐藏 ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "查看 {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "无法加载 NFT 合集",
   "tokens.nfts.collection.label.items": "作品",
   "tokens.nfts.collection.label.owners": "拥有者",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "无限",
   "transaction.currency.unknown": "未知代币",
   "transaction.date": "提交于 {{date}}",
+  "transaction.details.dappName": "应用程序",
+  "transaction.details.from": "从",
   "transaction.details.networkFee": "网络费用",
   "transaction.details.transactionId": "交易编号",
   "transaction.network.all": "所有网络",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "发送于 {{externalDappName}}",
   "transaction.status.swap.canceled": "已取消兑换",
   "transaction.status.swap.canceling": "取消兑换",
+  "transaction.status.swap.expired": "掉期已到期",
   "transaction.status.swap.failed": "兑换失败",
+  "transaction.status.swap.insufficientFunds": "不充足的资金",
   "transaction.status.swap.pending": "兑换中",
   "transaction.status.swap.success": "已兑换",
   "transaction.status.swap.successDapp": "{{externalDappName}} 上已兑换",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "向下滚动以进行签名",
   "walletConnect.request.button.sign": "签名",
   "walletConnect.request.details.label.function": "功能",
-  "walletConnect.request.details.label.recipient": "接受者",
   "walletConnect.request.details.label.sending": "发送",
   "walletConnect.request.error.insufficientFunds": "你没有足够的 {{currencySymbol}} 来完成此交易。",
   "walletConnect.request.error.network": "互联网或网络连接错误",
diff --git a/packages/uniswap/src/i18n/locales/translations/zh-TW.json b/packages/uniswap/src/i18n/locales/translations/zh-TW.json
index 78622bba646..f27870757ed 100644
--- a/packages/uniswap/src/i18n/locales/translations/zh-TW.json
+++ b/packages/uniswap/src/i18n/locales/translations/zh-TW.json
@@ -129,6 +129,7 @@
   "common.button.tryAgain": "再試一次",
   "common.button.understand": "我明白",
   "common.button.view": "顯示",
+  "common.button.yes": "是的",
   "common.card.error.description": "出了點問題",
   "common.card.error.title": "哎呀！出了些問題。",
   "common.endAdornment": "和",
@@ -147,9 +148,12 @@
   "common.navigation.settings": "設定",
   "common.navigation.systemSettings": "設定",
   "common.text.connected": "已連接",
+  "common.text.contract": "合約",
   "common.text.disconnected": "已斷開連接",
   "common.text.error": "錯誤",
   "common.text.notAvailable": "不適用",
+  "common.text.recipient": "接收者",
+  "common.text.sender": "從",
   "common.text.unknown": "未知",
   "currency.aud": "澳幣",
   "currency.brl": "巴西雷亞爾",
@@ -171,17 +175,15 @@
   "currency.usd": "美國美元",
   "currency.vnd": "越南盾",
   "dapp.request.approve.action": "核准",
-  "dapp.request.approve.fallbackTitle": "批准支出代幣",
-  "dapp.request.approve.helptext": "允許該網站存取並使用您錢包中的此代幣。",
+  "dapp.request.approve.fallbackTitle": "批准該網站訪問令牌",
+  "dapp.request.approve.helptext": "允許該網站存取並使用此令牌進行交易。確保您信任該網站。",
   "dapp.request.approve.label": "錢包",
-  "dapp.request.approve.title": "核准支出 {{tokenSymbol}}",
+  "dapp.request.approve.title": "批准訪問 {{tokenSymbol}}",
   "dapp.request.base.title": "交易請求",
   "dapp.request.connect.helptext": "允許網站查看您的錢包地址、餘額並請求交易批准。",
   "dapp.request.connect.title": "連接到站點",
   "dapp.request.fallback.calldata.label": "原始數據",
   "dapp.request.fallback.function.label": "功能",
-  "dapp.request.fallback.recipient.label": "接收者",
-  "dapp.request.fallback.sending.label": "發送",
   "dapp.request.permit2.description": "Permit2 管理多個 dapp 的代幣核准。",
   "dapp.request.permit2.header": "簽署許可證2",
   "dapp.request.reject.action": "全部拒絕",
@@ -349,6 +351,13 @@
   "language.ukrainian": "烏克蘭語",
   "language.urdu": "烏爾都語",
   "language.vietnamese": "越南語",
+  "mobile.appRating.button.decline": "並不真地",
+  "mobile.appRating.description": "如果您對此應用程式有良好的體驗，請告訴我們",
+  "mobile.appRating.feedback.button.cancel": "稍後再說",
+  "mobile.appRating.feedback.button.send": "傳送回饋",
+  "mobile.appRating.feedback.description": "讓我們知道如何改善您的體驗",
+  "mobile.appRating.feedback.title": "聽到這個消息我們很遺憾。",
+  "mobile.appRating.title": "喜歡 Uniswap 錢包嗎？",
   "notification.assetVisibility.hidden": "{{assetName}} 隱藏",
   "notification.assetVisibility.unhidden": "{{assetName}} 顯示",
   "notification.copied.address": "地址已複製",
@@ -373,6 +382,7 @@
   "notification.transaction.approve.success": "授權 {{currencySymbol}} 與 {{address}}一起使用。",
   "notification.transaction.pending": "交易待處理",
   "notification.transaction.swap.canceled": "已取消兌換 {{inputCurrencySymbol}}-{{outputCurrencySymbol}}。",
+  "notification.transaction.swap.expired": "{{inputCurrencyAmountWithSymbol}} 兌換 {{outputCurrencyAmountWithSymbol}} 交換已過期。",
   "notification.transaction.swap.fail": "失敗兌換 {{inputCurrencyAmountWithSymbol}} 成 {{outputCurrencyAmountWithSymbol}}",
   "notification.transaction.swap.success": "{{inputCurrencyAmountWithSymbol}} 已兌換成 {{outputCurrencyAmountWithSymbol}}。",
   "notification.transaction.transfer.canceled": "已取消發送 {{tokenNameOrAddress}}。",
@@ -399,13 +409,14 @@
   "notifications.scantastic.subtitle": "繼續使用 Uniswap 擴展",
   "notifications.scantastic.title": "成功!",
   "onboarding.backup.manual.banner": "最好將其寫在一張紙上並將其存儲在安全的地方或安全的密碼管理器中。",
+  "onboarding.backup.manual.error": "單字無效或拼字錯誤",
   "onboarding.backup.manual.placeholder": "悄悄話",
   "onboarding.backup.manual.progress": "{{completedStepsCount}}/{{totalStepsCount}} 已完成",
   "onboarding.backup.manual.selectedWordPlaceholder": "選擇單字",
-  "onboarding.backup.manual.subtitle_one": "<highlight/>{{count}}是什麼</highlight/>您的恢復短語中的單字？",
-  "onboarding.backup.manual.subtitle_two": "<highlight/>{{count}}是什麼</highlight/>您的恢復短語中的單字？",
-  "onboarding.backup.manual.subtitle_few": "<highlight/>{{count}}是什麼</highlight/>您的恢復短語中的單字？",
-  "onboarding.backup.manual.subtitle_other": "<highlight/>{{count}}是什麼</highlight/>您的恢復短語中的單字？",
+  "onboarding.backup.manual.subtitle_one": "{{count}}是什麼您的恢復短語中的單字？",
+  "onboarding.backup.manual.subtitle_two": "{{count}}是什麼您的恢復短語中的單字？",
+  "onboarding.backup.manual.subtitle_few": "{{count}}是什麼您的恢復短語中的單字？",
+  "onboarding.backup.manual.subtitle_other": "{{count}}是什麼您的恢復短語中的單字？",
   "onboarding.backup.manual.title": "讓我們確保您已正確記錄",
   "onboarding.backup.option.cloud.description": "使用安全密碼加密你的復原短語",
   "onboarding.backup.option.cloud.title": "{{cloudProviderName}} 備份",
@@ -414,7 +425,7 @@
   "onboarding.backup.subtitle": "如果你刪除 APP 或遺失設備，備份可以讓你恢復錢包",
   "onboarding.backup.title.existing": "備份你的錢包",
   "onboarding.backup.title.new": "選擇備份方法",
-  "onboarding.backup.view.disclaimer": "我了解如果我丟失了恢復短語，Uniswap Labs 無法幫助我恢復它",
+  "onboarding.backup.view.disclaimer": "我了解如果我丟失了恢復短語，Uniswap Labs 無法幫助我恢復它.",
   "onboarding.backup.view.subtitle.message1": "在繼續之前請仔細閱讀以下內容",
   "onboarding.backup.view.subtitle.message2": "您需要輸入全部 12 個密碼才能恢復您的錢包。",
   "onboarding.backup.view.title": "寫下您的恢復短語",
@@ -431,13 +442,13 @@
   "onboarding.complete.pin.description": "點擊圖釘圖示將 Uniswap 擴充功能新增到工具列。",
   "onboarding.complete.pin.title": "Pin Uniswap 擴充",
   "onboarding.complete.title": "你已經準備好了",
-  "onboarding.extension.connectMobile.button": "從您的手機匯入",
-  "onboarding.extension.connectMobile.title": "有 Uniswap 應用程式嗎？",
   "onboarding.extension.getOnTheBetaWaitlist.subtitle": "下載行動應用程式以索取用戶名",
   "onboarding.extension.getOnTheBetaWaitlist.title": "進入測試版候補名單",
   "onboarding.extension.password.subtitle": "您需要它來解鎖您的錢包並訪問您的恢復短語",
   "onboarding.extension.password.title.default": "建立密碼",
   "onboarding.extension.password.title.reset": "重置你的密碼",
+  "onboarding.extension.unsupported.description": "Uniswap 擴充功能目前僅與 Chrome 相容。",
+  "onboarding.extension.unsupported.title": "尚不支援此瀏覽器",
   "onboarding.import.error.invalidWords_one": "1 個字無效或拼字錯誤",
   "onboarding.import.error.invalidWords_other": "{{count}} 字無效或拼字錯誤",
   "onboarding.import.method.import.message": "輸入另一個加密錢包中的恢復短語",
@@ -461,7 +472,8 @@
   "onboarding.importMnemonic.subtitle": "輸入或貼上 12 或 字的恢復短語",
   "onboarding.importMnemonic.title": "輸入你的恢復短語",
   "onboarding.intro.button.alreadyHave": "我已經有錢包了",
-  "onboarding.intro.title": "歡迎來到 \nUniswap 錢包",
+  "onboarding.intro.mobileScan.button": "掃描二維碼導入",
+  "onboarding.intro.mobileScan.title": "有 Uniswap 應用程式嗎？",
   "onboarding.introBetaWaitlist.button.checkEligibility": "檢查資格",
   "onboarding.introBetaWaitlist.button.letsGo": "我們走吧",
   "onboarding.introBetaWaitlist.checkEligibilityInstructions": "在下面輸入您的 <highlight>uni.eth</highlight> 用戶名，檢查您是否有資格參加測試版。",
@@ -470,7 +482,7 @@
   "onboarding.introBetaWaitlist.ineligibleExplanation": "您仍在候補名單上。當您符合資格時，我們將在 Uniswap 行動應用程式中通知您！",
   "onboarding.introBetaWaitlist.unitagPlaceholder": "使用者名稱",
   "onboarding.landing.button.add": "添加已有錢包",
-  "onboarding.landing.button.create": "創建一個新錢包",
+  "onboarding.landing.button.create": "創建錢包",
   "onboarding.notification.permission.message": "要接收通知，請在設備設定中開啟 Uniswap 錢包的通知。",
   "onboarding.notification.permission.title": "通知權限",
   "onboarding.notification.subtitle": "當你的兌換和發送完成時收到實時通知。",
@@ -573,11 +585,9 @@
   "send.recipient.warning.viewOnly.title": "您將其作為僅供查看的錢包",
   "send.recipientSelect.search.empty.message": "當您將代幣發送到錢包地址時，它們會顯示在此處",
   "send.recipientSelect.search.empty.title": "沒有保存錢包",
-  "send.recipientSelect.title": "接收者",
   "send.review.modal.title": "你正在發送",
   "send.review.summary.button.title": "確認發送",
   "send.review.summary.sending": "發送",
-  "send.review.summary.to": "接收者",
   "send.search.empty.subtitle": "你輸入的地址不存在或拼字錯誤。",
   "send.search.empty.title": "未找到結果",
   "send.search.placeholder": "搜尋 ENS 或地址",
@@ -612,19 +622,17 @@
   "send.warning.viewOnly.title": "這是一個僅查看錢包",
   "setting.recoveryPhrase.account.show": "顯示恢復短語",
   "setting.recoveryPhrase.action.hide": "隱藏恢復短語",
-  "setting.recoveryPhrase.remove.button": "刪除恢復短語",
-  "setting.recoveryPhrase.remove.confirm.subtitle": "我了解如果我未能這樣做，Uniswap Labs 無法幫我找回錢包",
+  "setting.recoveryPhrase.remove": "刪除恢復短語",
+  "setting.recoveryPhrase.remove.confirm.subtitle": "我了解如果我未能這樣做，Uniswap Labs 無法幫我找回錢包.",
   "setting.recoveryPhrase.remove.confirm.title": "我保存了恢復短語",
-  "setting.recoveryPhrase.remove.initial.subtitle": "確保您已儲存恢復短語。否則您將無法使用您的資金",
+  "setting.recoveryPhrase.remove.initial.subtitle": "確保您已儲存恢復短語。否則您將無法存取您的錢包",
   "setting.recoveryPhrase.remove.initial.title": "在繼續之前",
   "setting.recoveryPhrase.remove.password.error": "密碼錯誤。再試一次",
-  "setting.recoveryPhrase.remove.password.input": "輸入密碼",
-  "setting.recoveryPhrase.remove.subtitle": "輸入您的密碼以繼續",
+  "setting.recoveryPhrase.remove.subtitle": "輸入您的密碼進行確認",
   "setting.recoveryPhrase.remove.title": "您正在刪除恢復短語",
-  "setting.recoveryPhrase.view.error": "密碼錯誤，請重試",
   "setting.recoveryPhrase.view.warning.message1": "任何知道您的恢復短語的人都可以訪問您的錢包和資金",
   "setting.recoveryPhrase.view.warning.message2": "私下查看此內容",
-  "setting.recoveryPhrase.view.warning.message3": "不要與任何人分享此內容",
+  "setting.recoveryPhrase.view.warning.message3": "不要與任何人分享",
   "setting.recoveryPhrase.view.warning.message4": "切勿將其輸入任何網站或應用程式",
   "setting.recoveryPhrase.view.warning.title": "在繼續之前",
   "setting.recoveryPhrase.warning.screenshot.message": "任何有權存取你照片的人都可以存取你的錢包。我們建議你寫下你的話。",
@@ -646,7 +654,6 @@
   "settings.section.wallet.button.viewLess": "顯示更少",
   "settings.section.wallet.label.viewOnly": "僅查看",
   "settings.section.wallet.title": "錢包設定",
-  "settings.setting.appearance.option.auto": "自動",
   "settings.setting.appearance.option.dark.subtitle": "一直使用深色主題",
   "settings.setting.appearance.option.dark.title": "深色主題",
   "settings.setting.appearance.option.device.subtitle": "預設為你設備的顯示設置",
@@ -710,11 +717,9 @@
   "settings.setting.privacy.analytics.description": "我們使用匿名使用資料來增強您對 Uniswap Labs 產品的體驗。停用後，我們僅追蹤錯誤和基本用法。",
   "settings.setting.privacy.analytics.title": "允許分析",
   "settings.setting.privacy.title": "隱私",
-  "settings.setting.recoveryPhrase.remove": "刪除恢復短語",
+  "settings.setting.recoveryPhrase.password.title": "輸入您的密碼",
   "settings.setting.recoveryPhrase.title": "恢復短語",
-  "settings.setting.recoveryPhrase.view": "查看恢復短語",
   "settings.setting.smallBalances.title": "隱藏小額餘額",
-  "settings.setting.theme.title": "主題",
   "settings.setting.unknownTokens.title": "隱藏未知代幣",
   "settings.setting.wallet.action.editLabel": "編輯標籤",
   "settings.setting.wallet.action.editProfile": "編輯個人資料",
@@ -729,6 +734,8 @@
   "settings.version": "版本 {{appVersion}}",
   "swap.button.max": "總餘額",
   "swap.button.review": "預覽",
+  "swap.button.submitting": "正在提交交換...",
+  "swap.button.submitting.keep.open": "錢包要打開...",
   "swap.button.swap": "兌換",
   "swap.button.unwrap": "拆封",
   "swap.button.view": "查看交易",
@@ -793,6 +800,13 @@
   "swap.warning.offline.title": "你離線了",
   "swap.warning.priceImpact.message": "由於目前可用流動性為 {{outputCurrencySymbol}} ，你嘗試兌換的流動性 {{inputCurrencySymbol}} 多，你接收的 {{outputCurrencySymbol}} 就越少。",
   "swap.warning.priceImpact.title": "高價格影響 ({{priceImpactValue}})",
+  "swap.warning.queuedOrder.appClosed": "由於您關閉了應用程序，因此您的交易未提交。",
+  "swap.warning.queuedOrder.approvalFailed": "由於令牌審批失敗，您的交易未提交。",
+  "swap.warning.queuedOrder.stale": "您的交易未提交，因為您關閉了應用程式或審批時間過長。",
+  "swap.warning.queuedOrder.submissionFailed": "提交您的交易時出現問題。",
+  "swap.warning.queuedOrder.title": "掉期已取消",
+  "swap.warning.queuedOrder.wrap.message": "您的 ETH 將保留為 WETH。",
+  "swap.warning.queuedOrder.wrapFailed": "由於打包交易失敗，您的交易未提交。",
   "swap.warning.rateLimit.message": "請在幾分鐘後再試一次。",
   "swap.warning.rateLimit.title": "超過限速",
   "swap.warning.router.message": "你可能已失去連線或網路可能已關閉。如果問題仍然存在，請稍後重試。",
@@ -805,7 +819,6 @@
   "token.balances.other": "其他網路上的餘額",
   "token.balances.viewOnly": "{{ownerAddress}}的餘額",
   "token.error.unknown": "未知代幣",
-  "token.links.contract": "合約",
   "token.links.title": "鏈接",
   "token.links.twitter": "推特",
   "token.links.website": "網站",
@@ -835,6 +848,7 @@
   "tokens.action.hide": "隱藏代幣",
   "tokens.action.unhide": "取消隱藏代幣",
   "tokens.hidden.label": "隱藏 ({{numHidden}})",
+  "tokens.nfts.action.viewOnExplorer": "查看 {{blockExplorerName}}",
   "tokens.nfts.collection.error.load.title": "無法載入 NFT 合集",
   "tokens.nfts.collection.label.items": "作品",
   "tokens.nfts.collection.label.owners": "擁有者",
@@ -884,6 +898,8 @@
   "transaction.amount.unlimited": "無限",
   "transaction.currency.unknown": "未知代幣",
   "transaction.date": "提交於 {{date}}",
+  "transaction.details.dappName": "應用程式",
+  "transaction.details.from": "從",
   "transaction.details.networkFee": "網路費用",
   "transaction.details.transactionId": "交易ID",
   "transaction.network.all": "所有網路",
@@ -953,7 +969,9 @@
   "transaction.status.send.successDapp": "寄於 {{externalDappName}}",
   "transaction.status.swap.canceled": "已取消兌換",
   "transaction.status.swap.canceling": "取消兌換",
+  "transaction.status.swap.expired": "掉期已過期",
   "transaction.status.swap.failed": "兌換失敗",
+  "transaction.status.swap.insufficientFunds": "不充足的資金",
   "transaction.status.swap.pending": "兌換中",
   "transaction.status.swap.success": "已兌換",
   "transaction.status.swap.successDapp": "{{externalDappName}} 上已兌換",
@@ -1071,7 +1089,6 @@
   "walletConnect.request.button.scrollDown": "向下捲動以簽名",
   "walletConnect.request.button.sign": "签名",
   "walletConnect.request.details.label.function": "功能",
-  "walletConnect.request.details.label.recipient": "接收者",
   "walletConnect.request.details.label.sending": "發送",
   "walletConnect.request.error.insufficientFunds": "你沒有足夠的 {{currencySymbol}} 來完成此交易。",
   "walletConnect.request.error.network": "網路或網路連線錯誤",
diff --git a/packages/uniswap/src/react-native-dotenv.d.ts b/packages/uniswap/src/react-native-dotenv.d.ts
index aa54c55db59..b6afc5f4cbb 100644
--- a/packages/uniswap/src/react-native-dotenv.d.ts
+++ b/packages/uniswap/src/react-native-dotenv.d.ts
@@ -3,6 +3,9 @@
 declare module 'react-native-dotenv' {
   export const APPSFLYER_API_KEY: string
   export const APPSFLYER_APP_ID: string
+  export const MOONPAY_API_KEY: string
+  export const MOONPAY_API_URL: string
+  export const MOONPAY_WIDGET_API_URL: string
   export const UNISWAP_API_KEY: string
   export const INFURA_KEY: string
   export const INFURA_PROJECT_ID: string
diff --git a/packages/uniswap/src/test/fixtures/index.ts b/packages/uniswap/src/test/fixtures/index.ts
index 4a4a8b3333c..def94ce4501 100644
--- a/packages/uniswap/src/test/fixtures/index.ts
+++ b/packages/uniswap/src/test/fixtures/index.ts
@@ -1,2 +1 @@
 export * from './events'
-export * from './wallet'
diff --git a/packages/uniswap/src/test/fixtures/testIDs.ts b/packages/uniswap/src/test/fixtures/testIDs.ts
index f5554a7350c..c119ea58f46 100644
--- a/packages/uniswap/src/test/fixtures/testIDs.ts
+++ b/packages/uniswap/src/test/fixtures/testIDs.ts
@@ -3,9 +3,6 @@
  */
 export const TestID = {
   AccountCard: 'account-card',
-  AccountHeaderAvatar: 'account-header-avatar',
-  AccountHeaderCopyAddress: 'account-header-copy-address',
-  ActivityTab: 'activity-tab',
   AddCloudBackup: 'add-cloud-backup',
   AddManualBackup: 'add-manual-backup',
   AmountInputIn: 'amount-input-in',
@@ -23,15 +20,12 @@ export const TestID = {
   Favorite: 'favorite',
   ImportAccount: 'import-account',
   ImportAccountInput: 'import-account-input',
+  Manage: 'manage',
   Next: 'next',
-  NFTsTab: 'NFTs-tab',
-  NotificationToastTitle: 'notification-toast-title',
   OK: 'ok',
   OnboardingImportSeedPhrase: 'onboarding-import-seed-phrase',
   OpenDeviceLanguageSettings: 'open-device-language-settings',
   QRCodeModalToggle: 'qr-code-modal-toggle',
-  PortfolioBalance: 'portfolio-balance',
-  PortfolioRelativeChange: 'portfolio-relative-change',
   Remove: 'remove',
   ReviewSwap: 'review-swap',
   RestoreFromCloud: 'restore-from-cloud',
@@ -46,7 +40,6 @@ export const TestID = {
   SendReview: 'send-review',
   SetMaxInput: 'set-max-input',
   SetMaxOutput: 'set-max-output',
-  ShowHiddenTokens: 'show-hidden-tokens',
   Skip: 'skip',
   Submit: 'submit',
   Swap: 'swap',
@@ -54,7 +47,6 @@ export const TestID = {
   SwapSettings: 'swap-settings',
   SwitchCurrenciesButton: 'switch-currencies-button',
   TokenSelectorToggle: 'token-selector-toggle',
-  TokensTab: 'tokens-tab',
   TokenWarningAccept: 'token-warning-accept',
   WalletCard: 'wallet-card',
   WalletNameInput: 'wallet-name-input',
diff --git a/packages/uniswap/src/test/fixtures/wallet/index.ts b/packages/uniswap/src/test/fixtures/wallet/index.ts
deleted file mode 100644
index 3c851f79847..00000000000
--- a/packages/uniswap/src/test/fixtures/wallet/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './currencies'
diff --git a/packages/uniswap/src/test/render.tsx b/packages/uniswap/src/test/render.tsx
index f6ed5852a44..38ee4111586 100644
--- a/packages/uniswap/src/test/render.tsx
+++ b/packages/uniswap/src/test/render.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-imports */
+
 import { render as RNRender, RenderOptions, RenderResult } from '@testing-library/react-native'
 import { PropsWithChildren } from 'react'
 import { TamaguiProvider } from 'ui/src'
diff --git a/packages/uniswap/src/test/test-utils.ts b/packages/uniswap/src/test/test-utils.ts
index a7873920875..0e953d01589 100644
--- a/packages/uniswap/src/test/test-utils.ts
+++ b/packages/uniswap/src/test/test-utils.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-restricted-imports */
+
 import { renderWithProviders } from 'uniswap/src/test/render'
 
 // re-export everything
diff --git a/packages/uniswap/src/test/utils/index.ts b/packages/uniswap/src/test/utils/index.ts
deleted file mode 100644
index 8fd24633732..00000000000
--- a/packages/uniswap/src/test/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './factory'
diff --git a/packages/uniswap/src/utils/currency.ts b/packages/uniswap/src/utils/currency.ts
index 527c47f0cfe..704ee7336e5 100644
--- a/packages/uniswap/src/utils/currency.ts
+++ b/packages/uniswap/src/utils/currency.ts
@@ -1,7 +1,3 @@
-import { Token } from '@uniswap/sdk-core'
-import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
-import { UniverseChainId } from 'uniswap/src/types/chains'
-
 const DEFAULT_MAX_SYMBOL_CHARACTERS = 6
 
 export function getSymbolDisplayText(symbol: Maybe<string>): Maybe<string> {
@@ -13,14 +9,3 @@ export function getSymbolDisplayText(symbol: Maybe<string>): Maybe<string> {
     ? symbol?.substring(0, DEFAULT_MAX_SYMBOL_CHARACTERS - 3) + '...'
     : symbol
 }
-
-export function wrappedNativeCurrency(chainId: UniverseChainId): Token {
-  const wrappedCurrencyInfo = UNIVERSE_CHAIN_INFO[chainId].wrappedNativeCurrency
-  return new Token(
-    chainId,
-    wrappedCurrencyInfo.address,
-    wrappedCurrencyInfo.decimals,
-    wrappedCurrencyInfo.symbol,
-    wrappedCurrencyInfo.name,
-  )
-}
diff --git a/packages/uniswap/src/utils/link.native.ts b/packages/uniswap/src/utils/link.native.ts
deleted file mode 100644
index cd902a09a94..00000000000
--- a/packages/uniswap/src/utils/link.native.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Linking } from 'react-native'
-
-export async function openURL(url: string): Promise<void> {
-  await Linking.openURL(url)
-}
-
-export async function canOpenURL(url: string): Promise<boolean> {
-  return await Linking.canOpenURL(url)
-}
diff --git a/packages/uniswap/src/utils/link.ts b/packages/uniswap/src/utils/link.ts
deleted file mode 100644
index ff72b86f0f2..00000000000
--- a/packages/uniswap/src/utils/link.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { NotImplementedError } from 'utilities/src/errors'
-
-export function openURL(_url: string): Window | null {
-  throw new NotImplementedError('See `.native.ts` and `.web.ts` files.')
-}
-
-export function canOpenURL(_url: string): boolean {
-  throw new NotImplementedError('See `.native.ts` and `.web.ts` files.')
-}
diff --git a/packages/uniswap/src/utils/link.web.ts b/packages/uniswap/src/utils/link.web.ts
deleted file mode 100644
index 821670c9081..00000000000
--- a/packages/uniswap/src/utils/link.web.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export function openURL(url: string): Window | null {
-  // eslint-disable-next-line security/detect-non-literal-fs-filename
-  return window.open(url)
-}
-
-export function canOpenURL(_url: string): boolean {
-  return true
-}
diff --git a/packages/uniswap/src/utils/linking.ts b/packages/uniswap/src/utils/linking.ts
deleted file mode 100644
index 5c21768a372..00000000000
--- a/packages/uniswap/src/utils/linking.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import * as WebBrowser from 'expo-web-browser'
-import { colorsLight } from 'ui/src/theme'
-import { canOpenURL, openURL } from 'uniswap/src/utils/link'
-import { logger } from 'utilities/src/logger/logger'
-
-const ALLOWED_EXTERNAL_URI_SCHEMES = ['http://', 'https://']
-
-/**
- * Opens allowed URIs. if isSafeUri is set to true then this will open http:// and https:// as well as some deeplinks.
- * Only set this flag to true if you have formed the URL yourself in our own app code. For any URLs from an external source
- * isSafeUri must be false and it will only open http:// and https:// URI schemes.
- *
- * @param openExternalBrowser whether to leave the app and open in system browser. default is false, opens in-app browser window
- * @param isSafeUri whether to bypass ALLOWED_EXTERNAL_URI_SCHEMES check
- * @param controlsColor When opening in an in-app browser, determines the controls color
- **/
-export async function openUri(
-  uri: string,
-  openExternalBrowser = false,
-  isSafeUri = false,
-  // NOTE: okay to use colors object directly as we want the same color for light/dark modes
-  controlsColor = colorsLight.accent1,
-): Promise<void> {
-  const trimmedURI = uri.trim()
-  if (!isSafeUri && !ALLOWED_EXTERNAL_URI_SCHEMES.some((scheme) => trimmedURI.startsWith(scheme))) {
-    // TODO: [MOB-253] show a visual warning that the link cannot be opened.
-    logger.error(new Error('User attempted to open potentially unsafe url'), {
-      tags: {
-        file: 'linking',
-        function: 'openUri',
-      },
-      extra: { uri },
-    })
-    return
-  }
-
-  const isHttp = /^https?:\/\//.test(trimmedURI)
-
-  // `canOpenURL` returns `false` for App Links / Universal Links, so we just assume any device can handle the `https://` protocol.
-  const supported = isHttp ? true : await canOpenURL(uri)
-
-  if (!supported) {
-    logger.warn('linking', 'openUri', `Cannot open URI: ${uri}`)
-    return
-  }
-
-  try {
-    if (openExternalBrowser) {
-      await openURL(uri)
-    } else {
-      await WebBrowser.openBrowserAsync(uri, {
-        controlsColor,
-        presentationStyle: WebBrowser.WebBrowserPresentationStyle.FULL_SCREEN,
-        windowFeatures: 'popup=false',
-      })
-    }
-  } catch (error) {
-    logger.error(error, { tags: { file: 'linking', function: 'openUri' } })
-  }
-}
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
index 4daa293d9bb..405ef0646f7 100644
--- a/packages/utilities/package.json
+++ b/packages/utilities/package.json
@@ -17,7 +17,7 @@
     "@sentry/react": "7.80.0",
     "@sentry/react-native": "5.5.0",
     "@uniswap/analytics": "1.7.0",
-    "@uniswap/analytics-events": "2.34.0",
+    "@uniswap/analytics-events": "2.32.0",
     "@uniswap/sdk-core": "5.3.0",
     "aws-appsync-auth-link": "3.0.7",
     "aws-appsync-subscription-link": "3.1.3",
diff --git a/packages/utilities/src/addresses/addresses.test.ts b/packages/utilities/src/addresses/addresses.test.ts
index b98febcaf7c..450ab64f0f9 100644
--- a/packages/utilities/src/addresses/addresses.test.ts
+++ b/packages/utilities/src/addresses/addresses.test.ts
@@ -8,12 +8,18 @@ describe('utils', () => {
     })
 
     it('returns the checksummed address', () => {
-      expect(isAddress('0xf164fc0ec4e93095b804a4795bbe1e041497b92a')).toBe('0xf164fC0Ec4E93095b804a4795bBe1e041497b92a')
-      expect(isAddress('0xf164fC0Ec4E93095b804a4795bBe1e041497b92a')).toBe('0xf164fC0Ec4E93095b804a4795bBe1e041497b92a')
+      expect(isAddress('0xf164fc0ec4e93095b804a4795bbe1e041497b92a')).toBe(
+        '0xf164fC0Ec4E93095b804a4795bBe1e041497b92a'
+      )
+      expect(isAddress('0xf164fC0Ec4E93095b804a4795bBe1e041497b92a')).toBe(
+        '0xf164fC0Ec4E93095b804a4795bBe1e041497b92a'
+      )
     })
 
     it('succeeds even without prefix', () => {
-      expect(isAddress('f164fc0ec4e93095b804a4795bbe1e041497b92a')).toBe('0xf164fC0Ec4E93095b804a4795bBe1e041497b92a')
+      expect(isAddress('f164fc0ec4e93095b804a4795bbe1e041497b92a')).toBe(
+        '0xf164fC0Ec4E93095b804a4795bBe1e041497b92a'
+      )
     })
 
     it('fails if too long', () => {
@@ -35,7 +41,9 @@ describe('utils', () => {
     })
 
     it('renders checksummed address', () => {
-      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC'.toLowerCase())).toBe('0x2E1b...54CC')
+      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC'.toLowerCase())).toBe(
+        '0x2E1b...54CC'
+      )
     })
 
     it('allows undefined', () => {
@@ -44,9 +52,13 @@ describe('utils', () => {
 
     it('allows custom amounts of start/end chars', () => {
       expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 2)).toBe('0x2E...54CC')
-      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 6)).toBe('0x2E1b34...54CC')
+      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 6)).toBe(
+        '0x2E1b34...54CC'
+      )
       expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 2, 2)).toBe('0x2E...CC')
-      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 2, 6)).toBe('0x2E...c254CC')
+      expect(shortenAddress('0x2E1b342132A67Ea578e4E3B814bae2107dc254CC', 2, 6)).toBe(
+        '0x2E...c254CC'
+      )
     })
   })
 })
diff --git a/packages/utilities/src/device/locales.native.test.ts b/packages/utilities/src/device/locales.native.test.ts
index ef1b21d6a8e..b15e0b5093b 100644
--- a/packages/utilities/src/device/locales.native.test.ts
+++ b/packages/utilities/src/device/locales.native.test.ts
@@ -25,6 +25,8 @@ jest.mock('expo-localization', () => ({
 describe(getDeviceLocales, () => {
   it('should return the device locale', () => {
     expect(getDeviceLocales).not.toThrow()
-    expect(getDeviceLocales()).toEqual([{ languageCode: MOCK_LANGUAGE_CODE, languageTag: MOCK_LANGUAGE_TAG }])
+    expect(getDeviceLocales()).toEqual([
+      { languageCode: MOCK_LANGUAGE_CODE, languageTag: MOCK_LANGUAGE_TAG },
+    ])
   })
 })
diff --git a/packages/utilities/src/device/locales.web.test.ts b/packages/utilities/src/device/locales.web.test.ts
index 4eaf46d8289..427ec6625df 100644
--- a/packages/utilities/src/device/locales.web.test.ts
+++ b/packages/utilities/src/device/locales.web.test.ts
@@ -8,7 +8,9 @@ describe(getDeviceLocales, () => {
 
   it('should return the device locale', () => {
     expect(getDeviceLocales).not.toThrow()
-    expect(getDeviceLocales()).toEqual([{ languageCode: MOCK_LANGUAGE, languageTag: MOCK_LANGUAGE }])
+    expect(getDeviceLocales()).toEqual([
+      { languageCode: MOCK_LANGUAGE, languageTag: MOCK_LANGUAGE },
+    ])
   })
 
   it('should return the default locale if an error occurs', () => {
@@ -17,6 +19,8 @@ describe(getDeviceLocales, () => {
     })
 
     expect(getDeviceLocales).not.toThrow()
-    expect(getDeviceLocales()).toEqual([{ languageCode: DEFAULT_LANGUAGE_CODE, languageTag: DEFAULT_LANGUAGE_TAG }])
+    expect(getDeviceLocales()).toEqual([
+      { languageCode: DEFAULT_LANGUAGE_CODE, languageTag: DEFAULT_LANGUAGE_TAG },
+    ])
   })
 })
diff --git a/packages/utilities/src/format/localeBased.test.ts b/packages/utilities/src/format/localeBased.test.ts
index 009ae53c610..e06ec332b0d 100644
--- a/packages/utilities/src/format/localeBased.test.ts
+++ b/packages/utilities/src/format/localeBased.test.ts
@@ -2,131 +2,279 @@ import { formatNumber } from 'utilities/src/format/localeBased'
 import { NumberType } from 'utilities/src/format/types'
 
 it('formats token reference numbers correctly', () => {
-  expect(formatNumber({ input: 1234567000000000, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('>999T')
-  expect(formatNumber({ input: 1002345, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('1.00M')
-  expect(formatNumber({ input: 1234, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('1,234.00')
-  expect(formatNumber({ input: 0.00909, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('0.009')
-  expect(formatNumber({ input: 0.09001, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('0.090')
-  expect(formatNumber({ input: 0.00099, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('<0.001')
+  expect(
+    formatNumber({ input: 1234567000000000, type: NumberType.TokenNonTx, locale: 'en-US' })
+  ).toBe('>999T')
+  expect(formatNumber({ input: 1002345, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe(
+    '1.00M'
+  )
+  expect(formatNumber({ input: 1234, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe(
+    '1,234.00'
+  )
+  expect(formatNumber({ input: 0.00909, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe(
+    '0.009'
+  )
+  expect(formatNumber({ input: 0.09001, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe(
+    '0.090'
+  )
+  expect(formatNumber({ input: 0.00099, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe(
+    '<0.001'
+  )
   expect(formatNumber({ input: 0, type: NumberType.TokenNonTx, locale: 'en-US' })).toBe('0')
 })
 
 it('formats token transaction numbers correctly', () => {
-  expect(formatNumber({ input: 1234567.8901, type: NumberType.TokenTx, locale: 'en-US' })).toBe('1,234,567.89')
-  expect(formatNumber({ input: 765432.1, type: NumberType.TokenTx, locale: 'en-US' })).toBe('765,432.10')
-
-  expect(formatNumber({ input: 7654.321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('7,654.32')
-  expect(formatNumber({ input: 765.4321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('765.432')
-  expect(formatNumber({ input: 76.54321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('76.5432')
-  expect(formatNumber({ input: 7.654321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('7.65432')
-  expect(formatNumber({ input: 7.60000054321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('7.60')
+  expect(formatNumber({ input: 1234567.8901, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '1,234,567.89'
+  )
+  expect(formatNumber({ input: 765432.1, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '765,432.10'
+  )
+
+  expect(formatNumber({ input: 7654.321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '7,654.32'
+  )
+  expect(formatNumber({ input: 765.4321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '765.432'
+  )
+  expect(formatNumber({ input: 76.54321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '76.5432'
+  )
+  expect(formatNumber({ input: 7.654321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '7.65432'
+  )
+  expect(formatNumber({ input: 7.60000054321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '7.60'
+  )
   expect(formatNumber({ input: 7.6, type: NumberType.TokenTx, locale: 'en-US' })).toBe('7.60')
   expect(formatNumber({ input: 7, type: NumberType.TokenTx, locale: 'en-US' })).toBe('7.00')
 
-  expect(formatNumber({ input: 0.987654321, type: NumberType.TokenTx, locale: 'en-US' })).toBe('0.98765')
+  expect(formatNumber({ input: 0.987654321, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '0.98765'
+  )
   expect(formatNumber({ input: 0.9, type: NumberType.TokenTx, locale: 'en-US' })).toBe('0.90')
-  expect(formatNumber({ input: 0.901000123, type: NumberType.TokenTx, locale: 'en-US' })).toBe('0.901')
+  expect(formatNumber({ input: 0.901000123, type: NumberType.TokenTx, locale: 'en-US' })).toBe(
+    '0.901'
+  )
   expect(formatNumber({ input: 1e-9, type: NumberType.TokenTx, locale: 'en-US' })).toBe('<0.00001')
   expect(formatNumber({ input: 0, type: NumberType.TokenTx, locale: 'en-US' })).toBe('0')
 })
 
 it('formats fiat estimates on token details pages correctly', () => {
-  expect(formatNumber({ input: 1234567.891, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$1.23M')
-  expect(formatNumber({ input: 1234.5678, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$1,234.57')
-  expect(formatNumber({ input: 1.048942, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$1.049')
+  expect(
+    formatNumber({ input: 1234567.891, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$1.23M')
+  expect(
+    formatNumber({ input: 1234.5678, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$1,234.57')
+  expect(
+    formatNumber({ input: 1.048942, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$1.049')
 
-  expect(formatNumber({ input: 0.001231, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$0.00123')
-  expect(formatNumber({ input: 0.00001231, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$0.0000123')
+  expect(
+    formatNumber({ input: 0.001231, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$0.00123')
+  expect(
+    formatNumber({ input: 0.00001231, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$0.0000123')
 
-  expect(formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('$0.000000123')
-  expect(formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenDetails, locale: 'en-US' })).toBe('<$0.00000001')
+  expect(
+    formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('$0.000000123')
+  expect(
+    formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenDetails, locale: 'en-US' })
+  ).toBe('<$0.00000001')
 })
 
 it('formats fiat estimates for tokens correctly', () => {
-  expect(formatNumber({ input: 1234567.891, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$1.23M')
-  expect(formatNumber({ input: 1234.5678, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$1,234.57')
+  expect(
+    formatNumber({ input: 1234567.891, type: NumberType.FiatTokenPrice, locale: 'en-US' })
+  ).toBe('$1.23M')
+  expect(formatNumber({ input: 1234.5678, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe(
+    '$1,234.57'
+  )
 
-  expect(formatNumber({ input: 0.010235, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.0102')
-  expect(formatNumber({ input: 0.001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.00123')
-  expect(formatNumber({ input: 0.00001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.0000123')
+  expect(formatNumber({ input: 0.010235, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe(
+    '$0.0102'
+  )
+  expect(formatNumber({ input: 0.001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe(
+    '$0.00123'
+  )
+  expect(
+    formatNumber({ input: 0.00001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })
+  ).toBe('$0.0000123')
 
-  expect(formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.000000123')
-  expect(formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.00000001')
+  expect(formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe(
+    '$0.000000123'
+  )
+  expect(formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe(
+    '<$0.00000001'
+  )
 })
 
 it('formats fiat estimates for token stats correctly', () => {
-  expect(formatNumber({ input: 1234576, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('$1.2M')
-  expect(formatNumber({ input: 234567, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('$234.6K')
-  expect(formatNumber({ input: 123.456, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('$123.46')
-  expect(formatNumber({ input: 1.23, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('$1.23')
-  expect(formatNumber({ input: 0.123, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('$0.12')
-  expect(formatNumber({ input: 0.00123, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('<$0.01')
+  expect(formatNumber({ input: 1234576, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '$1.2M'
+  )
+  expect(formatNumber({ input: 234567, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '$234.6K'
+  )
+  expect(formatNumber({ input: 123.456, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '$123.46'
+  )
+  expect(formatNumber({ input: 1.23, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '$1.23'
+  )
+  expect(formatNumber({ input: 0.123, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '$0.12'
+  )
+  expect(formatNumber({ input: 0.00123, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe(
+    '<$0.01'
+  )
   expect(formatNumber({ input: 0, type: NumberType.FiatTokenStats, locale: 'en-US' })).toBe('-')
 })
 
 it('formats gas USD prices correctly', () => {
-  expect(formatNumber({ input: 1234567.891, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe('$1.23M')
-  expect(formatNumber({ input: 18.448, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe('$18.45')
-  expect(formatNumber({ input: 0.0099, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe('<$0.01')
+  expect(formatNumber({ input: 1234567.891, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe(
+    '$1.23M'
+  )
+  expect(formatNumber({ input: 18.448, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe(
+    '$18.45'
+  )
+  expect(formatNumber({ input: 0.0099, type: NumberType.FiatGasPrice, locale: 'en-US' })).toBe(
+    '<$0.01'
+  )
 })
 
 it('formats USD token quantities prices correctly', () => {
-  expect(formatNumber({ input: 1234567.891, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe('$1.23M')
-  expect(formatNumber({ input: 18.448, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe('$18.45')
-  expect(formatNumber({ input: 0.0099, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe('<$0.01')
-  expect(formatNumber({ input: 0, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe('$0.00')
+  expect(
+    formatNumber({ input: 1234567.891, type: NumberType.FiatTokenQuantity, locale: 'en-US' })
+  ).toBe('$1.23M')
+  expect(formatNumber({ input: 18.448, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe(
+    '$18.45'
+  )
+  expect(formatNumber({ input: 0.0099, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe(
+    '<$0.01'
+  )
+  expect(formatNumber({ input: 0, type: NumberType.FiatTokenQuantity, locale: 'en-US' })).toBe(
+    '$0.00'
+  )
 })
 
 it('formats Swap text input/output numbers correctly', () => {
-  expect(formatNumber({ input: 1234567.8901, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('1234570')
-  expect(formatNumber({ input: 765432.1, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('765432')
-
-  expect(formatNumber({ input: 7654.321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('7654.32')
-  expect(formatNumber({ input: 765.4321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('765.432')
-  expect(formatNumber({ input: 76.54321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('76.5432')
-  expect(formatNumber({ input: 7.654321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('7.65432')
-  expect(formatNumber({ input: 7.60000054321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('7.60')
-  expect(formatNumber({ input: 7.6, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('7.60')
+  expect(
+    formatNumber({ input: 1234567.8901, type: NumberType.SwapTradeAmount, locale: 'en-US' })
+  ).toBe('1234570')
+  expect(formatNumber({ input: 765432.1, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '765432'
+  )
+
+  expect(formatNumber({ input: 7654.321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '7654.32'
+  )
+  expect(formatNumber({ input: 765.4321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '765.432'
+  )
+  expect(formatNumber({ input: 76.54321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '76.5432'
+  )
+  expect(formatNumber({ input: 7.654321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '7.65432'
+  )
+  expect(
+    formatNumber({ input: 7.60000054321, type: NumberType.SwapTradeAmount, locale: 'en-US' })
+  ).toBe('7.60')
+  expect(formatNumber({ input: 7.6, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '7.60'
+  )
   expect(formatNumber({ input: 7, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('7.00')
 
-  expect(formatNumber({ input: 0.987654321, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('0.98765')
-  expect(formatNumber({ input: 0.9, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('0.90')
-  expect(formatNumber({ input: 0.901000123, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('0.901')
-  expect(formatNumber({ input: 1e-9, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('0.000000001')
+  expect(
+    formatNumber({ input: 0.987654321, type: NumberType.SwapTradeAmount, locale: 'en-US' })
+  ).toBe('0.98765')
+  expect(formatNumber({ input: 0.9, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '0.90'
+  )
+  expect(
+    formatNumber({ input: 0.901000123, type: NumberType.SwapTradeAmount, locale: 'en-US' })
+  ).toBe('0.901')
+  expect(formatNumber({ input: 1e-9, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe(
+    '0.000000001'
+  )
   expect(formatNumber({ input: 0, type: NumberType.SwapTradeAmount, locale: 'en-US' })).toBe('0')
 })
 
 it('formats Swap prices correctly', () => {
-  expect(formatNumber({ input: 1234567.8901, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('1234570')
-  expect(formatNumber({ input: 765432.1, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('765432')
-
-  expect(formatNumber({ input: 7654.321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('7654.32')
-  expect(formatNumber({ input: 765.4321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('765.432')
-  expect(formatNumber({ input: 76.54321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('76.5432')
-  expect(formatNumber({ input: 7.654321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('7.65432')
-  expect(formatNumber({ input: 7.60000054321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('7.60')
+  expect(formatNumber({ input: 1234567.8901, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '1234570'
+  )
+  expect(formatNumber({ input: 765432.1, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '765432'
+  )
+
+  expect(formatNumber({ input: 7654.321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '7654.32'
+  )
+  expect(formatNumber({ input: 765.4321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '765.432'
+  )
+  expect(formatNumber({ input: 76.54321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '76.5432'
+  )
+  expect(formatNumber({ input: 7.654321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '7.65432'
+  )
+  expect(formatNumber({ input: 7.60000054321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '7.60'
+  )
   expect(formatNumber({ input: 7.6, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('7.60')
   expect(formatNumber({ input: 7, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('7.00')
 
-  expect(formatNumber({ input: 0.987654321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('0.98765')
+  expect(formatNumber({ input: 0.987654321, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '0.98765'
+  )
   expect(formatNumber({ input: 0.9, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('0.90')
-  expect(formatNumber({ input: 0.901000123, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('0.901')
-  expect(formatNumber({ input: 1e-9, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('<0.00001')
+  expect(formatNumber({ input: 0.901000123, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '0.901'
+  )
+  expect(formatNumber({ input: 1e-9, type: NumberType.SwapPrice, locale: 'en-US' })).toBe(
+    '<0.00001'
+  )
   expect(formatNumber({ input: 0, type: NumberType.SwapPrice, locale: 'en-US' })).toBe('0')
 })
 
 it('formats NFT numbers correctly', () => {
-  expect(formatNumber({ input: 1234567000000000, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('>999T')
-  expect(formatNumber({ input: 1002345, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('1.00M')
-  expect(formatNumber({ input: 1234, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('1.23K')
-  expect(formatNumber({ input: 12.34467, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('12.34')
-  expect(formatNumber({ input: 0.00909, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('0.009')
-  expect(formatNumber({ input: 0.09001, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('0.090')
-  expect(formatNumber({ input: 0.00099, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('<0.001')
+  expect(
+    formatNumber({ input: 1234567000000000, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('>999T')
+  expect(
+    formatNumber({ input: 1002345, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('1.00M')
+  expect(formatNumber({ input: 1234, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe(
+    '1.23K'
+  )
+  expect(
+    formatNumber({ input: 12.34467, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('12.34')
+  expect(
+    formatNumber({ input: 0.00909, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('0.009')
+  expect(
+    formatNumber({ input: 0.09001, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('0.090')
+  expect(
+    formatNumber({ input: 0.00099, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })
+  ).toBe('<0.001')
   expect(formatNumber({ input: 0, type: NumberType.NFTTokenFloorPrice, locale: 'en-US' })).toBe('0')
 
-  expect(formatNumber({ input: 1234576, type: NumberType.NFTCollectionStats, locale: 'en-US' })).toBe('1.2M')
-  expect(formatNumber({ input: 234567, type: NumberType.NFTCollectionStats, locale: 'en-US' })).toBe('234.6K')
-  expect(formatNumber({ input: 999, type: NumberType.NFTCollectionStats, locale: 'en-US' })).toBe('999')
+  expect(
+    formatNumber({ input: 1234576, type: NumberType.NFTCollectionStats, locale: 'en-US' })
+  ).toBe('1.2M')
+  expect(
+    formatNumber({ input: 234567, type: NumberType.NFTCollectionStats, locale: 'en-US' })
+  ).toBe('234.6K')
+  expect(formatNumber({ input: 999, type: NumberType.NFTCollectionStats, locale: 'en-US' })).toBe(
+    '999'
+  )
   expect(formatNumber({ input: 0, type: NumberType.NFTCollectionStats, locale: 'en-US' })).toBe('0')
 })
diff --git a/packages/utilities/src/format/truncateToMaxDecimals.test.ts b/packages/utilities/src/format/truncateToMaxDecimals.test.ts
index e924e08bec0..aff5db25669 100644
--- a/packages/utilities/src/format/truncateToMaxDecimals.test.ts
+++ b/packages/utilities/src/format/truncateToMaxDecimals.test.ts
@@ -1,4 +1,7 @@
-import { maxDecimalsReached, truncateToMaxDecimals } from 'utilities/src/format/truncateToMaxDecimals'
+import {
+  maxDecimalsReached,
+  truncateToMaxDecimals,
+} from 'utilities/src/format/truncateToMaxDecimals'
 
 describe('truncateToMaxDecimals', () => {
   it('returns the same string if it has less than max decimals', () => {
@@ -8,7 +11,7 @@ describe('truncateToMaxDecimals', () => {
       truncateToMaxDecimals({
         value: valueWith1Decimal,
         maxDecimals: 1,
-      }),
+      })
     ).toBe(valueWith1Decimal)
 
     const valueWith18Decimals = '1.999999999999999999'
@@ -17,7 +20,7 @@ describe('truncateToMaxDecimals', () => {
       truncateToMaxDecimals({
         value: valueWith18Decimals,
         maxDecimals: 18,
-      }),
+      })
     ).toBe(valueWith18Decimals)
   })
 
@@ -26,14 +29,14 @@ describe('truncateToMaxDecimals', () => {
       truncateToMaxDecimals({
         value: '1.01',
         maxDecimals: 1,
-      }),
+      })
     ).toBe('1.0')
 
     expect(
       truncateToMaxDecimals({
         value: '1.123456789',
         maxDecimals: 3,
-      }),
+      })
     ).toBe('1.123')
   })
 
@@ -42,7 +45,7 @@ describe('truncateToMaxDecimals', () => {
       truncateToMaxDecimals({
         value: '1.',
         maxDecimals: 8,
-      }),
+      })
     ).toBe('1.')
   })
 })
@@ -53,14 +56,14 @@ describe('maxDecimalsReached', () => {
       maxDecimalsReached({
         value: '1.1234',
         maxDecimals: 4,
-      }),
+      })
     ).toBe(true)
 
     expect(
       maxDecimalsReached({
         value: '1.12345',
         maxDecimals: 4,
-      }),
+      })
     ).toBe(true)
   })
 
@@ -69,14 +72,14 @@ describe('maxDecimalsReached', () => {
       maxDecimalsReached({
         value: '1.123',
         maxDecimals: 4,
-      }),
+      })
     ).toBe(false)
 
     expect(
       maxDecimalsReached({
         value: '1',
         maxDecimals: 4,
-      }),
+      })
     ).toBe(false)
   })
 })
diff --git a/packages/utilities/src/format/urls.test.ts b/packages/utilities/src/format/urls.test.ts
index 47c761dc351..bb2d8b9f4d9 100644
--- a/packages/utilities/src/format/urls.test.ts
+++ b/packages/utilities/src/format/urls.test.ts
@@ -19,7 +19,9 @@ describe(uriToHttpUrls, () => {
     ])
   })
   it('returns ipfs gateways for wrongly formated ipfs:// urls', () => {
-    expect(uriToHttpUrls('ipfs://ipfs/QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif')).toEqual([
+    expect(
+      uriToHttpUrls('ipfs://ipfs/QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif')
+    ).toEqual([
       'https://cloudflare-ipfs.com/ipfs/QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif/',
       'https://ipfs.io/ipfs/QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif/',
     ])
diff --git a/packages/utilities/src/primitives/objects.test.ts b/packages/utilities/src/primitives/objects.test.ts
index eefa345856b..ad5b9c1b350 100644
--- a/packages/utilities/src/primitives/objects.test.ts
+++ b/packages/utilities/src/primitives/objects.test.ts
@@ -5,7 +5,13 @@ const DAI = new Token(1, '0x6b175474e89094c44da98b954eedeac495271d0f', 18, 'DAI'
 
 const USDC = new Token(1, '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', 6, 'USDC', 'USD//C')
 
-const USDC_ARBITRUM = new Token(42161, '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', 6, 'USDC', 'USD//C')
+const USDC_ARBITRUM = new Token(
+  42161,
+  '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
+  6,
+  'USDC',
+  'USD//C'
+)
 
 describe(flattenObjectOfObjects, () => {
   it('correctly flattens', () => {
@@ -23,7 +29,7 @@ describe(flattenObjectOfObjects, () => {
         42161: {
           [USDC_ARBITRUM.address]: USDC_ARBITRUM,
         },
-      }),
+      })
     ).toEqual([DAI, USDC, USDC_ARBITRUM])
 
     expect(flattenObjectOfObjects({ 1: { '0x1': [1, 2, 3], '0x2': 4 } })).toEqual([[1, 2, 3], 4])
diff --git a/packages/utilities/src/primitives/string.test.ts b/packages/utilities/src/primitives/string.test.ts
index 22d97002359..82902de8513 100644
--- a/packages/utilities/src/primitives/string.test.ts
+++ b/packages/utilities/src/primitives/string.test.ts
@@ -1,4 +1,9 @@
-import { concatStrings, escapeRegExp, normalizeTextInput, trimToLength } from 'utilities/src/primitives/string'
+import {
+  concatStrings,
+  escapeRegExp,
+  normalizeTextInput,
+  trimToLength,
+} from 'utilities/src/primitives/string'
 
 describe(trimToLength, () => {
   it('handles empty string', () => {
diff --git a/packages/utilities/src/time/timing.test.ts b/packages/utilities/src/time/timing.test.ts
index 50000107b49..88efd04a71c 100644
--- a/packages/utilities/src/time/timing.test.ts
+++ b/packages/utilities/src/time/timing.test.ts
@@ -13,7 +13,7 @@ jest.useFakeTimers()
 
 const timedPromise = (duration: number, shouldResolve = true): Promise<string> =>
   new Promise((resolve, reject) =>
-    setTimeout(() => (shouldResolve ? resolve('resolve') : reject(new Error('reject'))), duration),
+    setTimeout(() => (shouldResolve ? resolve('resolve') : reject(new Error('reject'))), duration)
   )
 
 describe('promiseTimeout', () => {
diff --git a/packages/wallet/package.json b/packages/wallet/package.json
index cf92884db91..7e27b249c84 100644
--- a/packages/wallet/package.json
+++ b/packages/wallet/package.json
@@ -26,7 +26,7 @@
     "@reduxjs/toolkit": "1.9.3",
     "@sentry/types": "7.80.0",
     "@shopify/flash-list": "1.6.3",
-    "@uniswap/analytics-events": "2.34.0",
+    "@uniswap/analytics-events": "2.32.0",
     "@uniswap/permit2-sdk": "1.3.0",
     "@uniswap/router-sdk": "1.9.2",
     "@uniswap/sdk-core": "5.3.0",
@@ -39,6 +39,7 @@
     "axios": "1.6.5",
     "dayjs": "1.11.7",
     "ethers": "5.7.2",
+    "expo-clipboard": "5.0.1",
     "expo-web-browser": "12.8.2",
     "fuse.js": "6.5.3",
     "graphql": "16.6.0",
@@ -47,6 +48,7 @@
     "lodash": "4.17.21",
     "mockdate": "3.0.5",
     "no-yolo-signatures": "0.0.2",
+    "qrcode": "1.5.1",
     "react": "18.2.0",
     "react-i18next": "14.1.0",
     "react-native": "0.73.6",
@@ -70,6 +72,7 @@
     "uniswap": "workspace:^",
     "utilities": "workspace:^",
     "uuid": "9.0.0",
+    "wcag-contrast": "3.0.0",
     "zod": "3.22.4",
     "zxcvbn": "4.4.2"
   },
diff --git a/packages/wallet/src/components/CurrencyLogo/CurrencyLogo.test.tsx b/packages/wallet/src/components/CurrencyLogo/CurrencyLogo.test.tsx
index c8807d9cb73..c4f55a3e714 100644
--- a/packages/wallet/src/components/CurrencyLogo/CurrencyLogo.test.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/CurrencyLogo.test.tsx
@@ -1,5 +1,5 @@
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
-import { ARBITRUM_DAI_CURRENCY_INFO, UNI_CURRENCY_INFO, arbitrumDaiCurrencyInfo } from 'uniswap/src/test/fixtures'
+import { ARBITRUM_DAI_CURRENCY_INFO, UNI_CURRENCY_INFO, arbitrumDaiCurrencyInfo } from 'wallet/src/test/fixtures'
 import { render } from 'wallet/src/test/test-utils'
 
 describe(CurrencyLogo, () => {
diff --git a/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.test.tsx b/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.test.tsx
index a5c3d6ef2a1..6a7f0b1ad03 100644
--- a/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.test.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.test.tsx
@@ -1,6 +1,3 @@
-import { AssetType } from 'uniswap/src/entities/assets'
-import { ETH_CURRENCY_INFO, ethCurrencyInfo } from 'uniswap/src/test/fixtures/wallet/currencies'
-import { createFixture } from 'uniswap/src/test/utils'
 import { UniverseChainId, WALLET_SUPPORTED_CHAIN_IDS, WalletChainId } from 'uniswap/src/types/chains'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
 import {
@@ -9,9 +6,11 @@ import {
   LogoWithTxStatus,
   LogoWithTxStatusProps,
 } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
+import { ETH_CURRENCY_INFO, ethCurrencyInfo } from 'wallet/src/test/fixtures/wallet/currencies'
 import { render } from 'wallet/src/test/test-utils'
-import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
+import { createFixture, randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 
 const currencyLogoProps = createFixture<LogoWithTxStatusProps>()(() => ({
   assetType: AssetType.Currency,
diff --git a/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.tsx b/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.tsx
index cdd442fe9b1..c91e8a90faa 100644
--- a/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/LogoWithTxStatus.tsx
@@ -9,12 +9,12 @@ import { AlertTriangle, Approve, ArrowDownInCircle, ArrowUpInCircle, QuestionInC
 import { borderRadii } from 'ui/src/theme'
 import { CurrencyLogo, STATUS_RATIO } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
 import { TransactionSummaryNetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
 import { logger } from 'utilities/src/logger/logger'
 import { DappIconPlaceholder } from 'wallet/src/components/WalletConnect/DappIconPlaceholder'
+import { AssetType } from 'wallet/src/entities/assets'
 import { ImageUri } from 'wallet/src/features/images/ImageUri'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
 import { RemoteImage } from 'wallet/src/features/images/RemoteImage'
diff --git a/packages/uniswap/src/components/CurrencyLogo/SplitLogo.test.tsx b/packages/wallet/src/components/CurrencyLogo/SplitLogo.test.tsx
similarity index 94%
rename from packages/uniswap/src/components/CurrencyLogo/SplitLogo.test.tsx
rename to packages/wallet/src/components/CurrencyLogo/SplitLogo.test.tsx
index d76fdf6abe7..483204f7f6a 100644
--- a/packages/uniswap/src/components/CurrencyLogo/SplitLogo.test.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/SplitLogo.test.tsx
@@ -1,7 +1,7 @@
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
-import { DAI_CURRENCY_INFO, ETH_CURRENCY_INFO, daiCurrencyInfo, ethCurrencyInfo } from 'uniswap/src/test/fixtures'
-import { render, within } from 'uniswap/src/test/test-utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
+import { DAI_CURRENCY_INFO, ETH_CURRENCY_INFO, daiCurrencyInfo, ethCurrencyInfo } from 'wallet/src/test/fixtures'
+import { render, within } from 'wallet/src/test/test-utils'
 
 describe(SplitLogo, () => {
   it('renders without error', () => {
diff --git a/packages/uniswap/src/components/CurrencyLogo/SplitLogo.tsx b/packages/wallet/src/components/CurrencyLogo/SplitLogo.tsx
similarity index 100%
rename from packages/uniswap/src/components/CurrencyLogo/SplitLogo.tsx
rename to packages/wallet/src/components/CurrencyLogo/SplitLogo.tsx
diff --git a/packages/uniswap/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap b/packages/wallet/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap
similarity index 92%
rename from packages/uniswap/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap
rename to packages/wallet/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap
index bd2f34b7946..cbd18dbf1b4 100644
--- a/packages/uniswap/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap
+++ b/packages/wallet/src/components/CurrencyLogo/__snapshots__/SplitLogo.test.tsx.snap
@@ -50,7 +50,7 @@ exports[`SplitLogo renders without error 1`] = `
           style={
             {
               "aspectRatio": undefined,
-              "backgroundColor": "#FFFFFF1F",
+              "backgroundColor": "#2222220D",
               "borderRadius": 5,
               "objectFit": "contain",
             }
@@ -100,7 +100,7 @@ exports[`SplitLogo renders without error 1`] = `
           style={
             {
               "aspectRatio": undefined,
-              "backgroundColor": "#FFFFFF1F",
+              "backgroundColor": "#2222220D",
               "borderRadius": 5,
               "objectFit": "contain",
             }
@@ -123,16 +123,16 @@ exports[`SplitLogo renders without error 1`] = `
     <View
       style={
         {
-          "borderBottomColor": "#131313",
+          "borderBottomColor": "#FFFFFF",
           "borderBottomLeftRadius": 7,
           "borderBottomRightRadius": 7,
           "borderBottomWidth": 2,
-          "borderLeftColor": "#131313",
+          "borderLeftColor": "#FFFFFF",
           "borderLeftWidth": 2,
-          "borderRightColor": "#131313",
+          "borderRightColor": "#FFFFFF",
           "borderRightWidth": 2,
           "borderStyle": "solid",
-          "borderTopColor": "#131313",
+          "borderTopColor": "#FFFFFF",
           "borderTopLeftRadius": 7,
           "borderTopRightRadius": 7,
           "borderTopWidth": 2,
@@ -143,7 +143,7 @@ exports[`SplitLogo renders without error 1`] = `
       <View
         style={
           {
-            "borderColor": "#131313",
+            "borderColor": "#FFFFFF",
             "borderRadius": 6,
             "flexDirection": "column",
             "overflow": "hidden",
diff --git a/packages/wallet/src/components/CurrencyLogo/index.test.tsx b/packages/wallet/src/components/CurrencyLogo/index.test.tsx
index 4b9115d7787..fa5cebc2921 100644
--- a/packages/wallet/src/components/CurrencyLogo/index.test.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/index.test.tsx
@@ -1,5 +1,5 @@
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
-import { arbitrumDaiCurrencyInfo, uniCurrencyInfo } from 'uniswap/src/test/fixtures'
+import { arbitrumDaiCurrencyInfo, uniCurrencyInfo } from 'wallet/src/test/fixtures'
 import { renderWithProviders } from 'wallet/src/test/render'
 
 jest.mock('ui/src/assets/', () => 'ethereum-logo.png')
diff --git a/packages/wallet/src/components/ErrorBoundary/ErrorBoundary.tsx b/packages/wallet/src/components/ErrorBoundary/ErrorBoundary.tsx
index a737b235dce..67a3b48dcac 100644
--- a/packages/wallet/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/packages/wallet/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -1,13 +1,13 @@
 import React, { ErrorInfo, PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Image, StyleSheet } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { Button, Flex, Text } from 'ui/src'
 import { DEAD_LUNI } from 'ui/src/assets'
 import { logger } from 'utilities/src/logger/logger'
 import { restartApp } from 'wallet/src/components/ErrorBoundary/restart'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
 import { setFinishedOnboarding } from 'wallet/src/features/wallet/slice'
+import { useAppDispatch } from 'wallet/src/state'
 
 interface ErrorBoundaryState {
   error: Error | null
@@ -55,7 +55,7 @@ const LUNI_SIZE = 150
 
 function ErrorScreen({ error }: { error: Error }): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const accounts = useAccounts()
 
   // If there is no active account, we need to reset the onboarding flow
diff --git a/packages/ui/src/components/QRCode/index.tsx b/packages/wallet/src/components/QRCodeScanner/QRCode.tsx
similarity index 54%
rename from packages/ui/src/components/QRCode/index.tsx
rename to packages/wallet/src/components/QRCodeScanner/QRCode.tsx
index 568211c15dd..800e996fbc4 100644
--- a/packages/ui/src/components/QRCode/index.tsx
+++ b/packages/wallet/src/components/QRCodeScanner/QRCode.tsx
@@ -1,15 +1,65 @@
-import { PropsWithChildren, memo, useMemo } from 'react'
-import { ColorTokens } from 'tamagui'
-import QRCode from 'ui/src/components/QRCode/custom-qr-code-generator'
-import { Flex } from 'ui/src/components/layout'
-import { useSporeColors } from 'ui/src/hooks/useSporeColors'
+import { memo, useMemo } from 'react'
+import { ImageSourcePropType } from 'react-native'
+import {
+  ColorTokens,
+  Flex,
+  getUniconColors,
+  passesContrast,
+  useExtractedColors,
+  useIsDarkMode,
+  useSporeColors,
+} from 'ui/src'
 import { borderRadii } from 'ui/src/theme'
+import QRCode from 'wallet/src/components/QRCodeScanner/custom-qr-code-generator'
+import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { useAvatar } from 'wallet/src/features/wallet/hooks'
 
-export type GradientProps = {
-  enableLinearGradient?: boolean
-  linearGradient?: string[]
-  gradientDirection?: string[]
-  color?: string
+type AvatarColors = {
+  primary: string
+  base: string
+  detail: string
+}
+
+type ColorProps = {
+  smartColor: string
+  gradientProps: {
+    enableLinearGradient?: boolean
+    linearGradient?: string[]
+    gradientDirection?: string[]
+    color?: string
+  }
+}
+
+const useColorProps = (address: Address): ColorProps => {
+  const colors = useSporeColors()
+  const isDarkMode = useIsDarkMode()
+  const { color: uniconColor } = getUniconColors(address, isDarkMode) as { color: string }
+  const { avatar, loading: avatarLoading } = useAvatar(address)
+  const { colors: avatarColors } = useExtractedColors(avatar) as { colors: AvatarColors }
+  const hasAvatar = !!avatar && !avatarLoading
+
+  const smartColor: string = useMemo<string>(() => {
+    const contrastThreshold = 3 // WCAG AA standard for contrast
+    const backgroundColor = colors.surface2.val // replace with your actual background color
+
+    if (hasAvatar && avatarColors && avatarColors.primary) {
+      if (passesContrast(avatarColors.primary, backgroundColor, contrastThreshold)) {
+        return avatarColors.primary
+      }
+      if (passesContrast(avatarColors.base, backgroundColor, contrastThreshold)) {
+        return avatarColors.base
+      }
+      if (passesContrast(avatarColors.detail, backgroundColor, contrastThreshold)) {
+        return avatarColors.detail
+      }
+      // Modify the color if it doesn't pass the contrast check
+      // Replace 'modifiedColor' with the actual color you want to use
+      return colors.neutral1.val as string
+    }
+    return uniconColor
+  }, [avatarColors, hasAvatar, uniconColor, colors.surface2.val, colors.neutral1.val])
+
+  return { smartColor, gradientProps: {} }
 }
 
 type AddressQRCodeProps = {
@@ -20,7 +70,6 @@ type AddressQRCodeProps = {
   color?: string
   safeAreaSize?: number
   safeAreaColor?: ColorTokens
-  gradientProps?: GradientProps
 }
 
 export const AddressQRCode = ({
@@ -31,15 +80,16 @@ export const AddressQRCode = ({
   color,
   safeAreaSize,
   safeAreaColor,
-  gradientProps,
 }: AddressQRCodeProps): JSX.Element => {
   const backgroundColorValue = backgroundColor
+  const { gradientProps } = useColorProps(address)
   const colors = useSporeColors()
 
   const safeAreaProps = useMemo(() => {
     let safeAreaPropsObject: {
       logoSize?: number
       logoMargin?: number
+      logo?: ImageSourcePropType
       logoBackgroundColor?: string
       logoBorderRadius?: number
     } = {}
@@ -47,6 +97,7 @@ export const AddressQRCode = ({
     if (safeAreaSize && safeAreaColor) {
       safeAreaPropsObject = {
         logoSize: safeAreaSize,
+        logo: { uri: '' },
         // this could eventually be set to an SVG version of the Unicon which would ensure it's perfectly centered, but for now we can just use an empty logo image to create a blank circle in the middle of the QR code
         logoBackgroundColor: colors.surface1.val,
         logoBorderRadius: borderRadii.roundedFull,
@@ -71,10 +122,9 @@ export const AddressQRCode = ({
 }
 
 type QRCodeDisplayProps = {
-  encodedValue: string
+  address: Address
   errorCorrectionLevel?: 'L' | 'M' | 'Q' | 'H'
   size: number
-  color: string
   backgroundColor?: ColorTokens
   containerBackgroundColor?: ColorTokens
   overlayColor?: ColorTokens
@@ -85,17 +135,18 @@ type QRCodeDisplayProps = {
 }
 
 const _QRCodeDisplay = ({
-  encodedValue,
+  address,
   errorCorrectionLevel = 'H',
   size,
-  color,
   containerBackgroundColor,
   logoSize = 32,
   safeAreaColor,
   hideOutline = false,
   displayShadow = false,
-  children,
-}: PropsWithChildren<QRCodeDisplayProps>): JSX.Element => {
+}: QRCodeDisplayProps): JSX.Element => {
+  const { avatar } = useAvatar(address)
+  const { smartColor } = useColorProps(address)
+
   return (
     <Flex
       alignItems="center"
@@ -111,9 +162,9 @@ const _QRCodeDisplay = ({
       shadowRadius={16}
     >
       <AddressQRCode
-        address={encodedValue}
+        address={address}
         backgroundColor={containerBackgroundColor}
-        color={color}
+        color={smartColor}
         errorCorrectionLevel={errorCorrectionLevel}
         safeAreaColor={safeAreaColor}
         safeAreaSize={logoSize}
@@ -128,7 +179,15 @@ const _QRCodeDisplay = ({
         position="absolute"
         pt="$spacing2"
       >
-        {children}
+        <AccountIcon
+          address={address}
+          avatarUri={avatar}
+          borderColor="$surface1"
+          borderWidth={4}
+          showBackground={true}
+          showBorder={true}
+          size={logoSize}
+        />
       </Flex>
     </Flex>
   )
diff --git a/packages/wallet/src/components/QRCodeScanner/WalletQRCode.tsx b/packages/wallet/src/components/QRCodeScanner/WalletQRCode.tsx
index 48ffb96dd99..39b6020f626 100644
--- a/packages/wallet/src/components/QRCodeScanner/WalletQRCode.tsx
+++ b/packages/wallet/src/components/QRCodeScanner/WalletQRCode.tsx
@@ -1,21 +1,17 @@
 import { useTranslation } from 'react-i18next'
-import { Flex, QRCodeDisplay, Text, isWeb, useMedia, useSporeColors } from 'ui/src'
-import { iconSizes, spacing } from 'ui/src/theme'
-import { NetworkLogos } from 'uniswap/src/components/network/NetworkLogos'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
+import { Flex, Text, isWeb, useMedia, useSporeColors } from 'ui/src'
+import { spacing } from 'ui/src/theme'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { WALLET_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
-import { useQRColorProps } from 'wallet/src/components/QRCodeScanner/useQRColorProps'
-import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
+import { QRCodeDisplay } from 'wallet/src/components/QRCodeScanner/QRCode'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { useAvatar } from 'wallet/src/features/wallet/hooks'
+import { NetworkLogos } from 'wallet/src/components/network/NetworkLogos'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 
 export function WalletQRCode({ address }: { address: Address }): JSX.Element | null {
   const colors = useSporeColors()
-  const { avatar } = useAvatar(address)
   const { t } = useTranslation()
   const media = useMedia()
-  const { smartColor } = useQRColorProps(address)
 
   const QR_CODE_SIZE = media.short ? 220 : 240
   const UNICON_SIZE = QR_CODE_SIZE / 4
@@ -44,30 +40,18 @@ export function WalletQRCode({ address }: { address: Address }): JSX.Element | n
       </Flex>
       <QRCodeDisplay
         hideOutline
-        color={smartColor}
+        address={address}
         containerBackgroundColor={colors.surface1.val}
         displayShadow={false}
-        encodedValue={address}
         logoSize={UNICON_SIZE}
         safeAreaColor="$surface1"
         size={QR_CODE_SIZE}
-      >
-        <AccountIcon
-          address={address}
-          avatarUri={avatar}
-          borderColor="$surface1"
-          borderWidth={4}
-          showBackground={true}
-          showBorder={true}
-          size={UNICON_SIZE}
-        />
-      </QRCodeDisplay>
+      />
       <NetworkLogos
         showFirstChainLabel
         backgroundColor="$surface2"
         borderRadius="$roundedFull"
         chains={WALLET_SUPPORTED_CHAIN_IDS}
-        size={iconSizes.icon16}
       />
       <Text color="$neutral2" lineHeight={20} textAlign="center" variant="body4">
         {t('qrScanner.wallet.title')}
diff --git a/packages/ui/src/components/QRCode/custom-qr-code-generator/index.d.ts b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/index.d.ts
similarity index 88%
rename from packages/ui/src/components/QRCode/custom-qr-code-generator/index.d.ts
rename to packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/index.d.ts
index 00fd91db3b8..e4e6625e1ff 100644
--- a/packages/ui/src/components/QRCode/custom-qr-code-generator/index.d.ts
+++ b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/index.d.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import React from 'react'
+import { ImageSourcePropType } from 'react-native'
 
 declare class QRCode extends React.PureComponent<QRCodeProps, any> {}
 
@@ -14,6 +15,8 @@ export interface QRCodeProps {
   backgroundColor?: string
   /* the color of the background */
   overlayColor?: string
+  /* an image source object. example {uri: 'base64string'} or {require('pathToImage')} */
+  logo?: ImageSourcePropType
   /* logo size in pixels */
   logoSize?: number
   /* the logo gets a filled rectangular background with this color. Use 'transparent'
diff --git a/packages/ui/src/components/QRCode/custom-qr-code-generator/index.js b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/index.js
similarity index 100%
rename from packages/ui/src/components/QRCode/custom-qr-code-generator/index.js
rename to packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/index.js
diff --git a/packages/ui/src/components/QRCode/custom-qr-code-generator/src/genMatrix.js b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/genMatrix.js
similarity index 100%
rename from packages/ui/src/components/QRCode/custom-qr-code-generator/src/genMatrix.js
rename to packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/genMatrix.js
diff --git a/packages/ui/src/components/QRCode/custom-qr-code-generator/src/index.jsx b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/index.jsx
similarity index 74%
rename from packages/ui/src/components/QRCode/custom-qr-code-generator/src/index.jsx
rename to packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/index.jsx
index 15d7a192691..a25b80d73a5 100644
--- a/packages/ui/src/components/QRCode/custom-qr-code-generator/src/index.jsx
+++ b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/index.jsx
@@ -4,34 +4,28 @@
 import { useMemo } from 'react'
 import Svg, { Defs, G, LinearGradient, Path, Rect, Stop } from 'react-native-svg'
 import { useMedia } from 'ui/src'
-import genMatrix from './genMatrix'
-import transformMatrixIntoPath from './transformMatrixIntoCirclePath.js'
+import genMatrix from 'wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/genMatrix.js'
+import transformMatrixIntoPath from 'wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/transformMatrixIntoCirclePath.js'
 
-// x and y attributes are not supported on <g> elements on web. Likewise, they are not supported on svg elements on React Native.
-// Solution is to wrap with <svg> and pass x and y values to both.
 const QREyes = ({ x = -1, y = -1, fillColor, size }) => (
-  <Svg x={x} y={y}>
-    <G transform={`scale(${size / 120})`} x={x} y={y}>
-      <Path
-        clipRule="evenodd"
-        d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
-        fill={fillColor}
-        fillRule="evenodd"
-      />
-      <Path
-        d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
-        fill={fillColor}
-      />
-    </G>
-  </Svg>
+  <G transform={`scale(${size / 120})`} x={x} y={y}>
+    <Path
+      clipRule="evenodd"
+      d="M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12ZM28 6.27451H12C8.8379 6.27451 6.27451 8.8379 6.27451 12V28C6.27451 31.1621 8.8379 33.7255 12 33.7255H28C31.1621 33.7255 33.7255 31.1621 33.7255 28V12C33.7255 8.8379 31.1621 6.27451 28 6.27451Z"
+      fill={fillColor}
+      fillRule="evenodd"
+    />
+    <Path
+      d="M11 17C11 13.6863 13.6863 11 17 11H23C26.3137 11 29 13.6863 29 17V23C29 26.3137 26.3137 29 23 29H17C13.6863 29 11 26.3137 11 23V17Z"
+      fill={fillColor}
+    />
+  </G>
 )
 
 const QREyeBG = ({ x = -1, y = -1, size, backgroundColor }) => (
-  <Svg x={x} y={y}>
-    <G transform={`scale(${size / 120})`} x={x} y={y}>
-      <Path d="M0 0H40V40H0V0Z" fill={backgroundColor} />
-    </G>
-  </Svg>
+  <G transform={`scale(${size / 120})`} x={x} y={y}>
+    <Path d="M0 0H40V40H0V0Z" fill={backgroundColor} />
+  </G>
 )
 
 const QREyeWrapper = ({ x = 0, y = 0, backgroundColor, overlayColor, fillColor, size }) => (
diff --git a/packages/ui/src/components/QRCode/custom-qr-code-generator/src/transformMatrixIntoCirclePath.js b/packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/transformMatrixIntoCirclePath.js
similarity index 100%
rename from packages/ui/src/components/QRCode/custom-qr-code-generator/src/transformMatrixIntoCirclePath.js
rename to packages/wallet/src/components/QRCodeScanner/custom-qr-code-generator/src/transformMatrixIntoCirclePath.js
diff --git a/packages/wallet/src/components/QRCodeScanner/useQRColorProps.ts b/packages/wallet/src/components/QRCodeScanner/useQRColorProps.ts
deleted file mode 100644
index 8edd8ad698e..00000000000
--- a/packages/wallet/src/components/QRCodeScanner/useQRColorProps.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useMemo } from 'react'
-import {
-  GradientProps,
-  getUniconColors,
-  passesContrast,
-  useExtractedColors,
-  useIsDarkMode,
-  useSporeColors,
-} from 'ui/src'
-import { useAvatar } from 'wallet/src/features/wallet/hooks'
-
-type AvatarColors = {
-  primary: string
-  base: string
-  detail: string
-}
-
-type ColorProps = {
-  smartColor: string
-  gradientProps: GradientProps
-}
-
-export const useQRColorProps = (address: Address): ColorProps => {
-  const colors = useSporeColors()
-  const isDarkMode = useIsDarkMode()
-  const { color: uniconColor } = getUniconColors(address, isDarkMode) as { color: string }
-  const { avatar, loading: avatarLoading } = useAvatar(address)
-  const { colors: avatarColors } = useExtractedColors(avatar) as { colors: AvatarColors }
-  const hasAvatar = !!avatar && !avatarLoading
-
-  const smartColor: string = useMemo<string>(() => {
-    const contrastThreshold = 3 // WCAG AA standard for contrast
-    const backgroundColor = colors.surface2.val // replace with your actual background color
-
-    if (hasAvatar && avatarColors && avatarColors.primary) {
-      if (passesContrast(avatarColors.primary, backgroundColor, contrastThreshold)) {
-        return avatarColors.primary
-      }
-      if (passesContrast(avatarColors.base, backgroundColor, contrastThreshold)) {
-        return avatarColors.base
-      }
-      if (passesContrast(avatarColors.detail, backgroundColor, contrastThreshold)) {
-        return avatarColors.detail
-      }
-      // Modify the color if it doesn't pass the contrast check
-      // Replace 'modifiedColor' with the actual color you want to use
-      return colors.neutral1.val as string
-    }
-    return uniconColor
-  }, [avatarColors, hasAvatar, uniconColor, colors.surface2.val, colors.neutral1.val])
-
-  return { smartColor, gradientProps: {} }
-}
diff --git a/packages/wallet/src/components/RecipientSearch/RecipientList.tsx b/packages/wallet/src/components/RecipientSearch/RecipientList.tsx
index 0a7002ce089..111482d599a 100644
--- a/packages/wallet/src/components/RecipientSearch/RecipientList.tsx
+++ b/packages/wallet/src/components/RecipientSearch/RecipientList.tsx
@@ -5,13 +5,12 @@ import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { Text, TouchableArea, isWeb, useDeviceInsets } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { spacing } from 'ui/src/theme'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { ViewOnlyRecipientModal } from 'wallet/src/components/RecipientSearch/ViewOnlyRecipientModal'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
-import { extractDomain } from 'wallet/src/features/search/SearchResult'
+import { SearchResultType, extractDomain } from 'wallet/src/features/search/SearchResult'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 
 interface RecipientListProps {
diff --git a/packages/wallet/src/components/RecipientSearch/filter.test.ts b/packages/wallet/src/components/RecipientSearch/filter.test.ts
index 4ff5abcb7af..e19f97cfc25 100644
--- a/packages/wallet/src/components/RecipientSearch/filter.test.ts
+++ b/packages/wallet/src/components/RecipientSearch/filter.test.ts
@@ -72,14 +72,22 @@ describe(filterRecipientsByAddress, () => {
     expect(filterRecipientsByAddress('0x', options)).toEqual(options)
 
     // Returns only the first one as it has exactly the same beginning
-    expect(filterRecipientsByAddress(options[0].data.address.slice(0, 3), options)).toEqual([options[0]])
+    expect(filterRecipientsByAddress(options[0].data.address.slice(0, 3), options)).toEqual([
+      options[0],
+    ])
     // Returns only the second one as it has exactly the same beginning
-    expect(filterRecipientsByAddress(options[1].data.address.slice(0, 3), options)).toEqual([options[1]])
+    expect(filterRecipientsByAddress(options[1].data.address.slice(0, 3), options)).toEqual([
+      options[1],
+    ])
   })
 
   it('returns the same result irrespective of the casing', () => {
-    expect(filterRecipientsByAddress(options[0].data.address.toLowerCase(), options)).toEqual([options[0]])
-    expect(filterRecipientsByAddress(options[0].data.address.toUpperCase(), options)).toEqual([options[0]])
+    expect(filterRecipientsByAddress(options[0].data.address.toLowerCase(), options)).toEqual([
+      options[0],
+    ])
+    expect(filterRecipientsByAddress(options[0].data.address.toUpperCase(), options)).toEqual([
+      options[0],
+    ])
   })
 })
 
diff --git a/packages/wallet/src/components/RecipientSearch/utils.test.ts b/packages/wallet/src/components/RecipientSearch/utils.test.ts
index c222d41b8eb..886cee4c472 100644
--- a/packages/wallet/src/components/RecipientSearch/utils.test.ts
+++ b/packages/wallet/src/components/RecipientSearch/utils.test.ts
@@ -2,7 +2,11 @@ import { faker } from '@faker-js/faker'
 import { SectionListData } from 'react-native'
 import { filterSections } from 'wallet/src/components/RecipientSearch/utils'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
-import { SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2, recipientSection } from 'wallet/src/test/fixtures'
+import {
+  SAMPLE_SEED_ADDRESS_1,
+  SAMPLE_SEED_ADDRESS_2,
+  recipientSection,
+} from 'wallet/src/test/fixtures'
 
 const recipientSections: ArrayOfLength<4, SectionListData<SearchableRecipient>> = [
   recipientSection({ addresses: [SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2] }),
diff --git a/packages/uniswap/src/components/TokenSelector/TokenOptionItem.tsx b/packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx
similarity index 80%
rename from packages/uniswap/src/components/TokenSelector/TokenOptionItem.tsx
rename to packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx
index 77b89c74872..fd954fe4f63 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenOptionItem.tsx
+++ b/packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx
@@ -1,48 +1,42 @@
 import React, { useCallback, useState } from 'react'
+import { Keyboard } from 'react-native'
 import { Flex, ImpactFeedbackStyle, Text, TouchableArea, isWeb } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
 import { TokenOption } from 'uniswap/src/components/TokenSelector/types'
 import WarningIcon from 'uniswap/src/components/icons/WarningIcon'
-import { InlineNetworkPill } from 'uniswap/src/components/network/NetworkPill'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import TokenWarningModal from 'uniswap/src/features/tokens/TokenWarningModal'
 import { shortenAddress } from 'uniswap/src/utils/addresses'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
+import { NumberType } from 'utilities/src/format/types'
+import { InlineNetworkPill } from 'wallet/src/components/network/NetworkPill'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import TokenWarningModal from 'wallet/src/features/tokens/TokenWarningModal'
+import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
 
 interface OptionProps {
   option: TokenOption
   showNetworkPill: boolean
   showWarnings: boolean
-  onDismiss?: () => void
   onPress: () => void
   showTokenAddress?: boolean
-  tokenWarningDismissed: boolean
-  dismissWarningCallback: () => void
-  quantity: number | null
-  // TODO(WEB-3643): Share localization context with WEB
-  // (balance, quantityFormatted)
-  balance: string
-  quantityFormatted: string
 }
 
 function _TokenOptionItem({
   option,
   showNetworkPill,
   showWarnings,
-  onDismiss,
   onPress,
   showTokenAddress,
-  tokenWarningDismissed,
-  dismissWarningCallback,
-  balance,
-  quantity,
-  quantityFormatted,
 }: OptionProps): JSX.Element {
-  const { currencyInfo } = option
+  const { currencyInfo, quantity, balanceUSD } = option
   const { currency, currencyId, safetyLevel, logoUrl } = currencyInfo
 
   const [showWarningModal, setShowWarningModal] = useState(false)
+  const { tokenWarningDismissed, dismissWarningCallback } = useTokenWarningDismissed(currencyId)
+  const { convertFiatAmountFormatted, formatNumberOrString } = useLocalizationContext()
+
+  const balance = convertFiatAmountFormatted(balanceUSD, NumberType.FiatTokenPrice)
 
   const onPressTokenOption = useCallback(() => {
     if (
@@ -51,13 +45,13 @@ function _TokenOptionItem({
         ((safetyLevel === SafetyLevel.MediumWarning || safetyLevel === SafetyLevel.StrongWarning) &&
           !tokenWarningDismissed))
     ) {
-      onDismiss?.()
+      Keyboard.dismiss()
       setShowWarningModal(true)
       return
     }
 
     onPress()
-  }, [showWarnings, safetyLevel, tokenWarningDismissed, onPress, onDismiss])
+  }, [showWarnings, safetyLevel, tokenWarningDismissed, onPress])
 
   const onAcceptTokenWarning = useCallback(() => {
     dismissWarningCallback()
@@ -113,7 +107,9 @@ function _TokenOptionItem({
 
           {quantity && quantity !== 0 ? (
             <Flex alignItems="flex-end">
-              <Text variant={isWeb ? 'body2' : 'body1'}>{quantityFormatted}</Text>
+              <Text variant={isWeb ? 'body2' : 'body1'}>
+                {formatNumberOrString({ value: quantity, type: NumberType.TokenTx })}
+              </Text>
               <Text color="$neutral2" variant={isWeb ? 'body3' : 'subheading2'}>
                 {balance}
               </Text>
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelector.tsx b/packages/wallet/src/components/TokenSelector/TokenSelector.tsx
similarity index 53%
rename from packages/uniswap/src/components/TokenSelector/TokenSelector.tsx
rename to packages/wallet/src/components/TokenSelector/TokenSelector.tsx
index d8eb8ce2fc1..9eeeebd8fe0 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenSelector.tsx
+++ b/packages/wallet/src/components/TokenSelector/TokenSelector.tsx
@@ -2,39 +2,31 @@ import { Currency } from '@uniswap/sdk-core'
 import { hasStringAsync } from 'expo-clipboard'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Keyboard, LayoutAnimation } from 'react-native'
 import { Flex, isWeb, useSporeColors } from 'ui/src'
 import { zIndices } from 'ui/src/theme'
-import { TokenSelectorEmptySearchList } from 'uniswap/src/components/TokenSelector/TokenSelectorEmptySearchList'
-import { TokenSelectorSearchResultsList } from 'uniswap/src/components/TokenSelector/TokenSelectorSearchResultsList'
-import { TokenSelectorSendList } from 'uniswap/src/components/TokenSelector/TokenSelectorSendList'
-import { TokenSelectorSwapInputList } from 'uniswap/src/components/TokenSelector/TokenSelectorSwapInputList'
-import { TokenSelectorSwapOutputList } from 'uniswap/src/components/TokenSelector/TokenSelectorSwapOutputList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  FilterCallbacksHookType,
-  SuggestedTokenSection,
-  TokenOptionsHookType,
-  TokenOptionsWithBalanceOnlySearchHookType,
-  TokenOptionsWithChainFilterHookType,
-  TokenSection,
-  TokenWarningDismissedHook,
-} from 'uniswap/src/components/TokenSelector/types'
-import PasteButton from 'uniswap/src/components/buttons/PasteButton'
+import { SuggestedTokenSection, TokenSection } from 'uniswap/src/components/TokenSelector/types'
 import { useBottomSheetContext } from 'uniswap/src/components/modals/BottomSheetContext'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
 import { NetworkFilter } from 'uniswap/src/components/network/NetworkFilter'
-import { GqlResult } from 'uniswap/src/data/types'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { SearchTextInput } from 'uniswap/src/features/search/SearchTextInput'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, ModalName, SectionName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
-import { getClipboard } from 'uniswap/src/utils/clipboard'
 import { useDebounce } from 'utilities/src/time/timing'
+import { TokenSelectorEmptySearchList } from 'wallet/src/components/TokenSelector/TokenSelectorEmptySearchList'
+import { TokenSelectorSearchResultsList } from 'wallet/src/components/TokenSelector/TokenSelectorSearchResultsList'
+import { TokenSelectorSendList } from 'wallet/src/components/TokenSelector/TokenSelectorSendList'
+import { TokenSelectorSwapInputList } from 'wallet/src/components/TokenSelector/TokenSelectorSwapInputList'
+import { TokenSelectorSwapOutputList } from 'wallet/src/components/TokenSelector/TokenSelectorSwapOutputList'
+import { useFilterCallbacks } from 'wallet/src/components/TokenSelector/hooks'
+import PasteButton from 'wallet/src/components/buttons/PasteButton'
+import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
+import { getClipboard } from 'wallet/src/utils/clipboard'
 
 export enum TokenSelectorVariation {
   // used for Send flow, only show currencies with a balance
@@ -50,26 +42,11 @@ export enum TokenSelectorVariation {
 export interface TokenSelectorProps {
   currencyField: CurrencyField
   flow: TokenSelectorFlow
-  activeAccountAddress: string
   chainId?: WalletChainId
   isSurfaceReady?: boolean
   onClose: () => void
-  onDismiss: () => void
-  onPressAnimation: () => void
   onSelectCurrency: (currency: Currency, currencyField: CurrencyField, context: SearchContext) => void
   variation: TokenSelectorVariation
-  addToSearchHistoryCallback: (currencyInfo: CurrencyInfo) => void
-  navigateToBuyOrReceiveWithEmptyWalletCallback: () => void
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  useTokenWarningDismissedHook: TokenWarningDismissedHook
-  useCommonTokensOptionsHook: TokenOptionsHookType
-  useFavoriteTokensOptionsHook: TokenOptionsHookType
-  usePopularTokensOptionsHook: TokenOptionsWithChainFilterHookType
-  usePortfolioTokenOptionsHook: TokenOptionsHookType
-  useTokenSectionsForEmptySearchHook: () => GqlResult<TokenSection[]>
-  useTokenSectionsForSearchResultsHook: TokenOptionsWithBalanceOnlySearchHookType
-  useFilterCallbacksHook: FilterCallbacksHookType
 }
 
 function TokenSelectorContent({
@@ -80,23 +57,10 @@ function TokenSelectorContent({
   onClose,
   variation,
   isSurfaceReady = true,
-  activeAccountAddress,
-  onDismiss,
-  onPressAnimation,
-  addToSearchHistoryCallback,
-  convertFiatAmountFormattedCallback,
-  formatNumberOrStringCallback,
-  navigateToBuyOrReceiveWithEmptyWalletCallback,
-  useCommonTokensOptionsHook,
-  useFavoriteTokensOptionsHook,
-  usePopularTokensOptionsHook,
-  usePortfolioTokenOptionsHook,
-  useTokenWarningDismissedHook,
-  useTokenSectionsForEmptySearchHook,
-  useTokenSectionsForSearchResultsHook,
-  useFilterCallbacksHook,
 }: TokenSelectorProps): JSX.Element {
-  const { onChangeChainFilter, onChangeText, searchFilter, chainFilter } = useFilterCallbacksHook(chainId ?? null, flow)
+  const { navigateToBuyOrReceiveWithEmptyWallet } = useWalletNavigation()
+
+  const { onChangeChainFilter, onChangeText, searchFilter, chainFilter } = useFilterCallbacks(chainId ?? null, flow)
   const debouncedSearchFilter = useDebounce(searchFilter)
 
   const [hasClipboardString, setHasClipboardString] = useState(false)
@@ -146,8 +110,8 @@ function TokenSelectorContent({
 
   const onSendEmptyActionPress = useCallback(() => {
     onClose()
-    navigateToBuyOrReceiveWithEmptyWalletCallback()
-  }, [navigateToBuyOrReceiveWithEmptyWalletCallback, onClose])
+    navigateToBuyOrReceiveWithEmptyWallet()
+  }, [navigateToBuyOrReceiveWithEmptyWallet, onClose])
 
   function onCancel(): void {
     setSearchInFocus(false)
@@ -160,31 +124,16 @@ function TokenSelectorContent({
 
   const tokenSelector = useMemo(() => {
     if (searchInFocus && !searchFilter) {
-      return (
-        <TokenSelectorEmptySearchList
-          convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-          formatNumberOrStringCallback={formatNumberOrStringCallback}
-          useTokenSectionsForEmptySearchHook={useTokenSectionsForEmptySearchHook}
-          useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-          onDismiss={onDismiss}
-          onSelectCurrency={onSelectCurrencyCallback}
-        />
-      )
+      return <TokenSelectorEmptySearchList onSelectCurrency={onSelectCurrencyCallback} />
     }
 
     if (searchFilter) {
       return (
         <TokenSelectorSearchResultsList
-          addToSearchHistoryCallback={addToSearchHistoryCallback}
           chainFilter={chainFilter}
-          convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
           debouncedSearchFilter={debouncedSearchFilter}
-          formatNumberOrStringCallback={formatNumberOrStringCallback}
           isBalancesOnlySearch={variation === TokenSelectorVariation.BalancesOnly}
           searchFilter={searchFilter}
-          useTokenSectionsForSearchResultsHook={useTokenSectionsForSearchResultsHook}
-          useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-          onDismiss={onDismiss}
           onSelectCurrency={onSelectCurrencyCallback}
         />
       )
@@ -194,67 +143,24 @@ function TokenSelectorContent({
       case TokenSelectorVariation.BalancesOnly:
         return (
           <TokenSelectorSendList
-            activeAccountAddress={activeAccountAddress}
             chainFilter={chainFilter}
-            convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-            formatNumberOrStringCallback={formatNumberOrStringCallback}
-            usePortfolioTokenOptionsHook={usePortfolioTokenOptionsHook}
-            useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-            onDismiss={onDismiss}
             onEmptyActionPress={onSendEmptyActionPress}
             onSelectCurrency={onSelectCurrencyCallback}
           />
         )
       case TokenSelectorVariation.BalancesAndPopular:
-        return (
-          <TokenSelectorSwapInputList
-            activeAccountAddress={activeAccountAddress}
-            chainFilter={chainFilter}
-            convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-            formatNumberOrStringCallback={formatNumberOrStringCallback}
-            usePopularTokensOptionsHook={usePopularTokensOptionsHook}
-            usePortfolioTokenOptionsHook={usePortfolioTokenOptionsHook}
-            useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-            onDismiss={onDismiss}
-            onSelectCurrency={onSelectCurrencyCallback}
-          />
-        )
+        return <TokenSelectorSwapInputList chainFilter={chainFilter} onSelectCurrency={onSelectCurrencyCallback} />
       case TokenSelectorVariation.SuggestedAndFavoritesAndPopular:
-        return (
-          <TokenSelectorSwapOutputList
-            activeAccountAddress={activeAccountAddress}
-            chainFilter={chainFilter}
-            convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-            formatNumberOrStringCallback={formatNumberOrStringCallback}
-            useCommonTokensOptionsHook={useCommonTokensOptionsHook}
-            useFavoriteTokensOptionsHook={useFavoriteTokensOptionsHook}
-            usePopularTokensOptionsHook={usePopularTokensOptionsHook}
-            useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-            onDismiss={onDismiss}
-            onSelectCurrency={onSelectCurrencyCallback}
-          />
-        )
+        return <TokenSelectorSwapOutputList chainFilter={chainFilter} onSelectCurrency={onSelectCurrencyCallback} />
     }
   }, [
     searchInFocus,
     searchFilter,
     variation,
-    activeAccountAddress,
+    onSelectCurrencyCallback,
     chainFilter,
     debouncedSearchFilter,
-    onDismiss,
-    addToSearchHistoryCallback,
-    convertFiatAmountFormattedCallback,
-    formatNumberOrStringCallback,
-    onSelectCurrencyCallback,
     onSendEmptyActionPress,
-    useCommonTokensOptionsHook,
-    useFavoriteTokensOptionsHook,
-    usePopularTokensOptionsHook,
-    usePortfolioTokenOptionsHook,
-    useTokenSectionsForEmptySearchHook,
-    useTokenSectionsForSearchResultsHook,
-    useTokenWarningDismissedHook,
   ])
 
   return (
@@ -276,7 +182,6 @@ function TokenSelectorContent({
             onCancel={isWeb ? undefined : onCancel}
             onChangeText={onChangeText}
             onClose={isWeb ? onClose : undefined}
-            onDismiss={onDismiss}
             onFocus={isWeb ? undefined : onFocus}
           />
         </Flex>
@@ -289,8 +194,8 @@ function TokenSelectorContent({
                 <NetworkFilter
                   includeAllNetworks
                   selectedChain={chainFilter}
-                  onDismiss={onDismiss}
-                  onPressAnimation={onPressAnimation}
+                  onDismiss={() => Keyboard.dismiss()}
+                  onPressAnimation={() => LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)}
                   onPressChain={onChangeChainFilter}
                 />
               </Flex>
@@ -310,12 +215,11 @@ function TokenSelectorModalContent(props: TokenSelectorProps): JSX.Element {
 
 function _TokenSelectorModal(props: TokenSelectorProps): JSX.Element {
   const colors = useSporeColors()
-  const { onDismiss, onClose } = props
 
   useEffect(() => {
     // Dismiss native keyboard when opening modal in case it was opened by the current screen.
-    onDismiss()
-  }, [onDismiss])
+    Keyboard.dismiss()
+  }, [])
 
   return (
     <BottomSheetModal
@@ -327,7 +231,7 @@ function _TokenSelectorModal(props: TokenSelectorProps): JSX.Element {
       backgroundColor={colors.surface1.get()}
       name={ModalName.TokenSelector}
       snapPoints={['65%', '100%']}
-      onClose={onClose}
+      onClose={props.onClose}
     >
       <TokenSelectorModalContent {...props} />
     </BottomSheetModal>
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
new file mode 100644
index 00000000000..85dbc1306e4
--- /dev/null
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
@@ -0,0 +1,130 @@
+import { memo, useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Text, TouchableArea } from 'ui/src'
+import { OnSelectCurrency, TokenOption, TokenSection } from 'uniswap/src/components/TokenSelector/types'
+import { getTokenOptionsSection } from 'uniswap/src/components/TokenSelector/utils'
+import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
+import { GqlResult } from 'uniswap/src/data/types'
+import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
+import { currencyId } from 'uniswap/src/utils/currencyId'
+import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+import { buildCurrency, gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
+import { SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
+import { clearSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
+import { selectSearchHistory } from 'wallet/src/features/search/selectSearchHistory'
+import { usePopularTokens } from 'wallet/src/features/tokens/hooks'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
+
+function searchResultToCurrencyInfo({
+  chainId,
+  address,
+  symbol,
+  name,
+  logoUrl,
+  safetyLevel,
+}: TokenSearchResult): CurrencyInfo | null {
+  const currency = buildCurrency({
+    chainId,
+    address,
+    decimals: 0, // this does not matter in a context of CurrencyInfo here, as we do not provide any balance
+    symbol,
+    name,
+  })
+
+  if (!currency) {
+    return null
+  }
+
+  const currencyInfo: CurrencyInfo = {
+    currency,
+    currencyId: currencyId(currency),
+    logoUrl,
+    safetyLevel: safetyLevel ?? SafetyLevel.StrongWarning,
+    // defaulting to not spam, as user has searched and chosen this token before
+    isSpam: false,
+  }
+  return currencyInfo
+}
+
+function currencyInfosToTokenOptions(currencyInfos: Array<CurrencyInfo | null> | undefined): TokenOption[] | undefined {
+  return currencyInfos
+    ?.filter((cI): cI is CurrencyInfo => Boolean(cI))
+    .map((currencyInfo) => ({
+      currencyInfo,
+      quantity: null,
+      balanceUSD: undefined,
+    }))
+}
+
+function ClearAll({ onPress }: { onPress: () => void }): JSX.Element {
+  const { t } = useTranslation()
+  return (
+    <TouchableArea onPress={onPress}>
+      <Text color="$accent1" variant="buttonLabel3">
+        {t('tokens.selector.button.clear')}
+      </Text>
+    </TouchableArea>
+  )
+}
+
+function useTokenSectionsForEmptySearch(): GqlResult<TokenSection[]> {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  const { popularTokens, loading } = usePopularTokens()
+
+  const searchHistory = useAppSelector(selectSearchHistory)
+
+  // it's a depenedency of useMemo => useCallback
+  const onPressClearSearchHistory = useCallback((): void => {
+    dispatch(clearSearchHistory())
+  }, [dispatch])
+
+  const sections = useMemo(
+    () => [
+      ...(getTokenOptionsSection(
+        t('tokens.selector.section.recent'),
+        currencyInfosToTokenOptions(
+          searchHistory
+            .filter((searchResult): searchResult is TokenSearchResult => searchResult.type === SearchResultType.Token)
+            .map(searchResultToCurrencyInfo),
+        ),
+        <ClearAll onPress={onPressClearSearchHistory} />,
+      ) ?? []),
+      ...(getTokenOptionsSection(
+        t('tokens.selector.section.popular'),
+        currencyInfosToTokenOptions(popularTokens?.map(gqlTokenToCurrencyInfo)),
+      ) ?? []),
+    ],
+    [onPressClearSearchHistory, popularTokens, searchHistory, t],
+  )
+
+  return useMemo(
+    () => ({
+      data: sections,
+      loading,
+    }),
+    [loading, sections],
+  )
+}
+
+function _TokenSelectorEmptySearchList({ onSelectCurrency }: { onSelectCurrency: OnSelectCurrency }): JSX.Element {
+  const { t } = useTranslation()
+
+  const { data: sections, loading, error, refetch } = useTokenSectionsForEmptySearch()
+
+  return (
+    <TokenSelectorList
+      showTokenAddress
+      errorText={t('token.selector.search.error')}
+      hasError={Boolean(error)}
+      loading={loading}
+      refetch={refetch}
+      sections={sections}
+      showTokenWarnings={true}
+      onSelectCurrency={onSelectCurrency}
+    />
+  )
+}
+
+export const TokenSelectorEmptySearchList = memo(_TokenSelectorEmptySearchList)
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx
similarity index 73%
rename from packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx
rename to packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx
index 671de80a0bd..bef9a0bd517 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx
@@ -5,7 +5,6 @@ import { Flex, Loader, Skeleton, Text, isWeb } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { fonts } from 'ui/src/theme'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
-import { TokenOptionItem } from 'uniswap/src/components/TokenSelector/TokenOptionItem'
 import {
   SectionHeaderProps,
   TokenSectionBaseList,
@@ -14,19 +13,16 @@ import {
 import { renderSuggestedTokenItem } from 'uniswap/src/components/TokenSelector/renderSuggestedTokenItem'
 import { suggestedTokensKeyExtractor } from 'uniswap/src/components/TokenSelector/suggestedTokensKeyExtractor'
 import {
-  ConvertFiatAmountFormattedCallback,
   OnSelectCurrency,
   SuggestedTokenSection,
   TokenOption,
   TokenSection,
   TokenSelectorListSections,
-  TokenWarningDismissedHook,
 } from 'uniswap/src/components/TokenSelector/types'
-import { useBottomSheetFocusHook } from 'uniswap/src/components/modals/hooks'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
-import { NumberType } from 'utilities/src/format/types'
+import { TokenOptionItem } from 'wallet/src/components/TokenSelector/TokenOptionItem'
+import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
 
 function isSuggestedTokenItem(data: TokenOption | TokenOption[]): data is TokenOption[] {
   return Array.isArray(data)
@@ -38,16 +34,12 @@ function isSuggestedTokenSection(section: SuggestedTokenSection | TokenSection):
 
 function TokenOptionItemWrapper({
   tokenOption,
-  onDismiss,
   onSelectCurrency,
   section,
   index,
   chainFilter,
   showWarnings,
   showTokenAddress,
-  useTokenWarningDismissedHook,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
 }: {
   tokenOption: TokenOption
   onSelectCurrency: OnSelectCurrency
@@ -56,35 +48,18 @@ function TokenOptionItemWrapper({
   chainFilter: Maybe<UniverseChainId>
   showWarnings: boolean
   showTokenAddress?: boolean
-  useTokenWarningDismissedHook: TokenWarningDismissedHook
-
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  onDismiss: () => void
 }): JSX.Element {
   const onPress = useCallback(
     () => onSelectCurrency(tokenOption.currencyInfo, section, index),
     [index, onSelectCurrency, section, tokenOption.currencyInfo],
   )
-  const { tokenWarningDismissed, dismissWarningCallback } = useTokenWarningDismissedHook(
-    tokenOption.currencyInfo.currencyId,
-  )
 
   return (
     <TokenOptionItem
-      balance={convertFiatAmountFormattedCallback(tokenOption.balanceUSD, NumberType.FiatTokenPrice)}
-      dismissWarningCallback={dismissWarningCallback}
       option={tokenOption}
-      quantity={tokenOption.quantity}
-      quantityFormatted={formatNumberOrStringCallback({
-        value: tokenOption.quantity,
-        type: NumberType.TokenTx,
-      })}
       showNetworkPill={!chainFilter && tokenOption.currencyInfo.currency.chainId !== UniverseChainId.Mainnet}
       showTokenAddress={showTokenAddress}
       showWarnings={showWarnings}
-      tokenWarningDismissed={tokenWarningDismissed}
-      onDismiss={onDismiss}
       onPress={onPress}
     />
   )
@@ -101,15 +76,10 @@ interface TokenSelectorListProps {
   emptyElement?: JSX.Element
   errorText?: string
   showTokenAddress?: boolean
-  useTokenWarningDismissedHook: TokenWarningDismissedHook
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  onDismiss: () => void
 }
 
 function _TokenSelectorList({
   onSelectCurrency,
-  onDismiss,
   sections,
   chainFilter,
   showTokenWarnings,
@@ -119,9 +89,6 @@ function _TokenSelectorList({
   emptyElement,
   errorText,
   showTokenAddress,
-  useTokenWarningDismissedHook,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
 }: TokenSelectorListProps): JSX.Element {
   const { t } = useTranslation()
   const sectionListRef = useRef<TokenSectionBaseListRef>()
@@ -154,15 +121,11 @@ function _TokenSelectorList({
         return (
           <TokenOptionItemWrapper
             chainFilter={chainFilter}
-            convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-            formatNumberOrStringCallback={formatNumberOrStringCallback}
             index={index}
             section={section}
             showTokenAddress={showTokenAddress}
             showWarnings={showTokenWarnings}
             tokenOption={item}
-            useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-            onDismiss={onDismiss}
             onSelectCurrency={onSelectCurrency}
           />
         )
@@ -170,16 +133,7 @@ function _TokenSelectorList({
 
       return null
     },
-    [
-      chainFilter,
-      onSelectCurrency,
-      showTokenAddress,
-      showTokenWarnings,
-      useTokenWarningDismissedHook,
-      convertFiatAmountFormattedCallback,
-      formatNumberOrStringCallback,
-      onDismiss,
-    ],
+    [chainFilter, onSelectCurrency, showTokenAddress, showTokenWarnings],
   )
 
   const renderSectionHeader = useCallback(
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
new file mode 100644
index 00000000000..d75f4ffd941
--- /dev/null
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
@@ -0,0 +1,164 @@
+import { memo, useCallback, useMemo } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { Flex, Text } from 'ui/src'
+import { OnSelectCurrency, TokenSection } from 'uniswap/src/components/TokenSelector/types'
+import { formatSearchResults, getTokenOptionsSection } from 'uniswap/src/components/TokenSelector/utils'
+import { GqlResult } from 'uniswap/src/data/types'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { SectionHeader, TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+import { usePortfolioBalancesForAddressById, usePortfolioTokenOptions } from 'wallet/src/components/TokenSelector/hooks'
+import { useSearchTokens } from 'wallet/src/features/dataApi/searchTokens'
+import { SearchResultType } from 'wallet/src/features/search/SearchResult'
+import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
+
+function EmptyResults({ searchFilter }: { searchFilter: string }): JSX.Element {
+  const { t } = useTranslation()
+  return (
+    <Flex>
+      <SectionHeader title={t('tokens.selector.section.search')} />
+      <Text color="$neutral3" textAlign="center" variant="subheading2">
+        <Trans
+          components={{ highlight: <Text color="$neutral1" variant="subheading2" /> }}
+          i18nKey="tokens.selector.search.empty"
+          values={{ searchText: searchFilter }}
+        />
+      </Text>
+    </Flex>
+  )
+}
+
+function useTokenSectionsForSearchResults(
+  chainFilter: UniverseChainId | null,
+  searchFilter: string | null,
+  isBalancesOnlySearch: boolean,
+): GqlResult<TokenSection[]> {
+  const { t } = useTranslation()
+  const activeAccountAddress = useActiveAccountAddressWithThrow()
+
+  const {
+    data: portfolioBalancesById,
+    error: portfolioBalancesByIdError,
+    refetch: refetchPortfolioBalances,
+    loading: portfolioBalancesByIdLoading,
+  } = usePortfolioBalancesForAddressById(activeAccountAddress)
+
+  const {
+    data: portfolioTokenOptions,
+    error: portfolioTokenOptionsError,
+    refetch: refetchPortfolioTokenOptions,
+    loading: portfolioTokenOptionsLoading,
+  } = usePortfolioTokenOptions(activeAccountAddress, chainFilter, searchFilter ?? undefined)
+
+  // Only call search endpoint if isBalancesOnlySearch is false
+  const {
+    data: searchResultCurrencies,
+    error: searchTokensError,
+    refetch: refetchSearchTokens,
+    loading: searchTokensLoading,
+  } = useSearchTokens(searchFilter, chainFilter, /*skip*/ isBalancesOnlySearch)
+
+  const searchResults = useMemo(() => {
+    return formatSearchResults(searchResultCurrencies, portfolioBalancesById, searchFilter)
+  }, [searchResultCurrencies, portfolioBalancesById, searchFilter])
+
+  const loading =
+    portfolioTokenOptionsLoading || portfolioBalancesByIdLoading || (!isBalancesOnlySearch && searchTokensLoading)
+
+  const sections = useMemo(
+    () =>
+      getTokenOptionsSection(
+        t('tokens.selector.section.search'),
+        // Use local search when only searching balances
+        isBalancesOnlySearch ? portfolioTokenOptions : searchResults,
+      ),
+    [isBalancesOnlySearch, portfolioTokenOptions, searchResults, t],
+  )
+
+  const error =
+    (!portfolioBalancesById && portfolioBalancesByIdError) ||
+    (!portfolioTokenOptions && portfolioTokenOptionsError) ||
+    (!isBalancesOnlySearch && !searchResults && searchTokensError)
+
+  const refetchAll = useCallback(() => {
+    refetchPortfolioBalances?.()
+    refetchSearchTokens?.()
+    refetchPortfolioTokenOptions?.()
+  }, [refetchPortfolioBalances, refetchPortfolioTokenOptions, refetchSearchTokens])
+
+  return useMemo(
+    () => ({
+      data: sections,
+      loading,
+      error: error || undefined,
+      refetch: refetchAll,
+    }),
+    [error, loading, refetchAll, sections],
+  )
+}
+
+function _TokenSelectorSearchResultsList({
+  onSelectCurrency: parentOnSelectCurrency,
+  chainFilter,
+  searchFilter,
+  debouncedSearchFilter,
+  isBalancesOnlySearch,
+}: {
+  onSelectCurrency: OnSelectCurrency
+  chainFilter: UniverseChainId | null
+  searchFilter: string
+  debouncedSearchFilter: string | null
+  isBalancesOnlySearch: boolean
+}): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const {
+    data: sections,
+    loading,
+    error,
+    refetch,
+  } = useTokenSectionsForSearchResults(chainFilter, debouncedSearchFilter, isBalancesOnlySearch)
+
+  const onSelectCurrency: OnSelectCurrency = (currencyInfo, section, index) => {
+    parentOnSelectCurrency(currencyInfo, section, index)
+    if (currencyInfo.currency.symbol && currencyInfo.currency.isToken) {
+      dispatch(
+        addToSearchHistory({
+          searchResult: {
+            type: SearchResultType.Token,
+            chainId: currencyInfo.currency.chainId,
+            address: currencyInfo.currency.address,
+            name: currencyInfo.currency.name ?? null,
+            symbol: currencyInfo.currency.symbol,
+            logoUrl: currencyInfo.logoUrl ?? null,
+            safetyLevel: currencyInfo.safetyLevel ?? null,
+          },
+        }),
+      )
+    }
+  }
+
+  const userIsTyping = Boolean(searchFilter && debouncedSearchFilter !== searchFilter)
+
+  const emptyElement = useMemo(
+    () => (debouncedSearchFilter ? <EmptyResults searchFilter={debouncedSearchFilter} /> : undefined),
+    [debouncedSearchFilter],
+  )
+  return (
+    <TokenSelectorList
+      showTokenAddress
+      chainFilter={chainFilter}
+      emptyElement={emptyElement}
+      errorText={t('token.selector.search.error')}
+      hasError={Boolean(error)}
+      loading={userIsTyping || loading}
+      refetch={refetch}
+      sections={sections}
+      showTokenWarnings={true}
+      onSelectCurrency={onSelectCurrency}
+    />
+  )
+}
+
+export const TokenSelectorSearchResultsList = memo(_TokenSelectorSearchResultsList)
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx
new file mode 100644
index 00000000000..bb4490d01da
--- /dev/null
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx
@@ -0,0 +1,109 @@
+import { skipToken } from '@reduxjs/toolkit/dist/query'
+import { memo, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Flex, SpinningLoader, isWeb } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
+import { OnSelectCurrency, TokenSection } from 'uniswap/src/components/TokenSelector/types'
+import { getTokenOptionsSection } from 'uniswap/src/components/TokenSelector/utils'
+import { GqlResult } from 'uniswap/src/data/types'
+import { UniverseChainId } from 'uniswap/src/types/chains'
+import { SectionHeader, TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+import { usePortfolioTokenOptions } from 'wallet/src/components/TokenSelector/hooks'
+import { useFiatOnRampIpAddressQuery } from 'wallet/src/features/fiatOnRamp/api'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+
+function useTokenSectionsForSend(chainFilter: UniverseChainId | null): GqlResult<TokenSection[]> {
+  const { t } = useTranslation()
+  const activeAccountAddress = useActiveAccountAddressWithThrow()
+
+  const {
+    data: portfolioTokenOptions,
+    error: portfolioTokenOptionsError,
+    refetch: refetchPortfolioTokenOptions,
+    loading: portfolioTokenOptionsLoading,
+  } = usePortfolioTokenOptions(activeAccountAddress, chainFilter)
+
+  const loading = portfolioTokenOptionsLoading
+  const error = !portfolioTokenOptions && portfolioTokenOptionsError
+
+  const sections = useMemo(
+    () => getTokenOptionsSection(t('tokens.selector.section.yours'), portfolioTokenOptions),
+    [portfolioTokenOptions, t],
+  )
+
+  return useMemo(
+    () => ({
+      data: sections,
+      loading,
+      error: error || undefined,
+      refetch: refetchPortfolioTokenOptions,
+    }),
+    [error, loading, refetchPortfolioTokenOptions, sections],
+  )
+}
+
+function EmptyList({ onEmptyActionPress }: { onEmptyActionPress?: () => void }): JSX.Element {
+  const { t } = useTranslation()
+
+  const { data: ipAddressData, isLoading } = useFiatOnRampIpAddressQuery(
+    // TODO(EXT-669): re-enable this once we have an onramp for the Extension.
+    isWeb ? skipToken : undefined,
+  )
+
+  const fiatOnRampEligible = Boolean(ipAddressData?.isBuyAllowed)
+
+  return (
+    <Flex>
+      <SectionHeader title={t('tokens.selector.section.yours')} />
+      <Flex pt="$spacing16" px="$spacing16">
+        {isLoading ? (
+          <Flex centered row flexDirection="row" gap="$spacing4" mt="$spacing60" p="$spacing4">
+            <SpinningLoader color="$neutral3" size={iconSizes.icon64} />
+          </Flex>
+        ) : (
+          <BaseCard.EmptyState
+            buttonLabel={
+              fiatOnRampEligible && onEmptyActionPress
+                ? t('tokens.selector.empty.buy.title')
+                : t('tokens.selector.empty.receive.title')
+            }
+            description={
+              fiatOnRampEligible ? t('tokens.selector.empty.buy.message') : t('tokens.selector.empty.receive.message')
+            }
+            title={t('tokens.selector.empty.title')}
+            onPress={onEmptyActionPress}
+          />
+        )}
+      </Flex>
+    </Flex>
+  )
+}
+
+function _TokenSelectorSendList({
+  onSelectCurrency,
+  chainFilter,
+  onEmptyActionPress,
+}: {
+  onSelectCurrency: OnSelectCurrency
+  chainFilter: UniverseChainId | null
+  onEmptyActionPress: () => void
+}): JSX.Element {
+  const { data: sections, loading, error, refetch } = useTokenSectionsForSend(chainFilter)
+  const emptyElement = useMemo(() => <EmptyList onEmptyActionPress={onEmptyActionPress} />, [onEmptyActionPress])
+
+  return (
+    <TokenSelectorList
+      chainFilter={chainFilter}
+      emptyElement={emptyElement}
+      hasError={Boolean(error)}
+      loading={loading}
+      refetch={refetch}
+      sections={sections}
+      showTokenWarnings={false}
+      onSelectCurrency={onSelectCurrency}
+    />
+  )
+}
+
+export const TokenSelectorSendList = memo(_TokenSelectorSendList)
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorSwapInputList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
similarity index 57%
rename from packages/uniswap/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
rename to packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
index 03c5c5f3d58..44ff35695c3 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
@@ -1,33 +1,23 @@
 import { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { TokenSelectorList } from 'uniswap/src/components/TokenSelector/TokenSelectorList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  OnSelectCurrency,
-  TokenSection,
-  TokenSectionsForSwapInput,
-  TokenSelectorListSections,
-  TokenWarningDismissedHook,
-} from 'uniswap/src/components/TokenSelector/types'
+import { OnSelectCurrency, TokenSection, TokenSelectorListSections } from 'uniswap/src/components/TokenSelector/types'
 import { getTokenOptionsSection, tokenOptionDifference } from 'uniswap/src/components/TokenSelector/utils'
 import { GqlResult } from 'uniswap/src/data/types'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+import { usePopularTokensOptions, usePortfolioTokenOptions } from 'wallet/src/components/TokenSelector/hooks'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
-function useTokenSectionsForSwapInput({
-  activeAccountAddress,
-  chainFilter,
-  usePortfolioTokenOptionsHook,
-  usePopularTokensOptionsHook,
-}: TokenSectionsForSwapInput): GqlResult<TokenSelectorListSections> {
+function useTokenSectionsForSwapInput(chainFilter: UniverseChainId | null): GqlResult<TokenSelectorListSections> {
   const { t } = useTranslation()
+  const activeAccountAddress = useActiveAccountAddressWithThrow()
 
   const {
     data: portfolioTokenOptions,
     error: portfolioTokenOptionsError,
     refetch: refetchPortfolioTokenOptions,
     loading: portfolioTokenOptionsLoading,
-  } = usePortfolioTokenOptionsHook(activeAccountAddress, chainFilter)
+  } = usePortfolioTokenOptions(activeAccountAddress, chainFilter)
 
   const {
     data: popularTokenOptions,
@@ -35,7 +25,7 @@ function useTokenSectionsForSwapInput({
     refetch: refetchPopularTokenOptions,
     loading: popularTokenOptionsLoading,
     // if there is no chain filter then we show mainnet tokens
-  } = usePopularTokensOptionsHook(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
+  } = usePopularTokensOptions(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
 
   const error =
     (!portfolioTokenOptions && portfolioTokenOptionsError) || (!popularTokenOptions && popularTokenOptionsError)
@@ -72,45 +62,21 @@ function useTokenSectionsForSwapInput({
 }
 
 function _TokenSelectorSwapInputList({
-  onDismiss,
   onSelectCurrency,
-  activeAccountAddress,
   chainFilter,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
-  usePortfolioTokenOptionsHook,
-  usePopularTokensOptionsHook,
-  useTokenWarningDismissedHook,
-}: TokenSectionsForSwapInput & {
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  onDismiss: () => void
+}: {
   onSelectCurrency: OnSelectCurrency
-  useTokenWarningDismissedHook: TokenWarningDismissedHook
+  chainFilter: UniverseChainId | null
 }): JSX.Element {
-  const {
-    data: sections,
-    loading,
-    error,
-    refetch,
-  } = useTokenSectionsForSwapInput({
-    activeAccountAddress,
-    chainFilter,
-    usePortfolioTokenOptionsHook,
-    usePopularTokensOptionsHook,
-  })
+  const { data: sections, loading, error, refetch } = useTokenSectionsForSwapInput(chainFilter)
   return (
     <TokenSelectorList
       chainFilter={chainFilter}
-      convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-      formatNumberOrStringCallback={formatNumberOrStringCallback}
       hasError={Boolean(error)}
       loading={loading}
       refetch={refetch}
       sections={sections}
       showTokenWarnings={true}
-      useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-      onDismiss={onDismiss}
       onSelectCurrency={onSelectCurrency}
     />
   )
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx b/packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
similarity index 60%
rename from packages/uniswap/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
rename to packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
index b2cbda5e283..864df0b649e 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
+++ b/packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
@@ -1,26 +1,21 @@
 import { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { isWeb } from 'ui/src'
-import { TokenSelectorList } from 'uniswap/src/components/TokenSelector/TokenSelectorList'
-import {
-  ConvertFiatAmountFormattedCallback,
-  OnSelectCurrency,
-  TokenSectionsForSwapOutput,
-  TokenSelectorListSections,
-} from 'uniswap/src/components/TokenSelector/types'
+import { OnSelectCurrency, TokenSelectorListSections } from 'uniswap/src/components/TokenSelector/types'
 import { getTokenOptionsSection } from 'uniswap/src/components/TokenSelector/utils'
 import { GqlResult } from 'uniswap/src/data/types'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+import {
+  useCommonTokensOptions,
+  useFavoriteTokensOptions,
+  usePopularTokensOptions,
+} from 'wallet/src/components/TokenSelector/hooks'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
-function useTokenSectionsForSwapOutput({
-  activeAccountAddress,
-  chainFilter,
-  usePopularTokensOptionsHook,
-  useFavoriteTokensOptionsHook,
-  useCommonTokensOptionsHook,
-}: TokenSectionsForSwapOutput): GqlResult<TokenSelectorListSections> {
+function useTokenSectionsForSwapOutput(chainFilter: UniverseChainId | null): GqlResult<TokenSelectorListSections> {
   const { t } = useTranslation()
+  const activeAccountAddress = useActiveAccountAddressWithThrow()
 
   const {
     data: popularTokenOptions,
@@ -28,14 +23,14 @@ function useTokenSectionsForSwapOutput({
     refetch: refetchPopularTokenOptions,
     loading: popularTokenOptionsLoading,
     // if there is no chain filter then we show mainnet tokens
-  } = usePopularTokensOptionsHook(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
+  } = usePopularTokensOptions(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
 
   const {
     data: favoriteTokenOptions,
     error: favoriteTokenOptionsError,
     refetch: refetchFavoriteTokenOptions,
     loading: favoriteTokenOptionsLoading,
-  } = useFavoriteTokensOptionsHook(activeAccountAddress, chainFilter)
+  } = useFavoriteTokensOptions(activeAccountAddress, chainFilter)
 
   const {
     data: commonTokenOptions,
@@ -43,7 +38,7 @@ function useTokenSectionsForSwapOutput({
     refetch: refetchCommonTokenOptions,
     loading: commonTokenOptionsLoading,
     // if there is no chain filter then we show mainnet tokens
-  } = useCommonTokensOptionsHook(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
+  } = useCommonTokensOptions(activeAccountAddress, chainFilter ?? UniverseChainId.Mainnet)
 
   const error =
     (!popularTokenOptions && popularTokenOptionsError) ||
@@ -84,52 +79,22 @@ function useTokenSectionsForSwapOutput({
 }
 
 function _TokenSelectorSwapOutputList({
-  onDismiss,
   onSelectCurrency,
-  activeAccountAddress,
   chainFilter,
-  formatNumberOrStringCallback,
-  convertFiatAmountFormattedCallback,
-  useTokenWarningDismissedHook,
-  usePopularTokensOptionsHook,
-  useFavoriteTokensOptionsHook,
-  useCommonTokensOptionsHook,
-}: TokenSectionsForSwapOutput & {
+}: {
   onSelectCurrency: OnSelectCurrency
   chainFilter: UniverseChainId | null
-  formatNumberOrStringCallback: (input: FormatNumberOrStringInput) => string
-  convertFiatAmountFormattedCallback: ConvertFiatAmountFormattedCallback
-  useTokenWarningDismissedHook: (currencyId: Maybe<string>) => {
-    tokenWarningDismissed: boolean
-    dismissWarningCallback: () => void
-  }
-  onDismiss: () => void
 }): JSX.Element {
-  const {
-    data: sections,
-    loading,
-    error,
-    refetch,
-  } = useTokenSectionsForSwapOutput({
-    activeAccountAddress,
-    chainFilter,
-    usePopularTokensOptionsHook,
-    useFavoriteTokensOptionsHook,
-    useCommonTokensOptionsHook,
-  })
+  const { data: sections, loading, error, refetch } = useTokenSectionsForSwapOutput(chainFilter)
 
   return (
     <TokenSelectorList
       chainFilter={chainFilter}
-      convertFiatAmountFormattedCallback={convertFiatAmountFormattedCallback}
-      formatNumberOrStringCallback={formatNumberOrStringCallback}
       hasError={Boolean(error)}
       loading={loading}
       refetch={refetch}
       sections={sections}
       showTokenWarnings={true}
-      useTokenWarningDismissedHook={useTokenWarningDismissedHook}
-      onDismiss={onDismiss}
       onSelectCurrency={onSelectCurrency}
     />
   )
diff --git a/packages/wallet/src/components/TokenSelector/filter.test.ts b/packages/wallet/src/components/TokenSelector/filter.test.ts
index f5e8d698bff..1add6851217 100644
--- a/packages/wallet/src/components/TokenSelector/filter.test.ts
+++ b/packages/wallet/src/components/TokenSelector/filter.test.ts
@@ -1,10 +1,10 @@
 import { Currency } from '@uniswap/sdk-core'
 import { filter } from 'uniswap/src/components/TokenSelector/filter'
 import { TokenOption } from 'uniswap/src/components/TokenSelector/types'
-import { DAI, DAI_ARBITRUM_ONE } from 'uniswap/src/constants/tokens'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { currencyId } from 'uniswap/src/utils/currencyId'
+import { DAI, DAI_ARBITRUM_ONE } from 'wallet/src/constants/tokens'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 
 const ETH = NativeCurrency.onChain(UniverseChainId.Mainnet)
 
@@ -44,7 +44,7 @@ const TEST_TOKEN_INPUT: TokenOption[] = [
 const filterAndGetCurrencies = (
   currencies: TokenOption[],
   chainFilter: WalletChainId | null,
-  searchFilter?: string,
+  searchFilter?: string
 ): Currency[] => filter(currencies, chainFilter, searchFilter).map((cm) => cm.currencyInfo.currency)
 
 describe(filter, () => {
@@ -66,7 +66,10 @@ describe(filter, () => {
 
   it('filters by partial token name', () => {
     expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, null, 'th')).toEqual([ETH])
-    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, null, 'stable')).toEqual([DAI, DAI_ARBITRUM_ONE])
+    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, null, 'stable')).toEqual([
+      DAI,
+      DAI_ARBITRUM_ONE,
+    ])
   })
 
   it('filters by first characters of token address', () => {
@@ -86,10 +89,18 @@ describe(filter, () => {
 
   it('filters by chainFilter and searchFilter', () => {
     expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.Mainnet, 'DA')).toEqual([DAI])
-    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.Mainnet, DAI.address)).toEqual([DAI])
-    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.ArbitrumOne, 'DAI')).toEqual([DAI_ARBITRUM_ONE])
-    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.ArbitrumOne, DAI_ARBITRUM_ONE.address)).toEqual([
+    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.Mainnet, DAI.address)).toEqual([
+      DAI,
+    ])
+    expect(filterAndGetCurrencies(TEST_TOKEN_INPUT, UniverseChainId.ArbitrumOne, 'DAI')).toEqual([
       DAI_ARBITRUM_ONE,
     ])
+    expect(
+      filterAndGetCurrencies(
+        TEST_TOKEN_INPUT,
+        UniverseChainId.ArbitrumOne,
+        DAI_ARBITRUM_ONE.address
+      )
+    ).toEqual([DAI_ARBITRUM_ONE])
   })
 })
diff --git a/packages/wallet/src/components/TokenSelector/flowToModalName.tsx b/packages/wallet/src/components/TokenSelector/flowToModalName.tsx
index ff38fa38e6c..cd74d22b7e9 100644
--- a/packages/wallet/src/components/TokenSelector/flowToModalName.tsx
+++ b/packages/wallet/src/components/TokenSelector/flowToModalName.tsx
@@ -1,5 +1,5 @@
 import { ModalName, ModalNameType } from 'uniswap/src/features/telemetry/constants'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 
 export function flowToModalName(flow: TokenSelectorFlow): ModalNameType | undefined {
   switch (flow) {
diff --git a/packages/wallet/src/components/TokenSelector/hooks.test.ts b/packages/wallet/src/components/TokenSelector/hooks.test.ts
index e1e0d2474e4..5ad8f6ecec2 100644
--- a/packages/wallet/src/components/TokenSelector/hooks.test.ts
+++ b/packages/wallet/src/components/TokenSelector/hooks.test.ts
@@ -6,9 +6,6 @@ import { createEmptyBalanceOption } from 'uniswap/src/components/TokenSelector/u
 import { BRIDGED_BASE_ADDRESSES } from 'uniswap/src/constants/addresses'
 import { Chain } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { tokenProjectToCurrencyInfos } from 'uniswap/src/features/dataApi/utils'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
-import { arbitrumDaiCurrencyInfo, ethCurrencyInfo, usdcCurrencyInfo } from 'uniswap/src/test/fixtures'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import {
@@ -22,10 +19,14 @@ import {
   usePortfolioBalancesForAddressById,
   usePortfolioTokenOptions,
 } from 'wallet/src/components/TokenSelector/hooks'
+import { tokenProjectToCurrencyInfos } from 'wallet/src/features/dataApi/utils'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 import { SharedState } from 'wallet/src/state/reducer'
 import {
   SAMPLE_SEED_ADDRESS_1,
+  arbitrumDaiCurrencyInfo,
   daiToken,
+  ethCurrencyInfo,
   ethToken,
   portfolio,
   portfolioBalance,
@@ -35,6 +36,7 @@ import {
   tokenProject,
   usdcArbitrumToken,
   usdcBaseToken,
+  usdcCurrencyInfo,
   usdcToken,
 } from 'wallet/src/test/fixtures'
 import { act, createArray, renderHook, waitFor } from 'wallet/src/test/test-utils'
@@ -54,7 +56,7 @@ const favoriteTokens = [eth, dai, usdc]
 const favoriteTokenBalances = [ethBalance, daiBalance, usdcBalance]
 
 const favoriteCurrencyIds = favoriteTokens.map((t) =>
-  buildCurrencyId(fromGraphQLChain(t.chain) ?? UniverseChainId.Mainnet, t.address),
+  buildCurrencyId(fromGraphQLChain(t.chain) ?? UniverseChainId.Mainnet, t.address)
 )
 
 const preloadedState: PreloadedState<SharedState> = {
@@ -78,8 +80,16 @@ const queryResolver =
 describe(useAllCommonBaseCurrencies, () => {
   const projects = createArray(3, tokenProject)
 
-  const nonBridgedTokens = [ethToken(), daiToken(), usdcToken(), usdcBaseToken(), usdcArbitrumToken()]
-  const bridgedTokens = BRIDGED_BASE_ADDRESSES.map((address) => token({ address, chain: Chain.Ethereum }))
+  const nonBridgedTokens = [
+    ethToken(),
+    daiToken(),
+    usdcToken(),
+    usdcBaseToken(),
+    usdcArbitrumToken(),
+  ]
+  const bridgedTokens = BRIDGED_BASE_ADDRESSES.map((address) =>
+    token({ address, chain: Chain.Ethereum })
+  )
   const projectWithBridged = tokenProject({ tokens: [...nonBridgedTokens, ...bridgedTokens] })
   const tokenProjectWithoutBridged = {
     ...projectWithBridged, // Copy all props except tokens (leave only non-bridged tokens)
@@ -486,7 +496,7 @@ describe(usePortfolioTokenOptions, () => {
     it.each(cases)('$test', async ({ input, output }) => {
       const { result } = renderHook(
         () => usePortfolioTokenOptions(...(input as Parameters<typeof usePortfolioTokenOptions>)),
-        { resolvers },
+        { resolvers }
       )
 
       await waitFor(() => {
@@ -522,7 +532,9 @@ describe(usePopularTokensOptions, () => {
       test: 'returns popular token options when there is data',
       input: { portfolios: [portfolio({ tokenBalances })], topTokens },
       output: {
-        data: expect.toIncludeSameMembers(tokenBalances.map((t) => portfolioBalance({ fromBalance: t }))),
+        data: expect.toIncludeSameMembers(
+          tokenBalances.map((t) => portfolioBalance({ fromBalance: t }))
+        ),
         error: undefined,
       },
     },
@@ -530,11 +542,14 @@ describe(usePopularTokensOptions, () => {
 
   it.each(cases)('$test', async ({ input, output }) => {
     const { resolvers } = queryResolvers(
-      Object.fromEntries(Object.entries(input).map(([name, resolver]) => [name, queryResolver(resolver)])),
+      Object.fromEntries(
+        Object.entries(input).map(([name, resolver]) => [name, queryResolver(resolver)])
+      )
+    )
+    const { result } = renderHook(
+      () => usePopularTokensOptions(SAMPLE_SEED_ADDRESS_1, UniverseChainId.ArbitrumOne),
+      { resolvers }
     )
-    const { result } = renderHook(() => usePopularTokensOptions(SAMPLE_SEED_ADDRESS_1, UniverseChainId.ArbitrumOne), {
-      resolvers,
-    })
 
     expect(result.current.loading).toEqual(true)
 
@@ -575,7 +590,9 @@ describe(useCommonTokensOptions, () => {
         tokenProjects: [tokenProject({ tokens })],
       },
       output: {
-        data: expect.toIncludeSameMembers(tokenBalances.map((t) => portfolioBalance({ fromBalance: t }))),
+        data: expect.toIncludeSameMembers(
+          tokenBalances.map((t) => portfolioBalance({ fromBalance: t }))
+        ),
         error: undefined,
       },
     },
@@ -599,9 +616,14 @@ describe(useCommonTokensOptions, () => {
 
   it.each(cases)('$test', async ({ input: { chainFilter = null, ...resolverResults }, output }) => {
     const { resolvers } = queryResolvers(
-      Object.fromEntries(Object.entries(resolverResults).map(([name, resolver]) => [name, queryResolver(resolver)])),
+      Object.fromEntries(
+        Object.entries(resolverResults).map(([name, resolver]) => [name, queryResolver(resolver)])
+      )
+    )
+    const { result } = renderHook(
+      () => useCommonTokensOptions(SAMPLE_SEED_ADDRESS_1, chainFilter),
+      { resolvers }
     )
-    const { result } = renderHook(() => useCommonTokensOptions(SAMPLE_SEED_ADDRESS_1, chainFilter), { resolvers })
 
     expect(result.current.loading).toEqual(true)
 
@@ -642,7 +664,7 @@ describe(useFavoriteTokensOptions, () => {
       },
       output: {
         data: expect.toIncludeSameMembers(
-          favoriteTokenBalances.map((balance) => portfolioBalance({ fromBalance: balance })),
+          favoriteTokenBalances.map((balance) => portfolioBalance({ fromBalance: balance }))
         ),
         error: undefined,
       },
@@ -667,12 +689,14 @@ describe(useFavoriteTokensOptions, () => {
 
   it.each(cases)('$test', async ({ input: { chainFilter = null, ...resolverResults }, output }) => {
     const { resolvers } = queryResolvers(
-      Object.fromEntries(Object.entries(resolverResults).map(([name, resolver]) => [name, queryResolver(resolver)])),
+      Object.fromEntries(
+        Object.entries(resolverResults).map(([name, resolver]) => [name, queryResolver(resolver)])
+      )
+    )
+    const { result } = renderHook(
+      () => useFavoriteTokensOptions(SAMPLE_SEED_ADDRESS_1, chainFilter),
+      { resolvers, preloadedState }
     )
-    const { result } = renderHook(() => useFavoriteTokensOptions(SAMPLE_SEED_ADDRESS_1, chainFilter), {
-      resolvers,
-      preloadedState,
-    })
 
     expect(result.current.loading).toEqual(true)
 
diff --git a/packages/wallet/src/components/TokenSelector/hooks.tsx b/packages/wallet/src/components/TokenSelector/hooks.ts
similarity index 60%
rename from packages/wallet/src/components/TokenSelector/hooks.tsx
rename to packages/wallet/src/components/TokenSelector/hooks.ts
index 3a1a83f7bad..acbf946c496 100644
--- a/packages/wallet/src/components/TokenSelector/hooks.tsx
+++ b/packages/wallet/src/components/TokenSelector/hooks.ts
@@ -1,43 +1,27 @@
-/* eslint-disable max-lines */
 import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
-import { Text, TouchableArea } from 'ui/src'
 import { filter } from 'uniswap/src/components/TokenSelector/filter'
-import { TokenOption, TokenSection } from 'uniswap/src/components/TokenSelector/types'
-import {
-  createEmptyBalanceOption,
-  formatSearchResults,
-  getTokenOptionsSection,
-} from 'uniswap/src/components/TokenSelector/utils'
+import { TokenOption } from 'uniswap/src/components/TokenSelector/types'
+import { createEmptyBalanceOption } from 'uniswap/src/components/TokenSelector/utils'
 import { BRIDGED_BASE_ADDRESSES } from 'uniswap/src/constants/addresses'
-import { DAI, USDC, USDT, WBTC } from 'uniswap/src/constants/tokens'
-import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { GqlResult } from 'uniswap/src/data/types'
-import { useSearchTokens } from 'uniswap/src/features/dataApi/searchTokens'
-import { useTokenProjects } from 'uniswap/src/features/dataApi/tokenProjects'
-import { usePopularTokens } from 'uniswap/src/features/dataApi/topTokens'
 import { CurrencyInfo, PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import { buildCurrency, gqlTokenToCurrencyInfo, usePersistedError } from 'uniswap/src/features/dataApi/utils'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { areAddressesEqual } from 'uniswap/src/utils/addresses'
 import { buildNativeCurrencyId, buildWrappedNativeCurrencyId, currencyId } from 'uniswap/src/utils/currencyId'
 import { flowToModalName } from 'wallet/src/components/TokenSelector/flowToModalName'
+import { DAI, USDC, USDT, WBTC } from 'wallet/src/constants/tokens'
 import {
   sortPortfolioBalances,
   usePortfolioBalances,
   useTokenBalancesGroupedByVisibility,
 } from 'wallet/src/features/dataApi/balances'
+import { useTokenProjects } from 'wallet/src/features/dataApi/tokenProjects'
+import { usePopularTokens } from 'wallet/src/features/dataApi/topTokens'
+import { usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { selectFavoriteTokens } from 'wallet/src/features/favorites/selectors'
-import { TokenSearchResult } from 'wallet/src/features/search/SearchResult'
-import { addToSearchHistory, clearSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { selectSearchHistory } from 'wallet/src/features/search/selectSearchHistory'
-import { usePopularTokens as usePopularWalletTokens } from 'wallet/src/features/tokens/hooks'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 import { useAppSelector } from 'wallet/src/state'
 
 // Use Mainnet base token addresses since TokenProjects query returns each token
@@ -268,30 +252,6 @@ export function usePopularTokensOptions(
   }
 }
 
-export function useAddToSearchHistory(): { registerSearch: (currencyInfo: CurrencyInfo) => void } {
-  const dispatch = useDispatch()
-
-  const registerSearch = (currencyInfo: CurrencyInfo): void => {
-    if (currencyInfo.currency.symbol && currencyInfo.currency.isToken) {
-      dispatch(
-        addToSearchHistory({
-          searchResult: {
-            type: SearchResultType.Token,
-            chainId: currencyInfo.currency.chainId,
-            address: currencyInfo.currency.address,
-            name: currencyInfo.currency.name ?? null,
-            symbol: currencyInfo.currency.symbol,
-            logoUrl: currencyInfo.logoUrl ?? null,
-            safetyLevel: currencyInfo.safetyLevel ?? null,
-          },
-        }),
-      )
-    }
-  }
-
-  return { registerSearch }
-}
-
 export function useCommonTokensOptions(
   address: Address,
   chainFilter: UniverseChainId | null,
@@ -380,165 +340,3 @@ export function useFavoriteTokensOptions(
     loading: loadingPorfolioBalancesById || loadingFavoriteCurrencies,
   }
 }
-
-function searchResultToCurrencyInfo({
-  chainId,
-  address,
-  symbol,
-  name,
-  logoUrl,
-  safetyLevel,
-}: TokenSearchResult): CurrencyInfo | null {
-  const currency = buildCurrency({
-    chainId,
-    address,
-    decimals: 0, // this does not matter in a context of CurrencyInfo here, as we do not provide any balance
-    symbol,
-    name,
-  })
-
-  if (!currency) {
-    return null
-  }
-
-  const currencyInfo: CurrencyInfo = {
-    currency,
-    currencyId: currencyId(currency),
-    logoUrl,
-    safetyLevel: safetyLevel ?? SafetyLevel.StrongWarning,
-    // defaulting to not spam, as user has searched and chosen this token before
-    isSpam: false,
-  }
-  return currencyInfo
-}
-
-function currencyInfosToTokenOptions(currencyInfos: Array<CurrencyInfo | null> | undefined): TokenOption[] | undefined {
-  return currencyInfos
-    ?.filter((cI): cI is CurrencyInfo => Boolean(cI))
-    .map((currencyInfo) => ({
-      currencyInfo,
-      quantity: null,
-      balanceUSD: undefined,
-    }))
-}
-
-function ClearAll({ onPress }: { onPress: () => void }): JSX.Element {
-  const { t } = useTranslation()
-  return (
-    <TouchableArea onPress={onPress}>
-      <Text color="$accent1" variant="buttonLabel3">
-        {t('tokens.selector.button.clear')}
-      </Text>
-    </TouchableArea>
-  )
-}
-
-export function useTokenSectionsForEmptySearch(): GqlResult<TokenSection[]> {
-  const { t } = useTranslation()
-  const dispatch = useDispatch()
-
-  const { popularTokens, loading } = usePopularWalletTokens()
-
-  const searchHistory = useAppSelector(selectSearchHistory)
-
-  // it's a depenedency of useMemo => useCallback
-  const onPressClearSearchHistory = useCallback((): void => {
-    dispatch(clearSearchHistory())
-  }, [dispatch])
-
-  const sections = useMemo(
-    () => [
-      ...(getTokenOptionsSection(
-        t('tokens.selector.section.recent'),
-        currencyInfosToTokenOptions(
-          searchHistory
-            .filter((searchResult): searchResult is TokenSearchResult => searchResult.type === SearchResultType.Token)
-            .map(searchResultToCurrencyInfo),
-        ),
-        <ClearAll onPress={onPressClearSearchHistory} />,
-      ) ?? []),
-      ...(getTokenOptionsSection(
-        t('tokens.selector.section.popular'),
-        currencyInfosToTokenOptions(popularTokens?.map(gqlTokenToCurrencyInfo)),
-      ) ?? []),
-    ],
-    [onPressClearSearchHistory, popularTokens, searchHistory, t],
-  )
-
-  return useMemo(
-    () => ({
-      data: sections,
-      loading,
-    }),
-    [loading, sections],
-  )
-}
-
-export function useTokenSectionsForSearchResults(
-  chainFilter: UniverseChainId | null,
-  searchFilter: string | null,
-  isBalancesOnlySearch: boolean,
-): GqlResult<TokenSection[]> {
-  const { t } = useTranslation()
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
-
-  const {
-    data: portfolioBalancesById,
-    error: portfolioBalancesByIdError,
-    refetch: refetchPortfolioBalances,
-    loading: portfolioBalancesByIdLoading,
-  } = usePortfolioBalancesForAddressById(activeAccountAddress)
-
-  const {
-    data: portfolioTokenOptions,
-    error: portfolioTokenOptionsError,
-    refetch: refetchPortfolioTokenOptions,
-    loading: portfolioTokenOptionsLoading,
-  } = usePortfolioTokenOptions(activeAccountAddress, chainFilter, searchFilter ?? undefined)
-
-  // Only call search endpoint if isBalancesOnlySearch is false
-  const {
-    data: searchResultCurrencies,
-    error: searchTokensError,
-    refetch: refetchSearchTokens,
-    loading: searchTokensLoading,
-  } = useSearchTokens(searchFilter, chainFilter, /*skip*/ isBalancesOnlySearch)
-
-  const searchResults = useMemo(() => {
-    return formatSearchResults(searchResultCurrencies, portfolioBalancesById, searchFilter)
-  }, [searchResultCurrencies, portfolioBalancesById, searchFilter])
-
-  const loading =
-    portfolioTokenOptionsLoading || portfolioBalancesByIdLoading || (!isBalancesOnlySearch && searchTokensLoading)
-
-  const sections = useMemo(
-    () =>
-      getTokenOptionsSection(
-        t('tokens.selector.section.search'),
-        // Use local search when only searching balances
-        isBalancesOnlySearch ? portfolioTokenOptions : searchResults,
-      ),
-    [isBalancesOnlySearch, portfolioTokenOptions, searchResults, t],
-  )
-
-  const error =
-    (!portfolioBalancesById && portfolioBalancesByIdError) ||
-    (!portfolioTokenOptions && portfolioTokenOptionsError) ||
-    (!isBalancesOnlySearch && !searchResults && searchTokensError)
-
-  const refetchAll = useCallback(() => {
-    refetchPortfolioBalances?.()
-    refetchSearchTokens?.()
-    refetchPortfolioTokenOptions?.()
-  }, [refetchPortfolioBalances, refetchPortfolioTokenOptions, refetchSearchTokens])
-
-  return useMemo(
-    () => ({
-      data: sections,
-      loading,
-      error: error || undefined,
-      refetch: refetchAll,
-    }),
-    [error, loading, refetchAll, sections],
-  )
-}
diff --git a/packages/wallet/src/components/accounts/AddressDisplay.tsx b/packages/wallet/src/components/accounts/AddressDisplay.tsx
index 2de26e415a9..3785284b44d 100644
--- a/packages/wallet/src/components/accounts/AddressDisplay.tsx
+++ b/packages/wallet/src/components/accounts/AddressDisplay.tsx
@@ -2,7 +2,6 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import { PropsWithChildren, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlexAlignType } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { ColorTokens, Flex, HapticFeedback, SpaceTokens, Text, TextProps, TouchableArea } from 'ui/src'
 import { CopySheets } from 'ui/src/components/icons'
 import { fonts } from 'ui/src/theme'
@@ -10,13 +9,14 @@ import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
 import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 type AddressDisplayProps = {
   address: string
@@ -98,7 +98,7 @@ export function AddressDisplay({
   gapBetweenLines = '$none',
 }: AddressDisplayProps): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const displayName = useDisplayName(address, { includeUnitagSuffix, overrideDisplayName })
   const { avatar } = useAvatar(address)
 
diff --git a/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx b/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx
index d746e292511..7958cb2682d 100644
--- a/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx
+++ b/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx
@@ -1,22 +1,21 @@
 import { SharedEventName } from '@uniswap/analytics-events'
 import { BaseSyntheticEvent, useState } from 'react'
 import { LayoutChangeEvent } from 'react-native'
-import { useDispatch } from 'react-redux'
 import { AnimatePresence, Flex, HapticFeedback, Text, TouchableArea } from 'ui/src'
 import { CopyAlt, Unitag } from 'ui/src/components/icons'
 import { IconSizeTokens } from 'ui/src/theme'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
 import { MobileScreens } from 'uniswap/src/types/screens/mobile'
 import { sanitizeAddressText, shortenAddress } from 'uniswap/src/utils/addresses'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { isExtension, isMobile } from 'utilities/src/platform'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
 import { DisplayName, DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 
 type AnimatedUnitagDisplayNameProps = {
   displayName: DisplayName
@@ -29,7 +28,7 @@ export function AnimatedUnitagDisplayName({
   unitagIconSize = '$icon.24',
   address,
 }: AnimatedUnitagDisplayNameProps): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const [showUnitagSuffix, setShowUnitagSuffix] = useState(false)
   const [textWidth, setTextWidth] = useState(0)
   const isUnitag = displayName?.type === DisplayNameType.Unitag
@@ -90,13 +89,7 @@ export function AnimatedUnitagDisplayName({
           ) : null}
 
           {address && (
-            <TouchableArea
-              hapticFeedback
-              hitSlop={20}
-              pl="$spacing8"
-              testID={TestID.AccountHeaderCopyAddress}
-              onPress={onPressCopyAddress}
-            >
+            <TouchableArea hapticFeedback hitSlop={20} pl="$spacing8" onPress={onPressCopyAddress}>
               <Flex row alignItems="center" gap="$spacing4">
                 <Text color="$neutral3" numberOfLines={1} variant="body2">
                   {sanitizeAddressText(shortenAddress(address))}
diff --git a/packages/uniswap/src/components/buttons/PasteButton.test.tsx b/packages/wallet/src/components/buttons/PasteButton.test.tsx
similarity index 65%
rename from packages/uniswap/src/components/buttons/PasteButton.test.tsx
rename to packages/wallet/src/components/buttons/PasteButton.test.tsx
index 1e8cbc54680..28dd9472f96 100644
--- a/packages/uniswap/src/components/buttons/PasteButton.test.tsx
+++ b/packages/wallet/src/components/buttons/PasteButton.test.tsx
@@ -1,6 +1,6 @@
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
-import PasteButton from 'uniswap/src/components/buttons/PasteButton'
-import { render } from 'uniswap/src/test/test-utils'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
+import PasteButton from 'wallet/src/components/buttons/PasteButton'
+import { render } from 'wallet/src/test/test-utils'
 
 describe(SplitLogo, () => {
   it('renders without error', () => {
diff --git a/packages/uniswap/src/components/buttons/PasteButton.tsx b/packages/wallet/src/components/buttons/PasteButton.tsx
similarity index 96%
rename from packages/uniswap/src/components/buttons/PasteButton.tsx
rename to packages/wallet/src/components/buttons/PasteButton.tsx
index f089054fd34..9e8f503e7d9 100644
--- a/packages/uniswap/src/components/buttons/PasteButton.tsx
+++ b/packages/wallet/src/components/buttons/PasteButton.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import { Flex, Text, TouchableArea } from 'ui/src'
 import { ClipboardPaste, StickyNoteSquare } from 'ui/src/components/icons'
-import { getClipboard } from 'uniswap/src/utils/clipboard'
+import { getClipboard } from 'wallet/src/utils/clipboard'
 
 export default function PasteButton({
   inline,
diff --git a/packages/uniswap/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap b/packages/wallet/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap
similarity index 97%
rename from packages/uniswap/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap
rename to packages/wallet/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap
index 09f91655c94..70feaed96f1 100644
--- a/packages/uniswap/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap
+++ b/packages/wallet/src/components/buttons/__snapshots__/PasteButton.test.tsx.snap
@@ -57,7 +57,7 @@ exports[`SplitLogo inline renders inline button 1`] = `
             "borderWidth": 0,
           },
           {
-            "color": "#9B9B9B",
+            "color": "#7D7D7D",
             "height": 16,
             "width": 16,
           },
@@ -68,7 +68,7 @@ exports[`SplitLogo inline renders inline button 1`] = `
           },
         ]
       }
-      tintColor="#9B9B9B"
+      tintColor="#7D7D7D"
       vbHeight={16}
       vbWidth={16}
     >
@@ -102,7 +102,7 @@ exports[`SplitLogo inline renders inline button 1`] = `
       maxFontSizeMultiplier={1.2}
       style={
         {
-          "color": "#9B9B9B",
+          "color": "#7D7D7D",
           "fontFamily": "Basel-Medium",
           "fontSize": 14,
           "fontWeight": "500",
@@ -133,7 +133,7 @@ exports[`SplitLogo renders without error 1`] = `
   onPressOut={[Function]}
   style={
     {
-      "backgroundColor": "#311C31",
+      "backgroundColor": "#FFEFFF",
       "borderBottomLeftRadius": 12,
       "borderBottomRightRadius": 12,
       "borderTopLeftRadius": 12,
diff --git a/packages/wallet/src/components/input/MaxAmountButton.tsx b/packages/wallet/src/components/input/MaxAmountButton.tsx
index ff010ad1c52..9cff6c3fdba 100644
--- a/packages/wallet/src/components/input/MaxAmountButton.tsx
+++ b/packages/wallet/src/components/input/MaxAmountButton.tsx
@@ -4,8 +4,8 @@ import { GestureResponderEvent, StyleProp, ViewStyle } from 'react-native'
 import { Text, TouchableArea } from 'ui/src'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { maxAmountSpend } from 'wallet/src/utils/balance'
 
 interface MaxAmountButtonProps {
diff --git a/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx b/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx
index 82d5d963dcc..ccba0035d3d 100644
--- a/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx
+++ b/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx
@@ -5,7 +5,6 @@ import { NativeSyntheticEvent, TextInput, TextInputProps, TextInputSelectionChan
 import { Flex, FlexProps, SpaceTokens, Text, TouchableArea } from 'ui/src'
 import { fonts } from 'ui/src/theme'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { NumberType } from 'utilities/src/format/types'
 import { SelectTokenButton } from 'wallet/src/components/TokenSelector/SelectTokenButton'
@@ -14,6 +13,7 @@ import { MaxAmountButton } from 'wallet/src/components/input/MaxAmountButton'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { Warning, WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
 
 type CurrentInputPanelProps = {
diff --git a/packages/uniswap/src/components/modals/hooks.native.ts b/packages/wallet/src/components/modals/hooks.ts
similarity index 100%
rename from packages/uniswap/src/components/modals/hooks.native.ts
rename to packages/wallet/src/components/modals/hooks.ts
diff --git a/packages/uniswap/src/components/network/NetworkLogos.tsx b/packages/wallet/src/components/network/NetworkLogos.tsx
similarity index 82%
rename from packages/uniswap/src/components/network/NetworkLogos.tsx
rename to packages/wallet/src/components/network/NetworkLogos.tsx
index c28ae6176c5..92a901178c3 100644
--- a/packages/uniswap/src/components/network/NetworkLogos.tsx
+++ b/packages/wallet/src/components/network/NetworkLogos.tsx
@@ -4,10 +4,10 @@ import { iconSizes } from 'ui/src/theme'
 import { NetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
 import { NetworksInSeries } from 'uniswap/src/components/network/NetworkFilter'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
-import { UniverseChainId } from 'uniswap/src/types/chains'
+import { WalletChainId } from 'uniswap/src/types/chains'
 
 export type NetworkLogosProps = {
-  chains: UniverseChainId[]
+  chains: WalletChainId[]
   showFirstChainLabel?: boolean
   negativeGap?: boolean
   size?: number
@@ -25,14 +25,14 @@ export function NetworkLogos({
     <Flex centered row {...rest}>
       {chains.length === 1 && firstChain && showFirstChainLabel ? (
         <Flex fill row justifyContent="space-between">
-          <NetworkLogo chainId={firstChain} size={size} />
+          <NetworkLogo chainId={firstChain} />
           <Text color="$neutral2" numberOfLines={1} variant="buttonLabel3">
             {UNIVERSE_CHAIN_INFO[firstChain].label}
           </Text>
           <Flex width={size} />
         </Flex>
       ) : (
-        <NetworksInSeries networkIconSize={size} networks={chains} />
+        <NetworksInSeries networkIconSize={iconSizes.icon16} networks={chains} />
       )}
     </Flex>
   )
diff --git a/packages/uniswap/src/components/network/NetworkPill.test.tsx b/packages/wallet/src/components/network/NetworkPill.test.tsx
similarity index 80%
rename from packages/uniswap/src/components/network/NetworkPill.test.tsx
rename to packages/wallet/src/components/network/NetworkPill.test.tsx
index 73c6cdb3294..3221f126401 100644
--- a/packages/uniswap/src/components/network/NetworkPill.test.tsx
+++ b/packages/wallet/src/components/network/NetworkPill.test.tsx
@@ -1,6 +1,6 @@
-import { InlineNetworkPill, NetworkPill } from 'uniswap/src/components/network/NetworkPill'
-import { render } from 'uniswap/src/test/test-utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { InlineNetworkPill, NetworkPill } from 'wallet/src/components/network/NetworkPill'
+import { render } from 'wallet/src/test/test-utils'
 
 describe(NetworkPill, () => {
   it('renders a NetworkPill without image', () => {
diff --git a/packages/uniswap/src/components/network/NetworkPill.tsx b/packages/wallet/src/components/network/NetworkPill.tsx
similarity index 95%
rename from packages/uniswap/src/components/network/NetworkPill.tsx
rename to packages/wallet/src/components/network/NetworkPill.tsx
index 61b9c24b788..b54a71780cb 100644
--- a/packages/uniswap/src/components/network/NetworkPill.tsx
+++ b/packages/wallet/src/components/network/NetworkPill.tsx
@@ -4,7 +4,7 @@ import { NetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
 import { Pill } from 'uniswap/src/components/pill/Pill'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { WalletChainId } from 'uniswap/src/types/chains'
-import { useNetworkColors } from 'uniswap/src/utils/colors'
+import { useNetworkColors } from 'wallet/src/utils/colors'
 
 export type NetworkPillProps = {
   chainId: WalletChainId
diff --git a/packages/uniswap/src/components/network/__snapshots__/NetworkPill.test.tsx.snap b/packages/wallet/src/components/network/__snapshots__/NetworkPill.test.tsx.snap
similarity index 100%
rename from packages/uniswap/src/components/network/__snapshots__/NetworkPill.test.tsx.snap
rename to packages/wallet/src/components/network/__snapshots__/NetworkPill.test.tsx.snap
diff --git a/packages/wallet/src/components/nfts/NftsList.tsx b/packages/wallet/src/components/nfts/NftsList.tsx
index f56453e76de..44366e9cf24 100644
--- a/packages/wallet/src/components/nfts/NftsList.tsx
+++ b/packages/wallet/src/components/nfts/NftsList.tsx
@@ -41,7 +41,7 @@ type NftsListProps = Omit<
       footerHeight?: SharedValue<number>
       isExternalProfile?: boolean
       renderedInModal?: boolean
-      renderNFTItem: (item: NFTItem, index: number) => JSX.Element
+      renderNFTItem: (item: NFTItem) => JSX.Element
       onPressEmptyState?: () => void
       loadingStateStyle?: StyleProp<ViewStyle | CSSProperties | (ViewStyle & CSSProperties)>
       errorStateStyle?: StyleProp<ViewStyle | CSSProperties | (ViewStyle & CSSProperties)>
@@ -124,9 +124,9 @@ export const NftsList = forwardRef<FlashList<unknown>, NftsListProps>(function _
   }, [hiddenNftsExpanded, numHidden])
 
   const renderItem = useCallback(
-    ({ item, index }: ListRenderItemInfo<string | NFTItem>) => {
+    ({ item }: ListRenderItemInfo<string | NFTItem>) => {
       if (typeof item !== 'string') {
-        return renderNFTItem(item, index)
+        return renderNFTItem(item)
       }
       switch (item) {
         case LOADING_ITEM:
diff --git a/packages/wallet/src/components/settings/AnalyticsToggleLineSwitch.tsx b/packages/wallet/src/components/settings/AnalyticsToggleLineSwitch.tsx
index 70e37ae29e5..db3ac66f91e 100644
--- a/packages/wallet/src/components/settings/AnalyticsToggleLineSwitch.tsx
+++ b/packages/wallet/src/components/settings/AnalyticsToggleLineSwitch.tsx
@@ -1,14 +1,13 @@
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { Flex, Text, isWeb } from 'ui/src'
 import { Switch, WebSwitch } from 'wallet/src/components/buttons/Switch'
 import { selectAllowAnalytics } from 'wallet/src/features/telemetry/selectors'
 import { setAllowAnalytics } from 'wallet/src/features/telemetry/slice'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export function AnalyticsToggleLineSwitch(): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const analyticsAllowed = useAppSelector(selectAllowAnalytics)
 
   const onChangeAllowAnalytics = (enabled: boolean): void => {
diff --git a/packages/wallet/src/components/settings/language/SettingsLanguageModal.native.tsx b/packages/wallet/src/components/settings/language/SettingsLanguageModal.native.tsx
index f4e969aa888..c6cb6b6c32e 100644
--- a/packages/wallet/src/components/settings/language/SettingsLanguageModal.native.tsx
+++ b/packages/wallet/src/components/settings/language/SettingsLanguageModal.native.tsx
@@ -5,9 +5,9 @@ import { Language } from 'ui/src/components/icons'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
-import { opacify } from 'uniswap/src/utils/colors'
 import { isAndroid } from 'utilities/src/platform'
 import { SettingsLanguageModalProps } from 'wallet/src/components/settings/language/SettingsLanguageModalProps'
+import { opacify } from 'wallet/src/utils/colors'
 
 const openLanguageSettings = async (): Promise<void> => {
   if (isAndroid) {
diff --git a/packages/wallet/src/components/settings/language/SettingsLanguageModal.web.tsx b/packages/wallet/src/components/settings/language/SettingsLanguageModal.web.tsx
index 1e051be068c..56718d1a47c 100644
--- a/packages/wallet/src/components/settings/language/SettingsLanguageModal.web.tsx
+++ b/packages/wallet/src/components/settings/language/SettingsLanguageModal.web.tsx
@@ -3,8 +3,8 @@ import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import { Language } from 'ui/src/components/icons'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { opacify } from 'uniswap/src/utils/colors'
 import { SettingsLanguageModalProps } from 'wallet/src/components/settings/language/SettingsLanguageModalProps'
+import { opacify } from 'wallet/src/utils/colors'
 
 export function SettingsLanguageModal({ onClose }: SettingsLanguageModalProps): JSX.Element {
   const colors = useSporeColors()
diff --git a/packages/uniswap/src/components/text/LearnMoreLink.test.tsx b/packages/wallet/src/components/text/LearnMoreLink.test.tsx
similarity index 79%
rename from packages/uniswap/src/components/text/LearnMoreLink.test.tsx
rename to packages/wallet/src/components/text/LearnMoreLink.test.tsx
index ede4a4e33db..78bff172b60 100644
--- a/packages/uniswap/src/components/text/LearnMoreLink.test.tsx
+++ b/packages/wallet/src/components/text/LearnMoreLink.test.tsx
@@ -1,10 +1,10 @@
 import { fireEvent } from '@testing-library/react-native'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { ON_PRESS_EVENT_PAYLOAD } from 'uniswap/src/test/fixtures'
-import { renderWithProviders } from 'uniswap/src/test/render'
-import { openUri } from 'uniswap/src/utils/linking'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
+import { renderWithProviders } from 'wallet/src/test/render'
+import { openUri } from 'wallet/src/utils/linking'
 
-jest.mock('uniswap/src/utils/linking', () => ({
+jest.mock('wallet/src/utils/linking', () => ({
   openUri: jest.fn(),
 }))
 
diff --git a/packages/uniswap/src/components/text/LearnMoreLink.tsx b/packages/wallet/src/components/text/LearnMoreLink.tsx
similarity index 92%
rename from packages/uniswap/src/components/text/LearnMoreLink.tsx
rename to packages/wallet/src/components/text/LearnMoreLink.tsx
index f83fc4d8667..9f0adf83e97 100644
--- a/packages/uniswap/src/components/text/LearnMoreLink.tsx
+++ b/packages/wallet/src/components/text/LearnMoreLink.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import { Text, TextProps, TouchableArea } from 'ui/src'
-import { openUri } from 'uniswap/src/utils/linking'
+import { openUri } from 'wallet/src/utils/linking'
 
 const onPressLearnMore = async (url: string): Promise<void> => {
   await openUri(url)
diff --git a/packages/wallet/src/components/text/RelativeChange.tsx b/packages/wallet/src/components/text/RelativeChange.tsx
index 1b365957b26..a49383cf475 100644
--- a/packages/wallet/src/components/text/RelativeChange.tsx
+++ b/packages/wallet/src/components/text/RelativeChange.tsx
@@ -1,7 +1,6 @@
 import { ColorTokens, Flex, Text } from 'ui/src'
 import { Caret } from 'ui/src/components/icons'
 import { IconSizeTokens, fonts } from 'ui/src/theme'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { NumberType } from 'utilities/src/format/types'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
@@ -59,7 +58,6 @@ export function RelativeChange(props: RelativeChangeProps): JSX.Element {
           color={semanticColor ? (isPositiveChange ? '$statusSuccess' : '$statusCritical') : '$neutral2'}
           loading={loading}
           loadingPlaceholderText="▲ 00.00 (0.00)%"
-          testID={TestID.PortfolioRelativeChange}
           variant={variant}
         >
           {absoluteChange ? `${formattedAbsChange} (${formattedChange})` : formattedChange}
diff --git a/packages/uniswap/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap b/packages/wallet/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap
similarity index 100%
rename from packages/uniswap/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap
rename to packages/wallet/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap
diff --git a/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap b/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap
index 7c064fcca64..6963f9ad0a0 100644
--- a/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap
+++ b/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap
@@ -93,7 +93,6 @@ exports[`renders a relative change 1`] = `
         }
       }
       suppressHighlighting={true}
-      testID="portfolio-relative-change"
     >
       12%
     </Text>
@@ -194,7 +193,6 @@ exports[`renders placeholders with absolute change 1`] = `
         }
       }
       suppressHighlighting={true}
-      testID="portfolio-relative-change"
     >
       $100.00 (12%)
     </Text>
@@ -233,7 +231,6 @@ exports[`renders placeholders without a change 1`] = `
         }
       }
       suppressHighlighting={true}
-      testID="portfolio-relative-change"
     >
       -
     </Text>
diff --git a/packages/wallet/src/constants/tokens.ts b/packages/wallet/src/constants/tokens.ts
index de5264dfba1..b0e42f2c485 100644
--- a/packages/wallet/src/constants/tokens.ts
+++ b/packages/wallet/src/constants/tokens.ts
@@ -1,6 +1,8 @@
 // Copied from https://github.com/Uniswap/interface/blob/main/src/constants/tokens.ts
 import { Token } from '@uniswap/sdk-core'
-import { UniverseChainId } from 'uniswap/src/types/chains'
+import { UNI_ADDRESS } from 'uniswap/src/constants/addresses'
+import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
+import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 
 export const DAI = new Token(
   UniverseChainId.Mainnet,
@@ -110,3 +112,31 @@ export const WBTC = new Token(
   'WBTC',
   'Wrapped BTC',
 )
+
+export const UNI = {
+  [UniverseChainId.Mainnet]: new Token(
+    UniverseChainId.Mainnet,
+    UNI_ADDRESS[UniverseChainId.Mainnet],
+    18,
+    'UNI',
+    'Uniswap',
+  ),
+  [UniverseChainId.Goerli]: new Token(
+    UniverseChainId.Goerli,
+    UNI_ADDRESS[UniverseChainId.Goerli],
+    18,
+    'UNI',
+    'Uniswap',
+  ),
+}
+
+export function wrappedNativeCurrency(chainId: WalletChainId): Token {
+  const wrappedCurrencyInfo = UNIVERSE_CHAIN_INFO[chainId].wrappedNativeCurrency
+  return new Token(
+    chainId,
+    wrappedCurrencyInfo.address,
+    wrappedCurrencyInfo.decimals,
+    wrappedCurrencyInfo.symbol,
+    wrappedCurrencyInfo.name,
+  )
+}
diff --git a/packages/wallet/src/contexts/WalletNavigationContext.tsx b/packages/wallet/src/contexts/WalletNavigationContext.tsx
index 10d836c5855..bd1a7d47b89 100644
--- a/packages/wallet/src/contexts/WalletNavigationContext.tsx
+++ b/packages/wallet/src/contexts/WalletNavigationContext.tsx
@@ -1,8 +1,8 @@
 import { createContext, ReactNode, useContext } from 'react'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { NFTItem } from 'wallet/src/features/nfts/types'
 import { getSwapPrefilledState } from 'wallet/src/features/transactions/swap/hooks/useSwapPrefilledState'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { getSendPrefilledState } from 'wallet/src/features/transactions/transfer/getSendPrefilledState'
 
 type NavigateToTransactionFlowTransactionState = {
diff --git a/packages/uniswap/src/entities/assets.ts b/packages/wallet/src/entities/assets.ts
similarity index 100%
rename from packages/uniswap/src/entities/assets.ts
rename to packages/wallet/src/entities/assets.ts
diff --git a/packages/wallet/src/features/activity/hooks.ts b/packages/wallet/src/features/activity/hooks.ts
index 7531f996a28..bd8ddbb0f50 100644
--- a/packages/wallet/src/features/activity/hooks.ts
+++ b/packages/wallet/src/features/activity/hooks.ts
@@ -5,9 +5,9 @@ import {
   useFeedTransactionListQuery,
   useTransactionListQuery,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { usePersistedError } from 'uniswap/src/features/dataApi/utils'
 import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
 import { LoadingItem, SectionHeader, isLoadingItem, isSectionHeader } from 'wallet/src/features/activity/utils'
+import { usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { useLocalizedDayjs } from 'wallet/src/features/language/localizedDayjs'
 import {
   formatTransactionsByDate,
diff --git a/packages/wallet/src/features/activity/useActivityData.tsx b/packages/wallet/src/features/activity/useActivityData.tsx
index ef41df84216..c6d3e7708cf 100644
--- a/packages/wallet/src/features/activity/useActivityData.tsx
+++ b/packages/wallet/src/features/activity/useActivityData.tsx
@@ -4,7 +4,6 @@ import { StyleProp, ViewStyle } from 'react-native'
 import { Flex, Loader, Text, isWeb } from 'ui/src'
 import { NoTransactions } from 'ui/src/components/icons'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
-import { TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { useFormattedTransactionDataForActivity } from 'wallet/src/features/activity/hooks'
 import { LoadingItem, SectionHeader } from 'wallet/src/features/activity/utils'
@@ -14,12 +13,13 @@ import { SwapSummaryCallbacks } from 'wallet/src/features/transactions/SummaryCa
 import { ActivityItemRenderer, generateActivityItemRenderer } from 'wallet/src/features/transactions/SummaryCards/utils'
 import { useCreateSwapFormState, useMergeLocalAndRemoteTransactions } from 'wallet/src/features/transactions/hooks'
 import { useMostRecentSwapTx } from 'wallet/src/features/transactions/swap/hooks/useMostRecentSwapTx'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { TransactionDetails } from 'wallet/src/features/transactions/types'
 import { useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
 
-const SectionTitle = ({ title, index }: { title: string; index?: number }): JSX.Element => (
+const SectionTitle = ({ title }: { title: string }): JSX.Element => (
   <Flex px={isWeb ? '$spacing8' : '$none'} py="$spacing8">
-    <Text color="$neutral2" testID={`activity-list-item-${index}`} variant="subheading2">
+    <Text color="$neutral2" variant="subheading2">
       {title}
     </Text>
   </Flex>
diff --git a/packages/wallet/src/features/dataApi/balances.test.ts b/packages/wallet/src/features/dataApi/balances.test.ts
index 9bb2b929e3d..32061d8d2ff 100644
--- a/packages/wallet/src/features/dataApi/balances.test.ts
+++ b/packages/wallet/src/features/dataApi/balances.test.ts
@@ -6,14 +6,6 @@ import {
   PortfolioBalanceDocument,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import {
-  ARBITRUM_CURRENCY,
-  BASE_CURRENCY,
-  MAINNET_CURRENCY,
-  OPTIMISM_CURRENCY,
-  POLYGON_CURRENCY,
-  currencyInfo,
-} from 'uniswap/src/test/fixtures'
 import {
   sortPortfolioBalances,
   useHighestBalanceNativeCurrencyId,
@@ -30,10 +22,16 @@ import { WalletState, initialWalletState } from 'wallet/src/features/wallet/slic
 import {
   ACCOUNT,
   ACCOUNT2,
+  ARBITRUM_CURRENCY,
+  BASE_CURRENCY,
+  MAINNET_CURRENCY,
+  OPTIMISM_CURRENCY,
+  POLYGON_CURRENCY,
   SAMPLE_CURRENCY_ID_1,
   SAMPLE_CURRENCY_ID_2,
   SAMPLE_SEED_ADDRESS_1,
   SAMPLE_SEED_ADDRESS_2,
+  currencyInfo,
   daiToken,
   ethToken,
   portfolio,
@@ -71,7 +69,9 @@ describe(usePortfolioValueModifiers, () => {
     },
   })
 
-  const mockFavoritesState = (overrideTokensVisibility?: FavoritesState['tokensVisibility']): FavoritesState => ({
+  const mockFavoritesState = (
+    overrideTokensVisibility?: FavoritesState['tokensVisibility']
+  ): FavoritesState => ({
     ...initialFavoritesState,
     tokensVisibility: {
       ...initialFavoritesState.tokensVisibility,
@@ -92,7 +92,9 @@ describe(usePortfolioValueModifiers, () => {
   })
 
   it('returns multiple modifiers if multiple addresses are passed', () => {
-    const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]))
+    const { result } = renderHook(() =>
+      usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2])
+    )
 
     expect(result.current).toEqual([
       { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1 },
@@ -102,9 +104,10 @@ describe(usePortfolioValueModifiers, () => {
 
   describe('includeSmallBalances', () => {
     it('returns modifiers with includeSmallBalances set to true if hideSmallBalances settings is false', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]), {
-        preloadedState: { wallet: mockWalletState({ hideSmallBalances: false }) },
-      })
+      const { result } = renderHook(
+        () => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]),
+        { preloadedState: { wallet: mockWalletState({ hideSmallBalances: false }) } }
+      )
 
       expect(result.current).toEqual([
         { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSmallBalances: true },
@@ -113,9 +116,10 @@ describe(usePortfolioValueModifiers, () => {
     })
 
     it('returns modifiers with includeSmallBalances set to false if hideSmallBalances settings is true', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]), {
-        preloadedState: { wallet: mockWalletState({ hideSmallBalances: true }) },
-      })
+      const { result } = renderHook(
+        () => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]),
+        { preloadedState: { wallet: mockWalletState({ hideSmallBalances: true }) } }
+      )
 
       expect(result.current).toEqual([
         { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSmallBalances: false },
@@ -126,9 +130,10 @@ describe(usePortfolioValueModifiers, () => {
 
   describe('includeSpamTokens', () => {
     it('returns modifiers with includeSpamTokens set to true if hideSpamTokens settings is false', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]), {
-        preloadedState: { wallet: mockWalletState({ hideSpamTokens: false }) },
-      })
+      const { result } = renderHook(
+        () => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]),
+        { preloadedState: { wallet: mockWalletState({ hideSpamTokens: false }) } }
+      )
 
       expect(result.current).toEqual([
         { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSpamTokens: true },
@@ -137,9 +142,10 @@ describe(usePortfolioValueModifiers, () => {
     })
 
     it('returns modifiers with includeSpamTokens set to false if hideSpamTokens settings is true', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]), {
-        preloadedState: { wallet: mockWalletState({ hideSpamTokens: true }) },
-      })
+      const { result } = renderHook(
+        () => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]),
+        { preloadedState: { wallet: mockWalletState({ hideSpamTokens: true }) } }
+      )
 
       expect(result.current).toEqual([
         { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSpamTokens: false },
@@ -165,18 +171,21 @@ describe(usePortfolioValueModifiers, () => {
     })
 
     it('includes token overrides in the result if tokensVisibility contains addresses visibility settings', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]), {
-        preloadedState: {
-          wallet: {
-            ...initialWalletState,
-            accounts: { [SAMPLE_SEED_ADDRESS_1]: ACCOUNT, [SAMPLE_SEED_ADDRESS_2]: ACCOUNT2 },
+      const { result } = renderHook(
+        () => usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2]),
+        {
+          preloadedState: {
+            wallet: {
+              ...initialWalletState,
+              accounts: { [SAMPLE_SEED_ADDRESS_1]: ACCOUNT, [SAMPLE_SEED_ADDRESS_2]: ACCOUNT2 },
+            },
+            favorites: mockFavoritesState({
+              [SAMPLE_CURRENCY_ID_1]: { isVisible: false },
+              [SAMPLE_CURRENCY_ID_2]: { isVisible: true },
+            }),
           },
-          favorites: mockFavoritesState({
-            [SAMPLE_CURRENCY_ID_1]: { isVisible: false },
-            [SAMPLE_CURRENCY_ID_2]: { isVisible: true },
-          }),
-        },
-      })
+        }
+      )
 
       expect(result.current).toEqual([
         {
@@ -310,9 +319,10 @@ describe(usePortfolioBalances, () => {
 
   it('calls onCompleted callback when query completes', async () => {
     const onCompleted = jest.fn()
-    const { result } = renderHook(() => usePortfolioBalances({ address: daiCurrencyId, onCompleted }), {
-      resolvers: portfolioResolvers,
-    })
+    const { result } = renderHook(
+      () => usePortfolioBalances({ address: daiCurrencyId, onCompleted }),
+      { resolvers: portfolioResolvers }
+    )
 
     expect(result.current.loading).toEqual(true)
     expect(onCompleted).not.toHaveBeenCalled()
@@ -338,9 +348,10 @@ describe(usePortfolioTotalValue, () => {
   })
 
   it('returns loading set to true when data is being fetched', async () => {
-    const { result } = renderHook(() => usePortfolioTotalValue({ address: Portfolio.ownerAddress }), {
-      resolvers: portfolioResolvers,
-    })
+    const { result } = renderHook(
+      () => usePortfolioTotalValue({ address: Portfolio.ownerAddress }),
+      { resolvers: portfolioResolvers }
+    )
 
     expect(result.current).toEqual({
       data: undefined,
@@ -361,7 +372,10 @@ describe(usePortfolioTotalValue, () => {
         throw new Error('test')
       },
     })
-    const { result } = renderHook(() => usePortfolioTotalValue({ address: Portfolio.ownerAddress }), { resolvers })
+    const { result } = renderHook(
+      () => usePortfolioTotalValue({ address: Portfolio.ownerAddress }),
+      { resolvers }
+    )
 
     await waitFor(() => {
       expect(result.current).toEqual({
@@ -378,7 +392,10 @@ describe(usePortfolioTotalValue, () => {
     const { resolvers } = queryResolvers({
       portfolios: () => [],
     })
-    const { result } = renderHook(() => usePortfolioTotalValue({ address: Portfolio.ownerAddress }), { resolvers })
+    const { result } = renderHook(
+      () => usePortfolioTotalValue({ address: Portfolio.ownerAddress }),
+      { resolvers }
+    )
 
     expect(result.current.loading).toEqual(true)
 
@@ -394,9 +411,12 @@ describe(usePortfolioTotalValue, () => {
   })
 
   it('returns total value of all balances for the specified address', async () => {
-    const { result } = renderHook(() => usePortfolioTotalValue({ address: Portfolio.ownerAddress }), {
-      resolvers: portfolioResolvers,
-    })
+    const { result } = renderHook(
+      () => usePortfolioTotalValue({ address: Portfolio.ownerAddress }),
+      {
+        resolvers: portfolioResolvers,
+      }
+    )
 
     await waitFor(() => {
       expect(result.current).toEqual({
@@ -461,7 +481,7 @@ describe(useTokenBalancesGroupedByVisibility, () => {
           [daiPortfolioBalance.cacheId]: daiPortfolioBalance,
           [ethPortfolioBalance.cacheId]: ethPortfolioBalance,
         },
-      }),
+      })
     )
 
     expect(result.current).toEqual({
@@ -473,7 +493,9 @@ describe(useTokenBalancesGroupedByVisibility, () => {
 
 describe(useSortedPortfolioBalances, () => {
   it('returns loading set to true when data is being fetched', () => {
-    const { result } = renderHook(() => useSortedPortfolioBalances({ address: Portfolio.ownerAddress }))
+    const { result } = renderHook(() =>
+      useSortedPortfolioBalances({ address: Portfolio.ownerAddress })
+    )
 
     expect(result.current).toEqual({
       data: {
@@ -487,9 +509,12 @@ describe(useSortedPortfolioBalances, () => {
   })
 
   it('returns balances grouped by visibility when data is fetched', async () => {
-    const { result } = renderHook(() => useSortedPortfolioBalances({ address: Portfolio.ownerAddress }), {
-      resolvers: portfolioResolvers,
-    })
+    const { result } = renderHook(
+      () => useSortedPortfolioBalances({ address: Portfolio.ownerAddress }),
+      {
+        resolvers: portfolioResolvers,
+      }
+    )
 
     await waitFor(() => {
       expect(result.current).toEqual({
@@ -531,8 +556,12 @@ describe(sortPortfolioBalances, () => {
     const result = sortPortfolioBalances([...balancesWithoutUSD, ...balancesWithUSD])
 
     expect(result).toEqual([
-      ...createArray(balancesWithUSD.length, () => expect.objectContaining({ balanceUSD: expect.any(Number) })),
-      ...createArray(balancesWithoutUSD.length, () => expect.objectContaining({ balanceUSD: null })),
+      ...createArray(balancesWithUSD.length, () =>
+        expect.objectContaining({ balanceUSD: expect.any(Number) })
+      ),
+      ...createArray(balancesWithoutUSD.length, () =>
+        expect.objectContaining({ balanceUSD: null })
+      ),
     ])
   })
 
@@ -600,7 +629,7 @@ describe(usePortfolioCacheUpdater, () => {
         fields: {
           tokensTotalDenominatedValue: expect.any(Function),
         },
-      }),
+      })
     )
   })
 })
diff --git a/packages/wallet/src/features/dataApi/balances.ts b/packages/wallet/src/features/dataApi/balances.ts
index 3710c35c1ef..639431a76b6 100644
--- a/packages/wallet/src/features/dataApi/balances.ts
+++ b/packages/wallet/src/features/dataApi/balances.ts
@@ -12,11 +12,11 @@ import {
 import { GqlResult } from 'uniswap/src/data/types'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo, PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import { buildCurrency, currencyIdToContractInput, usePersistedError } from 'uniswap/src/features/dataApi/utils'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { currencyId } from 'uniswap/src/utils/currencyId'
 import { usePlatformBasedFetchPolicy } from 'uniswap/src/utils/usePlatformBasedFetchPolicy'
 import { logger } from 'utilities/src/logger/logger'
+import { buildCurrency, currencyIdToContractInput, usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { useCurrencyIdToVisibility } from 'wallet/src/features/transactions/selectors'
 import { useHideSmallBalancesSetting, useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
 
diff --git a/packages/wallet/src/features/dataApi/searchTokens.test.ts b/packages/wallet/src/features/dataApi/searchTokens.test.ts
index 0f028a2c6dc..c26e6d7e9c6 100644
--- a/packages/wallet/src/features/dataApi/searchTokens.test.ts
+++ b/packages/wallet/src/features/dataApi/searchTokens.test.ts
@@ -1,8 +1,7 @@
 import { waitFor } from '@testing-library/react-native'
-import { useSearchTokens } from 'uniswap/src/features/dataApi/searchTokens'
-import { useTokenProjects } from 'uniswap/src/features/dataApi/tokenProjects'
-import { gqlTokenToCurrencyInfo } from 'uniswap/src/features/dataApi/utils'
-// TODO: https://linear.app/uniswap/issue/WEB-4376/move-universepackageswalletsrcfeaturesdataapi-tests-to-uniswap-pkg
+import { useSearchTokens } from 'wallet/src/features/dataApi/searchTokens'
+import { useTokenProjects } from 'wallet/src/features/dataApi/tokenProjects'
+import { gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
 import { token } from 'wallet/src/test/fixtures'
 import { createArray, renderHook } from 'wallet/src/test/test-utils'
 import { queryResolvers } from 'wallet/src/test/utils'
diff --git a/packages/uniswap/src/features/dataApi/searchTokens.ts b/packages/wallet/src/features/dataApi/searchTokens.ts
similarity index 94%
rename from packages/uniswap/src/features/dataApi/searchTokens.ts
rename to packages/wallet/src/features/dataApi/searchTokens.ts
index 53205aba45e..e5c338e52be 100644
--- a/packages/uniswap/src/features/dataApi/searchTokens.ts
+++ b/packages/wallet/src/features/dataApi/searchTokens.ts
@@ -3,8 +3,8 @@ import { Chain, useSearchTokensQuery } from 'uniswap/src/data/graphql/uniswap-da
 import { GqlResult } from 'uniswap/src/data/types'
 import { toGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { gqlTokenToCurrencyInfo, usePersistedError } from 'uniswap/src/features/dataApi/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { gqlTokenToCurrencyInfo, usePersistedError } from 'wallet/src/features/dataApi/utils'
 
 export const ALL_GQL_CHAINS = Object.values(Chain)
 
diff --git a/packages/wallet/src/features/dataApi/tokenProject.test.tsx b/packages/wallet/src/features/dataApi/tokenProject.test.tsx
index 14150b67ec2..35d3b93358a 100644
--- a/packages/wallet/src/features/dataApi/tokenProject.test.tsx
+++ b/packages/wallet/src/features/dataApi/tokenProject.test.tsx
@@ -1,7 +1,6 @@
 import { waitFor } from '@testing-library/react-native'
-import { useTokenProjects } from 'uniswap/src/features/dataApi/tokenProjects'
-import { tokenProjectToCurrencyInfos } from 'uniswap/src/features/dataApi/utils'
-// TODO: https://linear.app/uniswap/issue/WEB-4376/move-universepackageswalletsrcfeaturesdataapi-tests-to-uniswap-pkg
+import { useTokenProjects } from 'wallet/src/features/dataApi/tokenProjects'
+import { tokenProjectToCurrencyInfos } from 'wallet/src/features/dataApi/utils'
 import { SAMPLE_CURRENCY_ID_1, usdcTokenProject } from 'wallet/src/test/fixtures'
 import { renderHook } from 'wallet/src/test/test-utils'
 import { queryResolvers } from 'wallet/src/test/utils'
diff --git a/packages/uniswap/src/features/dataApi/tokenProjects.ts b/packages/wallet/src/features/dataApi/tokenProjects.ts
similarity index 96%
rename from packages/uniswap/src/features/dataApi/tokenProjects.ts
rename to packages/wallet/src/features/dataApi/tokenProjects.ts
index 464211f3347..e82a047b2cb 100644
--- a/packages/uniswap/src/features/dataApi/tokenProjects.ts
+++ b/packages/wallet/src/features/dataApi/tokenProjects.ts
@@ -2,8 +2,8 @@ import { useCallback, useMemo } from 'react'
 import { useTokenProjectsQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { GqlResult } from 'uniswap/src/data/types'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { currencyIdToContractInput, tokenProjectToCurrencyInfos } from 'uniswap/src/features/dataApi/utils'
 import { CurrencyId } from 'uniswap/src/types/currency'
+import { currencyIdToContractInput, tokenProjectToCurrencyInfos } from 'wallet/src/features/dataApi/utils'
 
 /**
  * Fetches token information as CurrencyInfo from currencyIds. When used, wrap component
diff --git a/packages/wallet/src/features/dataApi/topTokens.test.ts b/packages/wallet/src/features/dataApi/topTokens.test.ts
index c323a4e0e04..4274fc82fad 100644
--- a/packages/wallet/src/features/dataApi/topTokens.test.ts
+++ b/packages/wallet/src/features/dataApi/topTokens.test.ts
@@ -1,7 +1,6 @@
-import { usePopularTokens } from 'uniswap/src/features/dataApi/topTokens'
-import { gqlTokenToCurrencyInfo } from 'uniswap/src/features/dataApi/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
-// TODO: https://linear.app/uniswap/issue/WEB-4376/move-universepackageswalletsrcfeaturesdataapi-tests-to-uniswap-pkg
+import { usePopularTokens } from 'wallet/src/features/dataApi/topTokens'
+import { gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
 import { token } from 'wallet/src/test/fixtures'
 import { act, renderHook, waitFor } from 'wallet/src/test/test-utils'
 import { createArray, queryResolvers } from 'wallet/src/test/utils'
diff --git a/packages/uniswap/src/features/dataApi/topTokens.ts b/packages/wallet/src/features/dataApi/topTokens.ts
similarity index 93%
rename from packages/uniswap/src/features/dataApi/topTokens.ts
rename to packages/wallet/src/features/dataApi/topTokens.ts
index 79fb74c1a79..00469edf707 100644
--- a/packages/uniswap/src/features/dataApi/topTokens.ts
+++ b/packages/wallet/src/features/dataApi/topTokens.ts
@@ -6,8 +6,8 @@ import {
 import { GqlResult } from 'uniswap/src/data/types'
 import { toGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { gqlTokenToCurrencyInfo, usePersistedError } from 'uniswap/src/features/dataApi/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { gqlTokenToCurrencyInfo, usePersistedError } from 'wallet/src/features/dataApi/utils'
 
 export function usePopularTokens(chainFilter: UniverseChainId): GqlResult<CurrencyInfo[]> {
   const gqlChainFilter = toGraphQLChain(chainFilter)
diff --git a/packages/wallet/src/features/dataApi/utils.test.ts b/packages/wallet/src/features/dataApi/utils.test.ts
index e1d50bdf04c..c8dd0019369 100644
--- a/packages/wallet/src/features/dataApi/utils.test.ts
+++ b/packages/wallet/src/features/dataApi/utils.test.ts
@@ -7,17 +7,21 @@ import {
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
+import { UniverseChainId } from 'uniswap/src/types/chains'
 import {
   buildCurrency,
   currencyIdToContractInput,
   gqlTokenToCurrencyInfo,
   tokenProjectToCurrencyInfos,
   usePersistedError,
-} from 'uniswap/src/features/dataApi/utils'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
-import { UniverseChainId } from 'uniswap/src/types/chains'
-// TODO: https://linear.app/uniswap/issue/WEB-4376/move-universepackageswalletsrcfeaturesdataapi-tests-to-uniswap-pkg
-import { SAMPLE_CURRENCY_ID_1, SAMPLE_CURRENCY_ID_2, ethToken, usdcTokenProject } from 'wallet/src/test/fixtures'
+} from 'wallet/src/features/dataApi/utils'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
+import {
+  SAMPLE_CURRENCY_ID_1,
+  SAMPLE_CURRENCY_ID_2,
+  ethToken,
+  usdcTokenProject,
+} from 'wallet/src/test/fixtures'
 import { renderHook } from 'wallet/src/test/test-utils'
 
 describe(currencyIdToContractInput, () => {
@@ -48,7 +52,7 @@ describe(tokenProjectToCurrencyInfos, () => {
         symbol: token.symbol,
         name: project.name,
       }),
-    }) as CurrencyInfo
+    } as CurrencyInfo)
 
   it('converts tokenProject to CurrencyInfo', () => {
     const result = tokenProjectToCurrencyInfos([project])
@@ -60,7 +64,9 @@ describe(tokenProjectToCurrencyInfos, () => {
     const result = tokenProjectToCurrencyInfos([project], UniverseChainId.Polygon)
 
     expect(result).toEqual(
-      project.tokens.filter((token) => token.chain === 'POLYGON').map((token) => getExpectedResult(project, token)),
+      project.tokens
+        .filter((token) => token.chain === 'POLYGON')
+        .map((token) => getExpectedResult(project, token))
     )
   })
 
@@ -115,14 +121,14 @@ describe(buildCurrency, () => {
         chainId: null,
         address: '0x0',
         decimals: 18,
-      }),
+      })
     ).toBeUndefined()
     expect(
       buildCurrency({
         chainId: UniverseChainId.Mainnet,
         address: '0x0',
         decimals: null,
-      }),
+      })
     ).toBeUndefined()
   })
 })
diff --git a/packages/uniswap/src/features/dataApi/utils.ts b/packages/wallet/src/features/dataApi/utils.ts
similarity index 97%
rename from packages/uniswap/src/features/dataApi/utils.ts
rename to packages/wallet/src/features/dataApi/utils.ts
index e4b9a36b4cb..db2fb79ae87 100644
--- a/packages/uniswap/src/features/dataApi/utils.ts
+++ b/packages/wallet/src/features/dataApi/utils.ts
@@ -1,6 +1,6 @@
 import { ApolloError } from '@apollo/client'
-import { BigNumber } from '@ethersproject/bignumber'
 import { Token } from '@uniswap/sdk-core'
+import { BigNumber } from 'ethers'
 import { useRef } from 'react'
 import {
   Chain,
@@ -11,7 +11,6 @@ import {
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain, toGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import {
@@ -20,6 +19,7 @@ import {
   currencyIdToGraphQLAddress,
   isNativeCurrencyAddress,
 } from 'uniswap/src/utils/currencyId'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 
 type BuildCurrencyParams = {
   chainId?: Nullable<WalletChainId>
diff --git a/packages/wallet/src/features/favorites/slice.ts b/packages/wallet/src/features/favorites/slice.ts
index 7b325045799..16159d39d92 100644
--- a/packages/wallet/src/features/favorites/slice.ts
+++ b/packages/wallet/src/features/favorites/slice.ts
@@ -1,10 +1,10 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { Ether } from '@uniswap/sdk-core'
-import { WBTC } from 'uniswap/src/constants/tokens'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { currencyId as idFromCurrency } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
+import { WBTC } from 'wallet/src/constants/tokens'
 
 export type Visibility = { isVisible: boolean }
 export type CurrencyIdToVisibility = Record<CurrencyId, Visibility>
diff --git a/packages/wallet/src/features/fiatOnRamp/api.ts b/packages/wallet/src/features/fiatOnRamp/api.ts
index d92d19fdabe..f048ecf205c 100644
--- a/packages/wallet/src/features/fiatOnRamp/api.ts
+++ b/packages/wallet/src/features/fiatOnRamp/api.ts
@@ -1,31 +1,324 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import { MoonpayEventName } from '@uniswap/analytics-events'
 import dayjs from 'dayjs'
+import { config } from 'uniswap/src/config'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { objectToQueryString } from 'uniswap/src/data/utils'
+import { useFiatOnRampAggregatorTransferServiceProvidersQuery } from 'uniswap/src/features/fiatOnRamp/api'
 import { FOR_API_HEADERS } from 'uniswap/src/features/fiatOnRamp/constants'
-import { FORTransactionResponse } from 'uniswap/src/features/fiatOnRamp/types'
+import {
+  FORServiceProvider,
+  FORTransactionRequest,
+  FORTransactionResponse,
+} from 'uniswap/src/features/fiatOnRamp/types'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
-import { FiatOnRampTransactionDetails } from 'wallet/src/features/fiatOnRamp/types'
+import { createSignedRequestParams } from 'wallet/src/data/utils'
+import {
+  FiatOnRampTransactionDetails,
+  FiatOnRampWidgetUrlQueryParameters,
+  FiatOnRampWidgetUrlQueryResponse,
+  MoonpayBuyQuoteResponse,
+  MoonpayCurrency,
+  MoonpayIPAddressesResponse,
+  MoonpayLimitsResponse,
+  MoonpayListCurrenciesResponse,
+  MoonpayTransactionsResponse,
+} from 'wallet/src/features/fiatOnRamp/types'
 import { extractFiatOnRampTransactionDetails } from 'wallet/src/features/transactions/history/conversion/extractFiatOnRampTransactionDetails'
+import { extractMoonpayTransactionDetails } from 'wallet/src/features/transactions/history/conversion/extractMoonpayTransactionDetails'
+import { serializeQueryParams } from 'wallet/src/features/transactions/swap/utils'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { walletContextValue } from 'wallet/src/features/wallet/context'
+import { selectActiveAccount } from 'wallet/src/features/wallet/selectors'
+import { SignerManager } from 'wallet/src/features/wallet/signing/SignerManager'
+import { RootState } from 'wallet/src/state'
 
+const COMMON_QUERY_PARAMS = serializeQueryParams({ apiKey: config.moonpayApiKey })
+const TRANSACTION_NOT_FOUND = 404
 const FIAT_ONRAMP_STALE_TX_TIMEOUT = ONE_MINUTE_MS * 20
 const FIAT_ONRAMP_FORCE_FETCH_TX_TIMEOUT = ONE_MINUTE_MS * 3
 
+// List of currency codes that our Moonpay account supports
+// Manually maintained for now
+const supportedCurrencyCodes = [
+  'eth',
+  'eth_arbitrum',
+  'eth_base',
+  'eth_optimism',
+  'eth_polygon',
+  'weth',
+  'wbtc',
+  'matic_polygon',
+  'polygon',
+  'usdc_arbitrum',
+  'usdc_base',
+  'usdc_optimism',
+  'usdc_polygon',
+]
+
+export const fiatOnRampApi = createApi({
+  reducerPath: 'fiatOnRampApi',
+  baseQuery: fetchBaseQuery({ baseUrl: config.moonpayApiUrl }),
+  endpoints: (builder) => ({
+    fiatOnRampIpAddress: builder.query<MoonpayIPAddressesResponse, void>({
+      queryFn: () =>
+        // TODO: [MOB-223] consider a reverse proxy for privacy reasons
+        fetch(`${config.moonpayApiUrl}/v4/ip_address?${COMMON_QUERY_PARAMS}`)
+          .then((response) => response.json())
+          .then((response: MoonpayIPAddressesResponse) => {
+            sendAnalyticsEvent(MoonpayEventName.MOONPAY_GEOCHECK_COMPLETED, {
+              success: response.isBuyAllowed ?? false,
+              networkError: false,
+            })
+            return { data: response }
+          })
+          .catch((e) => {
+            sendAnalyticsEvent(MoonpayEventName.MOONPAY_GEOCHECK_COMPLETED, {
+              success: false,
+              networkError: true,
+            })
+
+            return { data: undefined, error: e }
+          }),
+    }),
+    fiatOnRampSupportedTokens: builder.query<
+      MoonpayCurrency[],
+      {
+        isUserInUS: boolean
+        stateInUS?: string
+      }
+    >({
+      queryFn: ({ isUserInUS, stateInUS }) =>
+        // TODO: [MOB-223] consider a reverse proxy for privacy reasons
+        fetch(`${config.moonpayApiUrl}/v3/currencies?${COMMON_QUERY_PARAMS}`)
+          .then((response) => response.json())
+          .then((response: MoonpayListCurrenciesResponse) => {
+            const moonpaySupportField = __DEV__ ? 'supportsTestMode' : 'supportsLiveMode'
+            return {
+              data: response.filter(
+                (c) =>
+                  c.type === 'crypto' &&
+                  c[moonpaySupportField] &&
+                  (!isUserInUS ||
+                    (c.isSupportedInUS && (!stateInUS || c.notAllowedUSStates.indexOf(stateInUS) === -1))),
+              ),
+            }
+          })
+          .catch((e) => {
+            return { data: undefined, error: e }
+          }),
+    }),
+    fiatOnRampBuyQuote: builder.query<
+      MoonpayBuyQuoteResponse,
+      {
+        quoteCurrencyCode: string
+        baseCurrencyCode: string
+        baseCurrencyAmount: string
+        areFeesIncluded: boolean
+      }
+    >({
+      queryFn: ({ quoteCurrencyCode, baseCurrencyCode, baseCurrencyAmount, areFeesIncluded }) =>
+        // TODO: [MOB-223] consider a reverse proxy for privacy reasons
+        fetch(
+          `${config.moonpayApiUrl}/v3/currencies/${quoteCurrencyCode}/buy_quote?${serializeQueryParams({
+            baseCurrencyCode,
+            baseCurrencyAmount,
+            areFeesIncluded,
+            apiKey: config.moonpayApiKey,
+          })}`,
+        )
+          .then((response) => response.json())
+          .then((response: MoonpayBuyQuoteResponse) => {
+            return { data: response }
+          })
+          .catch((e) => {
+            return { data: undefined, error: e }
+          }),
+    }),
+    fiatOnRampLimits: builder.query<
+      MoonpayLimitsResponse,
+      {
+        quoteCurrencyCode: string
+        baseCurrencyCode: string
+        areFeesIncluded: boolean
+      }
+    >({
+      queryFn: ({ quoteCurrencyCode, baseCurrencyCode, areFeesIncluded }) =>
+        // TODO: [MOB-223] consider a reverse proxy for privacy reasons
+        fetch(
+          `${config.moonpayApiUrl}/v3/currencies/${quoteCurrencyCode}/limits?${serializeQueryParams({
+            baseCurrencyCode,
+            areFeesIncluded,
+            apiKey: config.moonpayApiKey,
+          })}`,
+        )
+          .then((response) => response.json())
+          .then((response: MoonpayLimitsResponse) => {
+            return { data: response }
+          })
+          .catch((e) => {
+            return { data: undefined, error: e }
+          }),
+    }),
+
+    fiatOnRampWidgetUrl: builder.query<
+      string,
+      FiatOnRampWidgetUrlQueryParameters & {
+        ownerAddress: Address
+        amount: string
+        currencyCode: string
+        baseCurrencyCode: string
+        redirectUrl?: string
+      }
+    >({
+      query: ({ ownerAddress, amount, currencyCode, baseCurrencyCode, redirectUrl, ...rest }) => ({
+        url: config.moonpayWidgetApiUrl,
+        body: {
+          ...rest,
+          defaultCurrencyCode: 'eth',
+          currencyCode,
+          baseCurrencyCode,
+          baseCurrencyAmount: amount,
+          redirectURL: redirectUrl,
+          walletAddresses: JSON.stringify(
+            supportedCurrencyCodes.reduce<Record<string, Address>>((acc, code: string) => {
+              acc[code] = ownerAddress
+              return acc
+            }, {}),
+          ),
+        },
+        method: 'POST',
+      }),
+      transformResponse: (response: FiatOnRampWidgetUrlQueryResponse) => response.url,
+    }),
+  }),
+})
+
+export const {
+  useFiatOnRampIpAddressQuery,
+  useFiatOnRampWidgetUrlQuery,
+  useFiatOnRampSupportedTokensQuery,
+  useFiatOnRampBuyQuoteQuery,
+  useFiatOnRampLimitsQuery,
+} = fiatOnRampApi
+
+export const fiatOnRampAggregatorApi = createApi({
+  reducerPath: 'fiatOnRampAggregatorApi-wallet',
+  baseQuery: fetchBaseQuery({
+    baseUrl: uniswapUrls.fiatOnRampApiUrl,
+    headers: FOR_API_HEADERS,
+  }),
+  endpoints: (builder) => ({
+    fiatOnRampAggregatorTransaction: builder.query<FORTransactionResponse, FORTransactionRequest>({
+      async queryFn(args, { getState }, _extraOptions, baseQuery) {
+        try {
+          const account = selectActiveAccount(getState() as RootState)
+          const signerManager = walletContextValue.signers
+
+          if (!account) {
+            throw new Error('No active account')
+          }
+          const { requestParams, signature } = await createSignedRequestParams(args, account, signerManager)
+          const result = await baseQuery({
+            url: `/transaction?${objectToQueryString(requestParams)}`,
+            method: 'GET',
+            headers: {
+              'x-uni-sig': signature,
+            },
+          })
+          if (result.error) {
+            return { error: result.error }
+          }
+          return { data: result.data as FORTransactionResponse }
+        } catch (error) {
+          return { error: { status: 'FETCH_ERROR', error: String(error) } }
+        }
+      },
+    }),
+  }),
+})
+
+export const { useFiatOnRampAggregatorTransactionQuery } = fiatOnRampAggregatorApi
+
+/**
+ * Utility to fetch fiat onramp transactions from moonpay
+ */
+export function fetchMoonpayTransaction(
+  previousTransactionDetails: FiatOnRampTransactionDetails,
+): Promise<FiatOnRampTransactionDetails | undefined> {
+  return fetch(
+    `${config.moonpayApiUrl}/v1/transactions/ext/${previousTransactionDetails.id}?${COMMON_QUERY_PARAMS}`,
+  ).then((res) => {
+    if (res.status === TRANSACTION_NOT_FOUND) {
+      // If Moonpay API returned 404 for the given external transaction id
+      // (meaning it was not /yet/ found on their end, e.g. user has not finished flow)
+      // we opt to put a dummy placeholder transaction in the user's activity feed.
+      // to avoid leaving placeholders as "pending" for too long, we mark them
+      // as "unknown" after some time
+      const isStale = dayjs(previousTransactionDetails.addedTime).isBefore(
+        dayjs().subtract(FIAT_ONRAMP_STALE_TX_TIMEOUT, 'ms'),
+      )
+
+      if (isStale) {
+        logger.debug(
+          'fiatOnRamp/api',
+          'fetchFiatOnRampTransaction',
+          `Transaction with id ${previousTransactionDetails.id} not found.`,
+        )
+
+        return {
+          ...previousTransactionDetails,
+          // use `Unknown` status to denote a transaction missing from backend
+          // this transaction will later get deleted
+          status: TransactionStatus.Unknown,
+        }
+      } else {
+        logger.debug(
+          'fiatOnRamp/api',
+          'fetchFiatOnRampTransaction',
+          `Transaction with id ${previousTransactionDetails.id} not found, but not stale yet (${dayjs()
+            .subtract(previousTransactionDetails.addedTime, 'ms')
+            .unix()}s old).`,
+        )
+
+        return previousTransactionDetails
+      }
+    }
+
+    return res.json().then((transactions: MoonpayTransactionsResponse) =>
+      extractMoonpayTransactionDetails(
+        // log while we have the full moonpay tx response
+        transactions.sort((a, b) => (dayjs(a.createdAt).isAfter(dayjs(b.createdAt)) ? 1 : -1))?.[0],
+      ),
+    )
+  })
+}
+
 /**
  * Utility to fetch fiat onramp transactions
  */
 export async function fetchFiatOnRampTransaction(
   previousTransactionDetails: FiatOnRampTransactionDetails,
   forceFetch: boolean,
+  account: Account,
+  signerManager: SignerManager,
 ): Promise<FiatOnRampTransactionDetails | undefined> {
-  const requestParams = {
-    sessionId: previousTransactionDetails.id,
-    // Force fetch if requested or for the first 3 minutes after the transaction was added
-    forceFetch: shouldForceFetchTransaction(previousTransactionDetails, forceFetch),
-  }
+  // Force fetch if requested or for the first 3 minutes after the transaction was added
+  const shouldForceFetch = shouldForceFetchTransaction(previousTransactionDetails, forceFetch)
+
+  const { requestParams, signature } = await createSignedRequestParams<FORTransactionRequest>(
+    { sessionId: previousTransactionDetails.id, forceFetch: shouldForceFetch },
+    account,
+    signerManager,
+  )
   const res = await fetch(`${uniswapUrls.fiatOnRampApiUrl}/transaction?${objectToQueryString(requestParams)}`, {
-    headers: FOR_API_HEADERS,
+    headers: {
+      'x-uni-sig': signature,
+      ...FOR_API_HEADERS,
+    },
   })
   const { transaction }: FORTransactionResponse = await res.json()
   if (!transaction) {
@@ -72,3 +365,15 @@ function shouldForceFetchTransaction(
   const isSyncedWithBackend = previousTransactionDetails.typeInfo?.syncedWithBackend
   return forceFetch || (isRecent && !isSyncedWithBackend)
 }
+
+export function useCexTransferProviders(isEnabled: boolean): FORServiceProvider[] {
+  const { data, isLoading } = useFiatOnRampAggregatorTransferServiceProvidersQuery(undefined, {
+    skip: !isEnabled,
+  })
+
+  if (isLoading || !data) {
+    return []
+  }
+
+  return data.serviceProviders
+}
diff --git a/packages/wallet/src/features/fiatOnRamp/hooks.ts b/packages/wallet/src/features/fiatOnRamp/hooks.ts
new file mode 100644
index 00000000000..6970d049374
--- /dev/null
+++ b/packages/wallet/src/features/fiatOnRamp/hooks.ts
@@ -0,0 +1,64 @@
+import { FiatCurrencyInfo } from 'uniswap/src/features/fiatOnRamp/types'
+import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
+import { useAppFiatCurrencyInfo, useFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+
+// MoonPay supported fiat currencies (https://support.moonpay.com/hc/en-gb/articles/360011931457-Which-fiat-currencies-are-supported-)
+const MOONPAY_FIAT_CURRENCY_CODES = [
+  'aud', // Australian Dollar
+  'bgn', // Bulgarian Lev
+  'brl', // Brazilian Real
+  'cad', // Canadian Dollar
+  'chf', // Swiss Franc
+  'cny', // Chinese Yuan
+  'cop', // Colombia Peso
+  'czk', // Czech Koruna
+  'dkk', // Danish Krone
+  'dop', // Dominican Peso
+  'egp', // Egyptian Pound
+  'eur', // Euro
+  'gbp', // Pound Sterling
+  'hkd', // Hong Kong Dollar
+  'idr', // Indonesian Rupiah
+  'ils', // Israeli New Shekel
+  'jpy', // Japanese Yen
+  'jod', // Jordanian Dollar
+  'kes', // Kenyan Shilling
+  'krw', // South Korean Won
+  'kwd', // Kuwaiti Dinar
+  'lkr', // Sri Lankan Rupee
+  'mad', // Moroccan Dirham
+  'mxn', // Mexican Peso
+  'ngn', // Nigerian Naira
+  'nok', // Norwegian Krone
+  'nzd', // New Zealand Dollar
+  'omr', // Omani Rial
+  'pen', // Peruvian Sol
+  'pkr', // Pakistani Rupee
+  'pln', // Polish Złoty
+  'ron', // Romanian Leu
+  'sek', // Swedish Krona
+  'thb', // Thai Baht
+  'try', // Turkish Lira
+  'twd', // Taiwan Dollar
+  'usd', // US Dollar
+  'vnd', // Vietnamese Dong
+  'zar', // South African Rand
+]
+
+export function useMoonpayFiatCurrencySupportInfo(): {
+  appFiatCurrencySupportedInMoonpay: boolean
+  moonpaySupportedFiatCurrency: FiatCurrencyInfo
+} {
+  // Not all the currencies are supported by MoonPay, so we need to fallback to USD if the currency is not supported
+  const appFiatCurrencyInfo = useAppFiatCurrencyInfo()
+  const fallbackCurrencyInfo = useFiatCurrencyInfo(FiatCurrency.UnitedStatesDollar)
+  const appFiatCurrencyCode = appFiatCurrencyInfo.code.toLowerCase()
+
+  const appFiatCurrencySupported = MOONPAY_FIAT_CURRENCY_CODES.includes(appFiatCurrencyCode)
+  const currency = appFiatCurrencySupported ? appFiatCurrencyInfo : fallbackCurrencyInfo
+
+  return {
+    appFiatCurrencySupportedInMoonpay: appFiatCurrencySupported,
+    moonpaySupportedFiatCurrency: currency,
+  }
+}
diff --git a/packages/wallet/src/features/fiatOnRamp/types.ts b/packages/wallet/src/features/fiatOnRamp/types.ts
index 81480ac34dd..9908407f404 100644
--- a/packages/wallet/src/features/fiatOnRamp/types.ts
+++ b/packages/wallet/src/features/fiatOnRamp/types.ts
@@ -4,6 +4,25 @@ export type FiatOnRampTransactionDetails = TransactionDetails & {
   typeInfo: FiatPurchaseTransactionInfo
 }
 
+export type FiatOnRampWidgetUrlQueryParameters = {
+  colorCode: string
+  externalTransactionId: string
+}
+
+export type FiatOnRampWidgetUrlQueryResponse = { url: string }
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#ip_address_object */
+export type MoonpayIPAddressData = {
+  alpha3?: string
+  state?: string
+  isAllowed?: boolean
+  isBuyAllowed?: boolean
+  isSellAllowed?: boolean
+}
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#check_ip_address */
+export type MoonpayIPAddressesResponse = MoonpayIPAddressData
+
 /** @ref https://dashboard.moonpay.com/api_reference/client_side_api#currencies */
 export type MoonpayCurrency = {
   id: string
@@ -19,3 +38,127 @@ export type MoonpayCurrency = {
     chainId: string
   }
 }
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#list_currencies */
+export type MoonpayListCurrenciesResponse = MoonpayCurrency[]
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#get_currency_buy_quote */
+export type MoonpayBuyQuoteResponse = MoonpayQuote
+
+type CurrencyLimit = {
+  code: string
+  minBuyAmount: number
+  maxBuyAmount: number
+}
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#get_currency_limits */
+export type MoonpayLimitsResponse = {
+  paymentMethod: string
+  quoteCurrency: CurrencyLimit
+  baseCurrency: CurrencyLimit
+  areFeesIncluded: boolean
+}
+
+/** @ref https://dashboard.moonpay.com/api_reference/client_side_api#transactions */
+type MoonpayQuote = {
+  // A positive integer representing how much the customer wants to spend. The minimum amount is 20.
+  baseCurrencyAmount: number
+  // A positive integer representing the amount of cryptocurrency the customer will receive. Set when the purchase of cryptocurrency has been executed.
+  quoteCurrencyAmount: number
+  quoteCurrencyPrice: number
+  // A positive integer representing the fee for the transaction. It is added to baseCurrencyAmount, extraFeeAmount and networkFeeAmount when the customer's card is charged.
+  feeAmount: number
+  // A positive integer representing your extra fee for the transaction. It is added to baseCurrencyAmount and feeAmount when the customer's card is charged.
+  extraFeeAmount: number
+  // A positive integer representing the network fee for the transaction. It is added to baseCurrencyAmount, feeAmount and extraFeeAmount when the customer's card is charged.
+  networkFeeAmount: number
+  // A boolean indicating whether baseCurrencyAmount includes or excludes the feeAmount, extraFeeAmount and networkFeeAmount.
+  areFeesIncluded: boolean
+}
+
+/**
+ * Transaction objects represent cryptocurrency purchases by your end users.
+ * @ref https://dashboard.moonpay.com/api_reference/client_side_api#transactions
+ */
+export type MoonpayTransactionsResponse = Array<MoonpayTransactionResponseItem>
+
+export type MoonpayTransactionResponseItem = MoonpayQuote & {
+  // Unique identifier for the object.
+  id: string
+  // Time at which the object was created. Returned as an ISO 8601 string.
+  createdAt: string
+  // Time at which the object was last updated. Returned as an ISO 8601 string.
+  updatedAt: string
+  baseCurrency: MoonpayCurrency
+  currency: MoonpayCurrency
+  // The transaction's status.
+  status: 'waitingPayment' | 'pending' | 'waitingAuthorization' | 'failed' | 'completed'
+  // The transaction's failure reason. Set when transaction's status is failed.
+  failureReason: string
+  // The cryptocurrency wallet address the purchased funds will be sent to.
+  walletAddress: string
+  // The secondary cryptocurrency wallet address identifier for coins such as EOS, XRP and XMR.
+  walletAddressTag: string
+  // The cryptocurrency transaction identifier representing the transfer to the customer's wallet. Set when the withdrawal has been executed.
+  cryptoTransactionId: string
+  // The URL provided to you, when required, to which to redirect the customer as part of a redirect authentication flow.
+  redirectUrl: string
+  // The URL the customer is returned to after they authenticate or cancel their payment on the payment method’s app or site. If you are using our widget implementation, this is always our transaction tracker page, which provides the customer with real-time information about their transaction.
+  returnUrl: string
+  // The cryptocurrency transaction identifier representing the transfer from the customer's wallet to MoonPay's wallet. Set when the deposit has been executed and received.
+  depositHash?: string
+  // An optional URL used in a widget implementation. It is passed to us by you in the query parameters, and we include it as a link on the transaction tracker page.
+  widgetRedirectUrl: string
+  // The exchange rate between the transaction's base currency and Euro at the time of the transaction.
+  eurRate: number
+  // The exchange rate between the transaction's base currency and US Dollar at the time of the transaction.
+  usdRate: number
+  // The exchange rate between the transaction's base currency and British Pound at the time of the transaction.
+  gbpRate: number
+  // For bank transfer transactions, the information about our bank account to which the customer should make the transfer.
+  bankDepositInformation: object
+  // For bank transfer transactions, the reference code the customer should cite when making the transfer.
+  bankTransferReference: string
+  // The identifier of the cryptocurrency the customer wants to purchase.
+  currencyId: string
+  // The identifier of the fiat currency the customer wants to use for the transaction.
+  baseCurrencyId: string
+  // The identifier of the customer the transaction is associated with.
+  customerId: string
+  // For token or card transactions, the identifier of the payment card used for this transaction.
+  cardId: string
+  // For bank transfer transactions, the identifier of the bank account used for this transaction.
+  bankAccountId: string
+  // An identifier associated with the customer, provided by you.
+  externalCustomerId: string
+  // The transaction's payment method. Possible values are credit_debit_card, sepa_bank_transfer, sepa_open_banking_payment, gbp_bank_transfer, gbp_open_banking_payment, ach_bank_transfer, pix_instant_payment and mobile_wallet
+  paymentMethod: string
+  // An identifier associated with the transaction, provided by you.
+  externalTransactionId: string
+  // The customer's country. Returned as an ISO 3166-1 alpha-3 code.
+  country: string
+  // The customer's state, if the customer is from the USA. Returned as a two-letter code.
+  state: string
+  // An array of four objects, each representing one of the four stages of the purchase process. The attributes of each stage are described below.
+  stages: Array<{
+    stage: 'stage_one_ordering' | 'stage_two_verification' | 'stage_three_processing' | 'stage_four_delivery'
+    status: 'not_started' | 'in_progress' | 'success' | 'failed'
+    failureReason:
+      | 'card_not_supported'
+      | 'daily_purchase_limit_exceeded'
+      | 'payment_authorization_declined'
+      | 'timeout_3d_secure'
+      | 'timeout_bank_transfer'
+      | 'timeout_kyc_verification'
+      | 'timeout_card_verification'
+      | 'rejected_kyc'
+      | 'rejected_card'
+      | 'rejected_other'
+      | 'cancelled'
+      | 'refund'
+      | 'failed_testnet_withdrawal'
+      | 'error'
+    // Sometimes| the customer is required to take an action or actions to further the purchase process| usually by submitting information at a provided URL. For each action| we pass an object with a type and a url.
+    actions: 'complete_bank_transfer' | 'retry_kyc' | 'verify_card_by_code' | 'verify_card_by_file'
+  }>
+}
diff --git a/packages/wallet/src/features/gas/hooks.ts b/packages/wallet/src/features/gas/hooks.ts
index 6bdceb6d2c4..a66e7760dfb 100644
--- a/packages/wallet/src/features/gas/hooks.ts
+++ b/packages/wallet/src/features/gas/hooks.ts
@@ -1,7 +1,6 @@
 import { BigNumber, providers } from 'ethers'
 import { useCallback, useMemo } from 'react'
 import { PollingInterval } from 'uniswap/src/constants/misc'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { logger } from 'utilities/src/logger/logger'
 import { useAsyncData } from 'utilities/src/react/hooks'
@@ -9,6 +8,7 @@ import { TRANSACTION_CANCELLATION_GAS_FACTOR } from 'wallet/src/constants/transa
 import { FeeDetails, getAdjustedGasFeeDetails } from 'wallet/src/features/gas/adjustGasFee'
 import { useGasFeeQuery } from 'wallet/src/features/gas/api'
 import { FeeType, GasFeeResult, GasSpeed } from 'wallet/src/features/gas/types'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { getCancelOrderTxRequest } from 'wallet/src/features/transactions/cancelTransactionSaga'
 import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
diff --git a/packages/wallet/src/features/language/formatter.ts b/packages/wallet/src/features/language/formatter.ts
index c30430ff763..4110fbe5575 100644
--- a/packages/wallet/src/features/language/formatter.ts
+++ b/packages/wallet/src/features/language/formatter.ts
@@ -1,6 +1,5 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { useCallback, useMemo } from 'react'
-import { FormatNumberOrStringInput } from 'uniswap/src/features/language/formatter'
 // eslint-disable-next-line no-restricted-imports
 import {
   addFiatSymbolToNumber,
@@ -11,6 +10,12 @@ import {
 import { NumberType } from 'utilities/src/format/types'
 import { useCurrentLocale } from 'wallet/src/features/language/hooks'
 
+type FormatNumberOrStringInput = {
+  value: Maybe<number | string>
+  type?: NumberType
+  currencyCode?: string
+  placeholder?: string
+}
 type FormatCurrencyAmountInput = {
   value: CurrencyAmount<Currency> | null | undefined
   type?: NumberType
diff --git a/packages/wallet/src/features/nfts/useNftContextMenu.tsx b/packages/wallet/src/features/nfts/useNftContextMenu.tsx
index 1fbbbd293bf..496e91a016f 100644
--- a/packages/wallet/src/features/nfts/useNftContextMenu.tsx
+++ b/packages/wallet/src/features/nfts/useNftContextMenu.tsx
@@ -2,7 +2,6 @@ import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent } from 'react-native'
 import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
 import { GeneratedIcon, isWeb, useIsDarkMode } from 'ui/src'
 import { Eye, EyeOff } from 'ui/src/components/icons'
 import { UNIVERSE_CHAIN_LOGO } from 'uniswap/src/assets/chainLogos'
@@ -17,7 +16,7 @@ import { getIsNftHidden, getNFTAssetKey } from 'wallet/src/features/nfts/utils'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 import { getExplorerName } from 'wallet/src/utils/linking'
 
 interface NFTMenuParams {
@@ -44,7 +43,7 @@ export function useNFTContextMenu({
   onlyShare: boolean
 } {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isDarkMode = useIsDarkMode()
 
   const { handleShareNft, navigateToNftDetails } = useWalletNavigation()
diff --git a/packages/wallet/src/features/notifications/buildReceiveNotification.ts b/packages/wallet/src/features/notifications/buildReceiveNotification.ts
index 290e45e2592..07864541c25 100644
--- a/packages/wallet/src/features/notifications/buildReceiveNotification.ts
+++ b/packages/wallet/src/features/notifications/buildReceiveNotification.ts
@@ -1,4 +1,4 @@
-import { AssetType } from 'uniswap/src/entities/assets'
+import { AssetType } from 'wallet/src/entities/assets'
 import {
   AppNotificationType,
   ReceiveCurrencyTxNotification,
diff --git a/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts b/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts
index ce3f98d14a7..e9cf4932bd7 100644
--- a/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts
+++ b/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts
@@ -1,7 +1,11 @@
-import { AssetType } from 'uniswap/src/entities/assets'
+import { AssetType } from 'wallet/src/entities/assets'
 import { buildReceiveNotification } from 'wallet/src/features/notifications/buildReceiveNotification'
 import { createFinalizedTxAction } from 'wallet/src/features/notifications/notificationWatcherSaga.test'
-import { ReceiveTokenTransactionInfo, TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
+import {
+  ReceiveTokenTransactionInfo,
+  TransactionStatus,
+  TransactionType,
+} from 'wallet/src/features/transactions/types'
 import {
   receiveCurrencyTxNotification,
   receiveNFTNotification,
@@ -48,7 +52,7 @@ describe(buildReceiveNotification, () => {
         tokenAddress: receiveNftTypeInfo.tokenAddress,
         txId: testTransaction.id,
         txStatus: testTransaction.status,
-      }),
+      })
     )
   })
 
@@ -65,7 +69,7 @@ describe(buildReceiveNotification, () => {
         tokenAddress: receiveCurrencyTypeInfo.tokenAddress,
         txId: testTransaction.id,
         txStatus: testTransaction.status,
-      }),
+      })
     )
   })
 })
diff --git a/packages/wallet/src/features/notifications/components/ApproveNotification.tsx b/packages/wallet/src/features/notifications/components/ApproveNotification.tsx
index 6a1aea5b1a8..2fbea6fb812 100644
--- a/packages/wallet/src/features/notifications/components/ApproveNotification.tsx
+++ b/packages/wallet/src/features/notifications/components/ApproveNotification.tsx
@@ -1,7 +1,7 @@
-import { AssetType } from 'uniswap/src/entities/assets'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { AssetType } from 'wallet/src/entities/assets'
 import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
 import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
 import { ApproveTxNotification } from 'wallet/src/features/notifications/types'
diff --git a/packages/wallet/src/features/notifications/components/NotificationToast.tsx b/packages/wallet/src/features/notifications/components/NotificationToast.tsx
index 4fcf07a8fe1..b7d444ef5db 100644
--- a/packages/wallet/src/features/notifications/components/NotificationToast.tsx
+++ b/packages/wallet/src/features/notifications/components/NotificationToast.tsx
@@ -5,7 +5,6 @@
 import { useCallback, useEffect } from 'react'
 import { Directions, FlingGestureHandler, FlingGestureHandlerGestureEvent, State } from 'react-native-gesture-handler'
 import { useAnimatedStyle, useSharedValue, withDelay, withSpring } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
 import {
   Flex,
   Text,
@@ -19,11 +18,10 @@ import {
 } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { borderRadii, spacing } from 'ui/src/theme'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { useTimeout } from 'utilities/src/time/timing'
 import { selectActiveAccountNotifications } from 'wallet/src/features/notifications/selectors'
 import { popNotification, setNotificationViewed } from 'wallet/src/features/notifications/slice'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 const NOTIFICATION_HEIGHT = 64
 
@@ -54,12 +52,11 @@ export interface NotificationToastProps extends NotificationContentProps {
 }
 
 // TODO(EXT-931): Consolidate mobile and web animation styles
-const WebToastEntryAnimation = styled(Flex, {
+const ToastEntryAnimation = styled(Flex, {
   animation: 'semiBouncy',
   y: 0,
   top: '$spacing12',
-  // @ts-expect-error - It's Ok to ignore and use the web-only `fixed` value because this component is only used on web.
-  position: 'fixed',
+  position: 'absolute',
   width: '100%',
   zIndex: '$overlay',
   opacity: 1,
@@ -85,7 +82,7 @@ export function NotificationToast({
   smallToast,
 }: NotificationToastProps): JSX.Element {
   const isDarkMode = useIsDarkMode()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const notifications = useAppSelector(selectActiveAccountNotifications)
   const currentNotification = notifications?.[0]
   const hasQueuedNotification = !!notifications?.[1]
@@ -178,7 +175,7 @@ export function NotificationToast({
   )
 
   return isWeb ? (
-    <WebToastEntryAnimation>{notificationContent}</WebToastEntryAnimation>
+    <ToastEntryAnimation>{notificationContent}</ToastEntryAnimation>
   ) : (
     <FlingGestureHandler direction={Directions.UP} onHandlerStateChange={onFling}>
       <AnimatedFlex
@@ -228,12 +225,7 @@ function NotificationContent({
         >
           {icon}
           <Flex shrink alignItems="flex-start" flexDirection="column">
-            <Text
-              adjustsFontSizeToFit
-              numberOfLines={subtitle ? 1 : 2}
-              testID={TestID.NotificationToastTitle}
-              variant="subheading2"
-            >
+            <Text adjustsFontSizeToFit numberOfLines={subtitle ? 1 : 2} variant="subheading2">
               {title}
             </Text>
             {subtitle && (
@@ -269,7 +261,7 @@ function NotificationContentSmall({ title, icon, onPress, onPressIn }: Notificat
       >
         <Flex row alignItems="center" gap="$spacing8" justifyContent="flex-start" pr="$spacing4">
           <Flex>{icon}</Flex>
-          <Text adjustsFontSizeToFit numberOfLines={1} testID={TestID.NotificationToastTitle} variant="body2">
+          <Text adjustsFontSizeToFit numberOfLines={1} variant="body2">
             {title}
           </Text>
         </Flex>
diff --git a/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx b/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx
index 65c4a6792bb..624dde45078 100644
--- a/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx
+++ b/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx
@@ -1,4 +1,4 @@
-import { AssetType } from 'uniswap/src/entities/assets'
+import { AssetType } from 'wallet/src/entities/assets'
 import { ApproveNotification } from 'wallet/src/features/notifications/components/ApproveNotification'
 import { ChangeAssetVisibilityNotification } from 'wallet/src/features/notifications/components/ChangeAssetVisibilityNotification'
 import { ChooseCountryNotification } from 'wallet/src/features/notifications/components/ChooseCountryNotification'
diff --git a/packages/wallet/src/features/notifications/components/SwapNotification.tsx b/packages/wallet/src/features/notifications/components/SwapNotification.tsx
index 9571bfc38b2..6b8a1459717 100644
--- a/packages/wallet/src/features/notifications/components/SwapNotification.tsx
+++ b/packages/wallet/src/features/notifications/components/SwapNotification.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next'
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
diff --git a/packages/wallet/src/features/notifications/components/UnknownNotification.tsx b/packages/wallet/src/features/notifications/components/UnknownNotification.tsx
index c3c8b00dc38..9e9c8d640d8 100644
--- a/packages/wallet/src/features/notifications/components/UnknownNotification.tsx
+++ b/packages/wallet/src/features/notifications/components/UnknownNotification.tsx
@@ -1,8 +1,8 @@
 import { AlertTriangle, CheckmarkCircle } from 'ui/src/components/icons'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useENS } from 'wallet/src/features/ens/useENS'
 import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
 import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
diff --git a/packages/wallet/src/features/notifications/components/WrapNotification.tsx b/packages/wallet/src/features/notifications/components/WrapNotification.tsx
index 3f928b4b142..da37a804451 100644
--- a/packages/wallet/src/features/notifications/components/WrapNotification.tsx
+++ b/packages/wallet/src/features/notifications/components/WrapNotification.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next'
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
diff --git a/packages/wallet/src/features/notifications/components/__snapshots__/NotSupportedNetworkNotification.test.tsx.snap b/packages/wallet/src/features/notifications/components/__snapshots__/NotSupportedNetworkNotification.test.tsx.snap
index a789ed64127..8b1e2c635b0 100644
--- a/packages/wallet/src/features/notifications/components/__snapshots__/NotSupportedNetworkNotification.test.tsx.snap
+++ b/packages/wallet/src/features/notifications/components/__snapshots__/NotSupportedNetworkNotification.test.tsx.snap
@@ -209,7 +209,6 @@ exports[`NotSupportedNetworkNotification renders without error 1`] = `
               }
             }
             suppressHighlighting={true}
-            testID="notification-toast-title"
           >
             Unsupported network
           </Text>
diff --git a/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts b/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts
index 2da93b089bd..ce69ee3c917 100644
--- a/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts
+++ b/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts
@@ -1,8 +1,8 @@
 import { TradeType } from '@uniswap/sdk-core'
 import { expectSaga } from 'redux-saga-test-plan'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType } from 'wallet/src/entities/assets'
 import { pushTransactionNotification } from 'wallet/src/features/notifications/notificationWatcherSaga'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
@@ -23,7 +23,9 @@ const finalizedTxAction = finalizedTransactionAction()
 
 const txId = 'uuid-4'
 
-export const createFinalizedTxAction = (typeInfo: TransactionTypeInfo): ReturnType<typeof finalizeTransaction> => ({
+export const createFinalizedTxAction = (
+  typeInfo: TransactionTypeInfo
+): ReturnType<typeof finalizeTransaction> => ({
   payload: {
     ...finalizedTxAction.payload,
     typeInfo,
@@ -63,7 +65,7 @@ describe(pushTransactionNotification, () => {
           tokenAddress: approveTypeInfo.tokenAddress,
           spender: approveTypeInfo.spender,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -118,7 +120,7 @@ describe(pushTransactionNotification, () => {
           outputCurrencyAmountRaw: swapTypeInfo.outputCurrencyAmountRaw,
           tradeType: swapTypeInfo.tradeType,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -147,7 +149,7 @@ describe(pushTransactionNotification, () => {
           currencyAmountRaw: '1000',
           recipient: sendCurrencyTypeInfo.recipient,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -176,7 +178,7 @@ describe(pushTransactionNotification, () => {
           tokenId: '420',
           recipient: sendNftTypeInfo.recipient,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -205,7 +207,7 @@ describe(pushTransactionNotification, () => {
           currencyAmountRaw: '1000',
           sender: receiveCurrencyTypeInfo.sender,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -234,7 +236,7 @@ describe(pushTransactionNotification, () => {
           tokenId: '420',
           sender: receiveNftTypeInfo.sender,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
@@ -257,7 +259,7 @@ describe(pushTransactionNotification, () => {
           txType: TransactionType.Unknown,
           tokenAddress: unknownTxTypeInfo.tokenAddress,
           txId,
-        }),
+        })
       )
       .silentRun()
   })
diff --git a/packages/wallet/src/features/notifications/notificationWatcherSaga.ts b/packages/wallet/src/features/notifications/notificationWatcherSaga.ts
index 9008d260fd5..617746e9e86 100644
--- a/packages/wallet/src/features/notifications/notificationWatcherSaga.ts
+++ b/packages/wallet/src/features/notifications/notificationWatcherSaga.ts
@@ -1,7 +1,7 @@
 import { call, put, takeLatest } from 'typed-redux-saga'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
+import { AssetType } from 'wallet/src/entities/assets'
 import { buildReceiveNotification } from 'wallet/src/features/notifications/buildReceiveNotification'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
diff --git a/packages/wallet/src/features/notifications/testingUtils.ts b/packages/wallet/src/features/notifications/testingUtils.ts
index 0c18e65eb3d..bcabe6ab1fb 100644
--- a/packages/wallet/src/features/notifications/testingUtils.ts
+++ b/packages/wallet/src/features/notifications/testingUtils.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
-import { useDispatch } from 'react-redux'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 export const exampleDisconnectedNotification = {
   type: 2,
@@ -36,7 +36,7 @@ export const exampleSwapSuccess = {
 // easiest to use inside NotificationToastWrapper before any returns
 export const useMockNotification = (ms?: number): void => {
   const [sent, setSent] = useState(false)
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAddress = useActiveAccountAddressWithThrow()
 
   useEffect(() => {
diff --git a/packages/wallet/src/features/notifications/types.ts b/packages/wallet/src/features/notifications/types.ts
index 59b95790c28..36835581026 100644
--- a/packages/wallet/src/features/notifications/types.ts
+++ b/packages/wallet/src/features/notifications/types.ts
@@ -1,8 +1,8 @@
 import { TradeType } from '@uniswap/sdk-core'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
+import { AssetType } from 'wallet/src/entities/assets'
 import { FinalizedTransactionStatus, TransactionType, WrapType } from 'wallet/src/features/transactions/types'
 
 export enum AppNotificationType {
diff --git a/packages/wallet/src/features/notifications/utils.test.ts b/packages/wallet/src/features/notifications/utils.test.ts
index 40c68319cfc..c2a58a3b0d6 100644
--- a/packages/wallet/src/features/notifications/utils.test.ts
+++ b/packages/wallet/src/features/notifications/utils.test.ts
@@ -1,5 +1,5 @@
 import { TradeType } from '@uniswap/sdk-core'
-import { DAI, USDC } from 'uniswap/src/constants/tokens'
+import { DAI, USDC } from 'wallet/src/constants/tokens'
 import { formSwapNotificationTitle } from 'wallet/src/features/notifications/utils'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
 import { mockLocalizedFormatter } from 'wallet/src/test/mocks'
@@ -16,8 +16,8 @@ describe(formSwapNotificationTitle, () => {
         '1-USDC',
         '1000000000000000000',
         '1000000',
-        TradeType.EXACT_INPUT,
-      ),
+        TradeType.EXACT_INPUT
+      )
     ).toEqual('Swapped 1.00 DAI for ~1.00 USDC.')
   })
 
@@ -31,8 +31,8 @@ describe(formSwapNotificationTitle, () => {
         '1-DAI',
         '1-USDC',
         '1000000000000000000',
-        '1200000',
-      ),
+        '1200000'
+      )
     ).toEqual('Swapped 1.00 DAI for 1.20 USDC.')
   })
 
@@ -47,8 +47,8 @@ describe(formSwapNotificationTitle, () => {
         '1-USDC',
         '1000000000000000000',
         '1000000',
-        TradeType.EXACT_INPUT,
-      ),
+        TradeType.EXACT_INPUT
+      )
     ).toEqual('Canceled DAI-USDC swap.')
   })
 
@@ -63,8 +63,8 @@ describe(formSwapNotificationTitle, () => {
         '1-USDC',
         '1000000000000000000',
         '1000000',
-        TradeType.EXACT_INPUT,
-      ),
+        TradeType.EXACT_INPUT
+      )
     ).toEqual('Failed to swap 1.00 DAI for ~1.00 USDC.')
   })
 })
diff --git a/packages/wallet/src/features/onboarding/OnboardingContext.tsx b/packages/wallet/src/features/onboarding/OnboardingContext.tsx
index a80e9f90d2a..78fdce5c8d8 100644
--- a/packages/wallet/src/features/onboarding/OnboardingContext.tsx
+++ b/packages/wallet/src/features/onboarding/OnboardingContext.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable max-lines */
 import { PropsWithChildren, createContext, useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { UnitagClaim } from 'uniswap/src/features/unitags/types'
@@ -21,7 +20,7 @@ import { EditAccountAction, editAccountActions } from 'wallet/src/features/walle
 import { Account, BackupType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { createAccountsActions } from 'wallet/src/features/wallet/create/createAccountsSaga'
 import { selectSortedSignerMnemonicAccounts } from 'wallet/src/features/wallet/selectors'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export interface OnboardingContext {
   generateOnboardingAccount: (password?: string) => Promise<void>
@@ -98,7 +97,7 @@ const OnboardingContext = createContext<OnboardingContext>(initialOnboardingCont
  * to redux store.
  */
 export function OnboardingContextProvider({ children }: PropsWithChildren<unknown>): JSX.Element {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const claimUnitag = useClaimUnitag()
   const sortedMnemonicAccounts = useAppSelector(selectSortedSignerMnemonicAccounts)
diff --git a/packages/wallet/src/features/portfolio/AnimatedNumber.tsx b/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
index f1faa83c960..7d5b8d6c2d0 100644
--- a/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
+++ b/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
@@ -16,7 +16,6 @@ import { Flex, Shine, useSporeColors } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { TextLoaderWrapper } from 'ui/src/components/text/Text'
 import { fonts } from 'ui/src/theme'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { usePrevious } from 'utilities/src/react/hooks'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 
@@ -229,7 +228,6 @@ const AnimatedNumber = (props: AnimatedNumberProps): JSX.Element => {
               color: colors.neutral1.val,
             },
           ]}
-          testID={TestID.PortfolioBalance}
         >
           {amountOfCurrency[0]}
           <Text
@@ -324,7 +322,7 @@ const ReanimatedNumber = ({
   }
 
   return (
-    <Animated.View style={scaleWraper} testID={TestID.PortfolioBalance}>
+    <Animated.View style={scaleWraper}>
       <Flex row alignItems="flex-start" backgroundColor="$surface1" borderRadius="$rounded4" width={MAX_DEVICE_WIDTH}>
         <TopAndBottomGradient />
         <Shine disabled={!warmLoading}>
diff --git a/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx b/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx
index eefa35b997d..48f726d2179 100644
--- a/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx
+++ b/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx
@@ -2,7 +2,6 @@ import { useTranslation } from 'react-i18next'
 import { Flex, ImpactFeedbackStyle, Text, TouchableArea } from 'ui/src'
 import { RotatableChevron } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 
 export function HiddenTokensRow({
   padded = false,
@@ -24,12 +23,7 @@ export function HiddenTokensRow({
           {t('tokens.hidden.label', { numHidden })}
         </Text>
         {/* just used for opacity styling, the parent TouchableArea handles event */}
-        <TouchableArea
-          hapticFeedback
-          hapticStyle={ImpactFeedbackStyle.Light}
-          testID={TestID.ShowHiddenTokens}
-          onPress={onPress}
-        >
+        <TouchableArea hapticFeedback hapticStyle={ImpactFeedbackStyle.Light} onPress={onPress}>
           <Flex
             row
             alignItems="center"
diff --git a/packages/wallet/src/features/portfolio/PortfolioEmptyState.tsx b/packages/wallet/src/features/portfolio/PortfolioEmptyState.tsx
index c234aab7605..ed06d8147c4 100644
--- a/packages/wallet/src/features/portfolio/PortfolioEmptyState.tsx
+++ b/packages/wallet/src/features/portfolio/PortfolioEmptyState.tsx
@@ -6,10 +6,10 @@ import { CRYPTO_PURCHASE_BACKGROUND_DARK, CRYPTO_PURCHASE_BACKGROUND_LIGHT } fro
 import { ArrowDownCircle, Buy as BuyIcon, PaperStack } from 'ui/src/components/icons'
 import { borderRadii } from 'ui/src/theme'
 import { ActionCard, ActionCardItem } from 'uniswap/src/components/misc/ActionCard'
-import { useCexTransferProviders } from 'uniswap/src/features/fiatOnRamp/useCexTransferProviders'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
+import { useCexTransferProviders } from 'wallet/src/features/fiatOnRamp/api'
 import { ImageUri } from 'wallet/src/features/images/ImageUri'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/features/portfolio/TokenBalanceItem.tsx b/packages/wallet/src/features/portfolio/TokenBalanceItem.tsx
index 798b394babf..e033e03f379 100644
--- a/packages/wallet/src/features/portfolio/TokenBalanceItem.tsx
+++ b/packages/wallet/src/features/portfolio/TokenBalanceItem.tsx
@@ -19,14 +19,12 @@ interface TokenBalanceItemProps {
   onPressToken?: (currencyId: CurrencyId) => void
   isLoading?: boolean
   padded?: boolean
-  index?: number
 }
 
 export const TokenBalanceItem = memo(function _TokenBalanceItem({
   portfolioBalance,
   onPressToken,
   isLoading,
-  index,
   padded,
 }: TokenBalanceItemProps) {
   const { quantity, currencyInfo, relativeChange24 } = portfolioBalance
@@ -53,7 +51,6 @@ export const TokenBalanceItem = memo(function _TokenBalanceItem({
       justifyContent="space-between"
       px={padded ? '$spacing24' : '$spacing8'}
       py="$spacing8"
-      testID={`token-list-item-${index ?? 0}`}
       onLongPress={disableOnPress}
       onPress={onPress}
     >
diff --git a/packages/wallet/src/features/portfolio/api.ts b/packages/wallet/src/features/portfolio/api.ts
index a8428ed65c0..fe51ae7f4a9 100644
--- a/packages/wallet/src/features/portfolio/api.ts
+++ b/packages/wallet/src/features/portfolio/api.ts
@@ -3,10 +3,10 @@ import { useMemo } from 'react'
 import ERC20_ABI from 'uniswap/src/abis/erc20.json'
 import { useRestQuery } from 'uniswap/src/data/rest'
 import { getPollingIntervalByBlocktime } from 'uniswap/src/features/chains/utils'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { currencyAddress as getCurrencyAddress } from 'uniswap/src/utils/currencyId'
 import { createEthersProvider } from 'wallet/src/features/providers/createEthersProvider'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { walletContextValue } from 'wallet/src/features/wallet/context'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
diff --git a/packages/wallet/src/features/portfolio/useTokenContextMenu.tsx b/packages/wallet/src/features/portfolio/useTokenContextMenu.tsx
index 39e2bf7808e..93161f95d54 100644
--- a/packages/wallet/src/features/portfolio/useTokenContextMenu.tsx
+++ b/packages/wallet/src/features/portfolio/useTokenContextMenu.tsx
@@ -2,13 +2,11 @@ import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent } from 'react-native'
 import type { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
-import { useDispatch } from 'react-redux'
 import { GeneratedIcon, isWeb } from 'ui/src'
 import { CoinConvert, Eye, EyeOff, ReceiveAlt, SendAction } from 'ui/src/components/icons'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { areCurrencyIdsEqual, currencyIdToAddress, currencyIdToChain } from 'uniswap/src/utils/currencyId'
@@ -18,28 +16,24 @@ import { usePortfolioCacheUpdater } from 'wallet/src/features/dataApi/balances'
 import { toggleTokenVisibility } from 'wallet/src/features/favorites/slice'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 interface TokenMenuParams {
   currencyId: CurrencyId
-  isBlocked: boolean
   tokenSymbolForNotification?: Nullable<string>
   portfolioBalance?: Nullable<PortfolioBalance>
 }
 
 type MenuAction = ContextMenuAction & { onPress: () => void; Icon?: GeneratedIcon }
 
-export function useTokenContextMenu({
-  currencyId,
-  isBlocked,
-  tokenSymbolForNotification,
-  portfolioBalance,
-}: TokenMenuParams): {
+export function useTokenContextMenu({ currencyId, tokenSymbolForNotification, portfolioBalance }: TokenMenuParams): {
   menuActions: Array<MenuAction>
   onContextMenuPress: (e: NativeSyntheticEvent<ContextMenuOnPressNativeEvent>) => void
 } {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
 
   const { navigateToSwapFlow, navigateToReceive, navigateToSend, handleShareToken } = useWalletNavigation()
@@ -102,7 +96,6 @@ export function useTokenContextMenu({
     (): MenuAction[] => [
       {
         title: t('common.button.swap'),
-        disabled: isBlocked,
         onPress: () => onPressSwap(CurrencyField.INPUT),
         ...(isWeb
           ? {
@@ -156,7 +149,6 @@ export function useTokenContextMenu({
     ],
     [
       t,
-      isBlocked,
       onPressSend,
       navigateToReceive,
       onPressShare,
diff --git a/packages/wallet/src/features/search/SearchBar.tsx b/packages/wallet/src/features/search/SearchBar.tsx
index bada0bdd118..604b78349ec 100644
--- a/packages/wallet/src/features/search/SearchBar.tsx
+++ b/packages/wallet/src/features/search/SearchBar.tsx
@@ -3,8 +3,8 @@ import { TextInput } from 'react-native'
 import { Flex, TouchableArea } from 'ui/src'
 import { RotatableChevron } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { SearchTextInput, SearchTextInputProps } from 'uniswap/src/features/search/SearchTextInput'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { SearchTextInput, SearchTextInputProps } from 'wallet/src/features/search/SearchTextInput'
 
 interface SearchBarProps extends SearchTextInputProps {
   onBack?: () => void
diff --git a/packages/uniswap/src/features/search/SearchContext.tsx b/packages/wallet/src/features/search/SearchContext.tsx
similarity index 100%
rename from packages/uniswap/src/features/search/SearchContext.tsx
rename to packages/wallet/src/features/search/SearchContext.tsx
diff --git a/packages/wallet/src/features/search/SearchResult.ts b/packages/wallet/src/features/search/SearchResult.ts
index d7dc214340a..9774b6ff216 100644
--- a/packages/wallet/src/features/search/SearchResult.ts
+++ b/packages/wallet/src/features/search/SearchResult.ts
@@ -1,9 +1,18 @@
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
 import { WalletChainId } from 'uniswap/src/types/chains'
 
 export type SearchResult = TokenSearchResult | WalletSearchResult | EtherscanSearchResult | NFTCollectionSearchResult
 
+// Retain original ordering as these are saved to storage and loaded back out
+export enum SearchResultType {
+  ENSAddress,
+  Token,
+  Etherscan,
+  NFTCollection,
+  Unitag,
+  WalletByAddress,
+}
+
 export function extractDomain(walletName: string, type: SearchResultType): string {
   const index = walletName.indexOf('.')
   if (index === -1 || index === walletName.length - 1) {
diff --git a/packages/uniswap/src/features/search/SearchTextInput.tsx b/packages/wallet/src/features/search/SearchTextInput.tsx
similarity index 95%
rename from packages/uniswap/src/features/search/SearchTextInput.tsx
rename to packages/wallet/src/features/search/SearchTextInput.tsx
index 9c18f94e4c3..4f0d2fa917e 100644
--- a/packages/uniswap/src/features/search/SearchTextInput.tsx
+++ b/packages/wallet/src/features/search/SearchTextInput.tsx
@@ -1,12 +1,14 @@
 import { forwardRef, useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-// eslint-disable-next-line no-restricted-imports
-import type {
+import {
+  Keyboard,
   LayoutChangeEvent,
   NativeSyntheticEvent,
   TextInput as NativeTextInput,
+  Platform,
   TextInputFocusEventData,
 } from 'react-native'
+import { NativeViewGestureHandler } from 'react-native-gesture-handler'
 import {
   AnimatePresence,
   Button,
@@ -23,10 +25,8 @@ import { RotatableChevron, Search, X } from 'ui/src/components/icons'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { fonts, iconSizes, spacing } from 'ui/src/theme'
 import { SHADOW_OFFSET_SMALL } from 'uniswap/src/components/BaseCard/BaseCard'
-import ViewGestureHandler from 'uniswap/src/components/ViewGestureHandler'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { isAndroid, isIOS } from 'utilities/src/platform'
 
 const DEFAULT_MIN_HEIGHT = 48
 
@@ -42,7 +42,6 @@ export const springConfig = {
 export type SearchTextInputProps = InputProps & {
   onCancel?: () => void
   onClose?: () => void
-  onDismiss: () => void
   clearIcon?: JSX.Element
   disableClearable?: boolean
   endAdornment?: JSX.Element | null
@@ -68,7 +67,6 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
       onClose,
       onChangeText,
       onFocus,
-      onDismiss,
       placeholder,
       py = '$spacing12',
       px = '$spacing16',
@@ -90,7 +88,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
       inputRef.current?.clear()
       setIsFocus(false)
       setShowClearButton(false)
-      onDismiss()
+      Keyboard.dismiss()
       sendAnalyticsEvent(WalletEventName.ExploreSearchCancel, { query: value || '' })
       onChangeText?.('')
       onCancel?.()
@@ -112,7 +110,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
     }
 
     const onTextInputSubmitEditing = (): void => {
-      onDismiss()
+      Keyboard.dismiss()
     }
 
     const onChangeTextInput = useCallback(
@@ -157,7 +155,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
           )}
 
           <Flex grow alignSelf="stretch" mr="$spacing8" overflow="hidden">
-            <ViewGestureHandler>
+            <NativeViewGestureHandler>
               <Input
                 ref={combinedRef}
                 autoCapitalize="none"
@@ -178,7 +176,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
                 textContentType="none"
                 top={0}
                 // fix horizontal text wobble on iOS
-                {...(isIOS && {
+                {...(Platform.OS === 'ios' && {
                   width: '100%',
                 })}
                 // avoid turning into a controlled input if not wanting to
@@ -187,7 +185,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
                 })}
                 // fix Android TextInput issue when the width is changed
                 // (the placeholder text was wrapping in 2 lines when the width was changed)
-                {...(isAndroid && {
+                {...(Platform.OS === 'android' && {
                   width: value ? undefined : 9999,
                 })}
                 width="100%"
@@ -195,7 +193,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
                 onFocus={onTextInputFocus}
                 onSubmitEditing={onTextInputSubmitEditing}
               />
-            </ViewGestureHandler>
+            </NativeViewGestureHandler>
           </Flex>
 
           <AnimatePresence>
diff --git a/packages/wallet/src/features/search/searchHistorySlice.ts b/packages/wallet/src/features/search/searchHistorySlice.ts
index e9a2a22def4..5fab06498a0 100644
--- a/packages/wallet/src/features/search/searchHistorySlice.ts
+++ b/packages/wallet/src/features/search/searchHistorySlice.ts
@@ -1,6 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { SearchResultType } from 'uniswap/src/features/search/SearchResult'
-import { SearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchResult, SearchResultType } from 'wallet/src/features/search/SearchResult'
 
 const SEARCH_HISTORY_LENGTH = 5
 
diff --git a/packages/wallet/src/features/telemetry/hooks.ts b/packages/wallet/src/features/telemetry/hooks.ts
index 8d0f12cd78a..ca85d348bb5 100644
--- a/packages/wallet/src/features/telemetry/hooks.ts
+++ b/packages/wallet/src/features/telemetry/hooks.ts
@@ -1,5 +1,4 @@
 import { useEffect, useMemo } from 'react'
-import { useDispatch } from 'react-redux'
 import { MobileAppsFlyerEvents, MobileEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent, sendAppsFlyerEvent } from 'uniswap/src/features/telemetry/send'
 import { logger } from 'utilities/src/logger/logger'
@@ -22,10 +21,10 @@ import {
 } from 'wallet/src/features/telemetry/slice'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export function useLastBalancesReporter(): void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const accounts = useAccounts()
   const lastBalancesReport = useAppSelector(selectLastBalancesReport)
@@ -88,7 +87,7 @@ export function useLastBalancesReporter(): void {
 // Returns a function that checks if the app needs to send a heartbeat action to record anonymous DAU
 // Only logs when the user has allowing product analytics off and a heartbeat has not been sent for the user's local day
 export function useHeartbeatReporter(): void {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const allowAnalytics = useAppSelector(selectAllowAnalytics)
   const lastHeartbeat = useAppSelector(selectLastHeartbeat)
 
diff --git a/packages/uniswap/src/features/tokens/NativeCurrency.ts b/packages/wallet/src/features/tokens/NativeCurrency.ts
similarity index 96%
rename from packages/uniswap/src/features/tokens/NativeCurrency.ts
rename to packages/wallet/src/features/tokens/NativeCurrency.ts
index 02f802ba2c8..4c867b4ca51 100644
--- a/packages/uniswap/src/features/tokens/NativeCurrency.ts
+++ b/packages/wallet/src/features/tokens/NativeCurrency.ts
@@ -4,7 +4,7 @@ import { getNativeAddress } from 'uniswap/src/constants/addresses'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
 import { WalletChainId } from 'uniswap/src/types/chains'
-import { wrappedNativeCurrency } from 'uniswap/src/utils/currency'
+import { wrappedNativeCurrency } from 'wallet/src/constants/tokens'
 
 export class NativeCurrency implements NativeCurrencyClass {
   constructor(chainId: number) {
diff --git a/packages/uniswap/src/features/tokens/TokenWarningModal.tsx b/packages/wallet/src/features/tokens/TokenWarningModal.tsx
similarity index 96%
rename from packages/uniswap/src/features/tokens/TokenWarningModal.tsx
rename to packages/wallet/src/features/tokens/TokenWarningModal.tsx
index 8a732b89cbe..b6d1d8e3a2a 100644
--- a/packages/uniswap/src/features/tokens/TokenWarningModal.tsx
+++ b/packages/wallet/src/features/tokens/TokenWarningModal.tsx
@@ -5,13 +5,13 @@ import { ThemeNames, imageSizes, opacify } from 'ui/src/theme'
 import { TokenLogo } from 'uniswap/src/components/CurrencyLogo/TokenLogo'
 import WarningIcon from 'uniswap/src/components/icons/WarningIcon'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { useTokenSafetyLevelColors } from 'uniswap/src/features/tokens/safetyHooks'
-import { getTokenSafetyHeaderText } from 'uniswap/src/features/tokens/utils'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
+import { getTokenSafetyHeaderText } from 'wallet/src/features/tokens/utils'
 
 function getTokenSafetyBodyText(safetyLevel: Maybe<SafetyLevel>, t: AppTFunction): string {
   switch (safetyLevel) {
diff --git a/packages/wallet/src/features/tokens/safetyHooks.ts b/packages/wallet/src/features/tokens/safetyHooks.ts
index 8c34dcaa8ba..c8c1e600891 100644
--- a/packages/wallet/src/features/tokens/safetyHooks.ts
+++ b/packages/wallet/src/features/tokens/safetyHooks.ts
@@ -1,15 +1,14 @@
 import { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { dismissedWarningTokensSelector } from 'wallet/src/features/tokens/dismissedWarningTokensSelector'
 import { addDismissedWarningToken } from 'wallet/src/features/tokens/tokensSlice'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export function useTokenWarningDismissed(currencyId: Maybe<CurrencyId>): {
   tokenWarningDismissed: boolean // user dismissed warning
   dismissWarningCallback: () => void // callback to dismiss warning
 } {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const dismissedTokens = useAppSelector(dismissedWarningTokensSelector)
 
   const tokenWarningDismissed = Boolean(currencyId && dismissedTokens && dismissedTokens[currencyId])
diff --git a/packages/wallet/src/features/tokens/useCurrencyInfo.ts b/packages/wallet/src/features/tokens/useCurrencyInfo.ts
index 5527574bb15..5e438691426 100644
--- a/packages/wallet/src/features/tokens/useCurrencyInfo.ts
+++ b/packages/wallet/src/features/tokens/useCurrencyInfo.ts
@@ -1,9 +1,9 @@
 import { useMemo } from 'react'
 import { useTokenQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { currencyIdToContractInput, gqlTokenToCurrencyInfo } from 'uniswap/src/features/dataApi/utils'
 import { WalletChainId } from 'uniswap/src/types/chains'
-import { buildNativeCurrencyId, buildWrappedNativeCurrencyId } from 'uniswap/src/utils/currencyId'
+import { currencyIdToContractInput, gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
+import { buildNativeCurrencyId, buildWrappedNativeCurrencyId } from 'wallet/src/utils/currencyId'
 
 export function useCurrencyInfo(_currencyId?: string): Maybe<CurrencyInfo> {
   const { data } = useTokenQuery({
diff --git a/packages/uniswap/src/features/tokens/utils.ts b/packages/wallet/src/features/tokens/utils.ts
similarity index 100%
rename from packages/uniswap/src/features/tokens/utils.ts
rename to packages/wallet/src/features/tokens/utils.ts
diff --git a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.native.tsx b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.native.tsx
index 7beef57a349..21da42486cf 100644
--- a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.native.tsx
+++ b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.native.tsx
@@ -2,11 +2,11 @@ import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Text, TouchableArea } from 'ui/src'
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { InsufficientNativeTokenBaseComponent } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenBaseComponent'
 import type { InsufficientNativeTokenWarningProps } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning'
 import { useInsufficientNativeTokenWarning } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning'
diff --git a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.web.tsx b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.web.tsx
index eda448d120c..9bc66f420eb 100644
--- a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.web.tsx
+++ b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning.web.tsx
@@ -1,6 +1,6 @@
 import { Flex, Text, Tooltip } from 'ui/src'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { InsufficientNativeTokenBaseComponent } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenBaseComponent'
 import type { InsufficientNativeTokenWarningProps } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning'
 import { useInsufficientNativeTokenWarning } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning'
diff --git a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning.tsx b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning.tsx
index b4a0fac2b7b..b4c2b55b99d 100644
--- a/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning.tsx
+++ b/packages/wallet/src/features/transactions/InsufficientNativeTokenWarning/useInsufficientNativeTokenWarning.tsx
@@ -5,16 +5,16 @@ import { Text } from 'ui/src'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId } from 'uniswap/src/types/chains'
-import { useNetworkColors } from 'uniswap/src/utils/colors'
 import { NumberType } from 'utilities/src/format/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { useNativeCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { type InsufficientNativeTokenWarningProps } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/InsufficientNativeTokenWarning'
 import { INSUFFICIENT_NATIVE_TOKEN_TEXT_VARIANT } from 'wallet/src/features/transactions/InsufficientNativeTokenWarning/constants'
 import { Warning, WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
 import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { useNetworkColors } from 'wallet/src/utils/colors'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
 export function useInsufficientNativeTokenWarning({ flow, gasFee, warnings }: InsufficientNativeTokenWarningProps): {
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/HeaderLogo.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/HeaderLogo.tsx
index 5f74b0f7046..f5c6b563b40 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/HeaderLogo.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/HeaderLogo.tsx
@@ -1,12 +1,12 @@
 import { Flex, useIsDarkMode, useSporeColors } from 'ui/src'
 import { ContractInteraction } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { DappLogoWithWCBadge, LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
+import { AssetType } from 'wallet/src/entities/assets'
 import {
   useCurrencyInfo,
   useNativeCurrencyInfo,
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/NftTransactionDetails.test.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/NftTransactionDetails.test.tsx
deleted file mode 100644
index 86c96185d75..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/NftTransactionDetails.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { NftTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/NftTransactionDetails'
-import { NFTMintTransactionInfo, TransactionDetails } from 'wallet/src/features/transactions/types'
-import { ACCOUNT, preloadedSharedState } from 'wallet/src/test/fixtures'
-import { render } from 'wallet/src/test/test-utils'
-
-const preloadedState = preloadedSharedState({ account: ACCOUNT })
-const nftTypeInfo = {
-  type: 'nft-mint',
-  nftSummaryInfo: {
-    tokenId: '9920dbad-ff24-47c8-814a-094566fc45ff',
-    name: 'voluptates repudiandae aliquid',
-    collectionName: 'inventore qui fugiat',
-    imageURL: 'https://loremflickr.com/640/480',
-    address: '0xaea14f6cccfeae34fea11d9a2ca6aabb112e8b8d',
-  },
-} as NFTMintTransactionInfo
-const mockTransaction = {
-  id: '9920dbad-ff24-47c8-814a-094566fc45ff',
-  chainId: 81457,
-  routing: 'CLASSIC',
-  from: '0xee814caea14f6cccfeae34fea11d9a2ca6aabb11',
-  typeInfo: nftTypeInfo,
-  status: 'confirmed',
-  addedTime: 1719911758204,
-  options: { request: {} },
-  hash: 'b568a9e9-bbe7-42fc-ab00-5070186c0600',
-  receipt: {
-    transactionIndex: 29529,
-    blockNumber: 17489,
-    blockHash: 'dfd3ad45-78e7-4124-90f2-92758b4499ba',
-    confirmedTime: 1719946653408,
-    confirmations: 57408,
-    gasUsed: 27844,
-    effectiveGasPrice: 2941,
-  },
-} as TransactionDetails
-
-// Mock the ImageUri component
-jest.mock('wallet/src/features/images/ImageUri', () => ({
-  ImageUri: jest.fn(() => null),
-}))
-
-describe('NftTransactionDetails Component', () => {
-  it('renders NftTransactionDetails without error', () => {
-    const onClose = jest.fn()
-
-    const tree = render(
-      <NftTransactionDetails transactionDetails={mockTransaction} typeInfo={nftTypeInfo} onClose={onClose} />,
-      {
-        preloadedState,
-      },
-    )
-
-    expect(tree).toMatchSnapshot()
-  })
-})
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/SwapTransactionDetails.test.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/SwapTransactionDetails.test.tsx
deleted file mode 100644
index 1ad288058ff..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/SwapTransactionDetails.test.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import {
-  ARBITRUM_DAI_CURRENCY_INFO,
-  BASE_CURRENCY,
-  ETH_CURRENCY_INFO,
-  OPTIMISM_CURRENCY,
-  POLYGON_CURRENCY,
-  currencyInfo,
-} from 'uniswap/src/test/fixtures'
-import { SwapTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/SwapTransactionDetails'
-import { SwapTypeTransactionInfo } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/types'
-import { ACCOUNT, preloadedSharedState } from 'wallet/src/test/fixtures'
-import { render } from 'wallet/src/test/test-utils'
-
-// Function to set up mocks
-const getCurrencyInfoForChain = (chainId: number): CurrencyInfo => {
-  switch (chainId) {
-    case 1: // Mainnet
-      return ETH_CURRENCY_INFO
-    case 42161: // Arbitrum One
-      return ARBITRUM_DAI_CURRENCY_INFO
-    case 8453: // Base
-      return currencyInfo({ nativeCurrency: BASE_CURRENCY })
-    case 10: // Optimism
-      return currencyInfo({ nativeCurrency: OPTIMISM_CURRENCY })
-    case 137: // Polygon
-      return currencyInfo({ nativeCurrency: POLYGON_CURRENCY })
-    default:
-      return ETH_CURRENCY_INFO // fallback to ETH
-  }
-}
-
-jest.mock('wallet/src/features/tokens/useCurrencyInfo', () => ({
-  useCurrencyInfo: (currencyIdString: string | undefined): Maybe<CurrencyInfo> => {
-    if (!currencyIdString) {
-      return null
-    }
-    const [, chainIdStr] = currencyIdString.split(':')
-    if (!chainIdStr) {
-      return null
-    }
-    const chainId = parseInt(chainIdStr, 10)
-    return getCurrencyInfoForChain(chainId)
-  },
-}))
-
-jest.mock('uniswap/src/features/gating/hooks', () => ({
-  useDynamicConfigValue: jest.fn().mockReturnValue(1000),
-  useFeatureFlag: jest.fn().mockReturnValue(true),
-}))
-
-const preloadedState = preloadedSharedState({ account: ACCOUNT })
-const swapTypeInfo = {
-  type: 'swap',
-  inputCurrencyId: '9920dbad-ff24-47c8-814a-094566fc45ff',
-  outputCurrencyId: 'ee612dba-c03f-44dd-9be7-e23fec01e671',
-  inputCurrencyAmountRaw: '83116',
-  outputCurrencyAmountRaw: '77261',
-} as SwapTypeTransactionInfo
-
-describe('SwapTransactionDetails Component', () => {
-  it('renders SwapTransactionDetails without error', () => {
-    const onClose = jest.fn()
-
-    const tree = render(<SwapTransactionDetails typeInfo={swapTypeInfo} onClose={onClose} />, {
-      preloadedState,
-    })
-
-    expect(tree).toMatchSnapshot()
-  })
-})
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows.tsx
index 0572c2458fa..5d3fe3c675d 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows.tsx
@@ -1,6 +1,5 @@
 import { PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import {
   Flex,
   Text,
@@ -15,8 +14,6 @@ import { borderRadii, iconSizes } from 'ui/src/theme'
 import { NetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
 import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
-import { openUri } from 'uniswap/src/utils/linking'
 import { shortenAddress } from 'utilities/src/addresses'
 import { useENS } from 'wallet/src/features/ens/useENS'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
@@ -26,7 +23,9 @@ import { shortenHash } from 'wallet/src/features/transactions/SummaryCards/Detai
 import { ContentRow } from 'wallet/src/features/transactions/TransactionRequest/ContentRow'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
-import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+import { ExplorerDataType, getExplorerLink, openUri } from 'wallet/src/utils/linking'
 
 export function TransactionDetailsInfoRows({
   transactionDetails,
@@ -150,7 +149,7 @@ function NetworkFeeRow({ transactionDetails }: { transactionDetails: Transaction
 function TransactionHashRow({ transactionDetails }: { transactionDetails: TransactionDetails }): JSX.Element | null {
   const { hash } = transactionDetails
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   if (!hash && isUniswapX(transactionDetails)) {
     return null
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.test.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.test.tsx
index 60fc542241b..ecc1bf8144e 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.test.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.test.tsx
@@ -1,20 +1,21 @@
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
+import { TransactionDetailsInfoRows } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows'
 import {
+  TransactionDetailsContent,
+  TransactionDetailsHeader,
+} from 'wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal'
+import { TransactionDetails } from 'wallet/src/features/transactions/types'
+import {
+  ACCOUNT,
   ARBITRUM_DAI_CURRENCY_INFO,
   BASE_CURRENCY,
   ETH_CURRENCY_INFO,
   OPTIMISM_CURRENCY,
   POLYGON_CURRENCY,
   currencyInfo,
-} from 'uniswap/src/test/fixtures'
-import { TransactionDetailsInfoRows } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsInfoRows'
-import {
-  TransactionDetailsContent,
-  TransactionDetailsHeader,
-} from 'wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal'
-import { TransactionDetails } from 'wallet/src/features/transactions/types'
-import { ACCOUNT, preloadedSharedState } from 'wallet/src/test/fixtures'
-import { render } from 'wallet/src/test/test-utils'
+  preloadedSharedState,
+} from 'wallet/src/test/fixtures'
+import { renderWithProviders } from 'wallet/src/test/render'
 
 const preloadedState = preloadedSharedState({ account: ACCOUNT })
 const mockTransaction = {
@@ -42,7 +43,7 @@ const mockTransaction = {
   },
 } as TransactionDetails
 
-// Function to set up mocks
+// Helper function to get currency info based on chain ID
 const getCurrencyInfoForChain = (chainId: number): CurrencyInfo => {
   switch (chainId) {
     case 1: // Mainnet
@@ -60,12 +61,13 @@ const getCurrencyInfoForChain = (chainId: number): CurrencyInfo => {
   }
 }
 
+// Mock useCurrencyInfo
 jest.mock('wallet/src/features/tokens/useCurrencyInfo', () => ({
-  useCurrencyInfo: (currencyIdString: string | undefined): Maybe<CurrencyInfo> => {
-    if (!currencyIdString) {
+  useCurrencyInfo: (currencyId: string | undefined): Maybe<CurrencyInfo> => {
+    if (!currencyId) {
       return null
     }
-    const [, chainIdStr] = currencyIdString.split(':')
+    const [, chainIdStr] = currencyId.split(':')
     if (!chainIdStr) {
       return null
     }
@@ -74,11 +76,6 @@ jest.mock('wallet/src/features/tokens/useCurrencyInfo', () => ({
   },
 }))
 
-jest.mock('uniswap/src/features/gating/hooks', () => ({
-  useDynamicConfigValue: jest.fn().mockReturnValue(1000),
-  useFeatureFlag: jest.fn().mockReturnValue(true),
-}))
-
 jest.mock('wallet/src/features/language/localizedDayjs', () => ({
   useFormattedDateTime: jest.fn(() => 'January 1, 2023 12:00 AM'),
   FORMAT_DATE_TIME_MEDIUM: 'MMMM D, YYYY h:mm A',
@@ -93,29 +90,32 @@ describe('TransactionDetails Components', () => {
       menuItems: [],
     }
 
-    const tree = render(
+    const { toJSON } = renderWithProviders(
       <TransactionDetailsHeader transactionActions={transactionActions} transactionDetails={mockTransaction} />,
       { preloadedState },
     )
 
-    expect(tree).toMatchSnapshot()
+    expect(toJSON()).toMatchSnapshot()
   })
 
   it('renders TransactionDetailsContent without error', () => {
     const onClose = jest.fn()
 
-    const tree = render(<TransactionDetailsContent transactionDetails={mockTransaction} onClose={onClose} />, {
-      preloadedState,
-    })
+    const { toJSON } = renderWithProviders(
+      <TransactionDetailsContent transactionDetails={mockTransaction} onClose={onClose} />,
+      {
+        preloadedState,
+      },
+    )
 
-    expect(tree).toMatchSnapshot()
+    expect(toJSON()).toMatchSnapshot()
   })
 
   it('renders TransactionDetailsInfoRows without error', () => {
-    const tree = render(<TransactionDetailsInfoRows transactionDetails={mockTransaction} />, {
+    const { toJSON } = renderWithProviders(<TransactionDetailsInfoRows transactionDetails={mockTransaction} />, {
       preloadedState,
     })
 
-    expect(tree).toMatchSnapshot()
+    expect(toJSON()).toMatchSnapshot()
   })
 })
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.tsx
index c38cadab6f1..bcc5be718c0 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransactionDetailsModal.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
 import { Button, ContextMenu, Flex, Separator, Text, TouchableArea, isWeb } from 'ui/src'
 import { TripleDots, UniswapX } from 'ui/src/components/icons'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { AssetType } from 'wallet/src/entities/assets'
 import { AuthTrigger } from 'wallet/src/features/auth/types'
 import { FORMAT_DATE_TIME_MEDIUM, useFormattedDateTime } from 'wallet/src/features/language/localizedDayjs'
 import { ApproveTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/ApproveTransactionDetails'
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.test.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.test.tsx
deleted file mode 100644
index ed59f766f04..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import {
-  ARBITRUM_DAI_CURRENCY_INFO,
-  BASE_CURRENCY,
-  ETH_CURRENCY_INFO,
-  OPTIMISM_CURRENCY,
-  POLYGON_CURRENCY,
-  currencyInfo,
-} from 'uniswap/src/test/fixtures'
-import { TransferTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails'
-import { SendTokenTransactionInfo, TransactionDetails } from 'wallet/src/features/transactions/types'
-import { ACCOUNT, preloadedSharedState } from 'wallet/src/test/fixtures'
-import { render } from 'wallet/src/test/test-utils'
-
-const preloadedState = preloadedSharedState({ account: ACCOUNT })
-const transferTypeInfo = {
-  type: 'send',
-  assetType: 'currency',
-  recipient: '0xcd20dfedef359abb25e0c6789eb67ffee814caea',
-  tokenAddress: '0x14f6cccfeae34fea11d9a2ca6aabb112e8b8dafe',
-  currencyAmountRaw: '1000000000000000000',
-} as SendTokenTransactionInfo
-const mockTransaction = {
-  id: '9920dbad-ff24-47c8-814a-094566fc45ff',
-  chainId: 81457,
-  routing: 'CLASSIC',
-  from: '0xee814caea14f6cccfeae34fea11d9a2ca6aabb11',
-  typeInfo: transferTypeInfo,
-  status: 'confirmed',
-  addedTime: 1719911758204,
-  options: { request: {} },
-  hash: 'b568a9e9-bbe7-42fc-ab00-5070186c0600',
-  receipt: {
-    transactionIndex: 29529,
-    blockNumber: 17489,
-    blockHash: 'dfd3ad45-78e7-4124-90f2-92758b4499ba',
-    confirmedTime: 1719946653408,
-    confirmations: 57408,
-    gasUsed: 27844,
-    effectiveGasPrice: 2941,
-  },
-} as TransactionDetails
-
-// Function to set up mocks
-const getCurrencyInfoForChain = (chainId: number): CurrencyInfo => {
-  switch (chainId) {
-    case 1: // Mainnet
-      return ETH_CURRENCY_INFO
-    case 42161: // Arbitrum One
-      return ARBITRUM_DAI_CURRENCY_INFO
-    case 8453: // Base
-      return currencyInfo({ nativeCurrency: BASE_CURRENCY })
-    case 10: // Optimism
-      return currencyInfo({ nativeCurrency: OPTIMISM_CURRENCY })
-    case 137: // Polygon
-      return currencyInfo({ nativeCurrency: POLYGON_CURRENCY })
-    default:
-      return ETH_CURRENCY_INFO // fallback to ETH
-  }
-}
-
-jest.mock('uniswap/src/features/gating/hooks', () => ({
-  useDynamicConfigValue: jest.fn().mockReturnValue(1000),
-  useFeatureFlag: jest.fn().mockReturnValue(true),
-}))
-
-jest.mock('wallet/src/features/tokens/useCurrencyInfo', () => ({
-  useCurrencyInfo: (currencyIdString: string | undefined): Maybe<CurrencyInfo> => {
-    if (!currencyIdString) {
-      return null
-    }
-    const [, chainIdStr] = currencyIdString.split(':')
-    if (!chainIdStr) {
-      return null
-    }
-    const chainId = parseInt(chainIdStr, 10)
-    return getCurrencyInfoForChain(chainId)
-  },
-}))
-
-describe('TransferTransactionDetails Component', () => {
-  it('renders TransferTransactionDetails without error', () => {
-    const onClose = jest.fn()
-
-    const tree = render(
-      <TransferTransactionDetails transactionDetails={mockTransaction} typeInfo={transferTypeInfo} onClose={onClose} />,
-      {
-        preloadedState,
-      },
-    )
-
-    expect(tree).toMatchSnapshot()
-  })
-})
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.tsx
index dbf551c44f8..2f7f6d794e3 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/TransferTransactionDetails.tsx
@@ -2,12 +2,12 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import { Flex, Text, TouchableArea, isWeb } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { NftTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/NftTransactionDetails'
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/NftTransactionDetails.test.tsx.snap b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/NftTransactionDetails.test.tsx.snap
deleted file mode 100644
index fd3c4ac432d..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/NftTransactionDetails.test.tsx.snap
+++ /dev/null
@@ -1,128 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NftTransactionDetails Component renders NftTransactionDetails without error 1`] = `
-<View
-  style={
-    {
-      "borderBottomLeftRadius": 20,
-      "borderBottomRightRadius": 20,
-      "borderTopLeftRadius": 20,
-      "borderTopRightRadius": 20,
-      "flexDirection": "column",
-      "overflow": "hidden",
-    }
-  }
->
-  <View
-    cancelable={true}
-    disabled={false}
-    focusable={true}
-    hitSlop={[Function]}
-    minPressDuration={0}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseEnter={[Function]}
-    onMouseLeave={[Function]}
-    onPress={[Function]}
-    onPressIn={[Function]}
-    onPressOut={[Function]}
-    style={
-      {
-        "flexDirection": "column",
-        "opacity": 1,
-        "transform": [
-          {
-            "scale": 1,
-          },
-        ],
-      }
-    }
-  />
-  <View
-    style={
-      {
-        "borderBottomColor": "#2222220D",
-        "borderBottomLeftRadius": 20,
-        "borderBottomRightRadius": 20,
-        "borderBottomWidth": 1,
-        "borderLeftColor": "#2222220D",
-        "borderLeftWidth": 1,
-        "borderRightColor": "#2222220D",
-        "borderRightWidth": 1,
-        "borderStyle": "solid",
-        "borderTopColor": "#2222220D",
-        "borderTopWidth": 0,
-        "flexDirection": "column",
-        "paddingBottom": 12,
-        "paddingLeft": 12,
-        "paddingRight": 12,
-        "paddingTop": 12,
-      }
-    }
-  >
-    <Text
-      allowFontScaling={false}
-      maxFontSizeMultiplier={1.4}
-      style={
-        {
-          "color": "#222222",
-          "fontFamily": "Basel-Book",
-          "fontSize": 16,
-          "lineHeight": 24,
-        }
-      }
-      suppressHighlighting={true}
-    >
-      voluptates repudiandae aliquid
-    </Text>
-    <View
-      disabled={true}
-      hitSlop={
-        {
-          "bottom": 5,
-          "left": 5,
-          "right": 5,
-          "top": 5,
-        }
-      }
-      style={
-        {
-          "flexDirection": "column",
-          "opacity": 1,
-          "transform": [
-            {
-              "scale": 1,
-            },
-          ],
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "flexDirection": "row",
-            "paddingRight": 12,
-          }
-        }
-      >
-        <Text
-          allowFontScaling={false}
-          maxFontSizeMultiplier={1.4}
-          numberOfLines={1}
-          style={
-            {
-              "color": "#7D7D7D",
-              "fontFamily": "Basel-Book",
-              "fontSize": 14,
-              "lineHeight": 20,
-            }
-          }
-          suppressHighlighting={true}
-        >
-          inventore qui fugiat
-        </Text>
-      </View>
-    </View>
-  </View>
-</View>
-`;
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/SwapTransactionDetails.test.tsx.snap b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/SwapTransactionDetails.test.tsx.snap
deleted file mode 100644
index 1eb6efc3b7c..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/SwapTransactionDetails.test.tsx.snap
+++ /dev/null
@@ -1,191 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SwapTransactionDetails Component renders SwapTransactionDetails without error 1`] = `
-<View
-  style={
-    {
-      "flexDirection": "column",
-      "gap": 16,
-      "paddingBottom": 12,
-      "paddingLeft": 8,
-      "paddingRight": 8,
-      "paddingTop": 12,
-    }
-  }
->
-  <View
-    cancelable={true}
-    disabled={false}
-    focusable={true}
-    hitSlop={[Function]}
-    minPressDuration={0}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseEnter={[Function]}
-    onMouseLeave={[Function]}
-    onPress={[Function]}
-    onPressIn={[Function]}
-    onPressOut={[Function]}
-    style={
-      {
-        "flexDirection": "column",
-        "opacity": 1,
-        "transform": [
-          {
-            "scale": 1,
-          },
-        ],
-      }
-    }
-  >
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "justifyContent": "space-between",
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "flexDirection": "column",
-          }
-        }
-      >
-        <Text
-          allowFontScaling={false}
-          maxFontSizeMultiplier={1.2}
-          style={
-            {
-              "color": "#222222",
-              "fontFamily": "Basel-Book",
-              "fontSize": 24,
-              "lineHeight": 32,
-            }
-          }
-          suppressHighlighting={true}
-        >
-          -
-           
-        </Text>
-        <Text
-          allowFontScaling={false}
-          maxFontSizeMultiplier={1.4}
-          style={
-            {
-              "color": "#7D7D7D",
-              "fontFamily": "Basel-Book",
-              "fontSize": 14,
-              "lineHeight": 20,
-            }
-          }
-          suppressHighlighting={true}
-        >
-          -
-        </Text>
-      </View>
-    </View>
-  </View>
-  <View
-    style={
-      {
-        "flexDirection": "column",
-      }
-    }
-  >
-    <svg
-      color="#CECECE"
-      data-file-name="SvgArrowDown"
-      height={20}
-      strokeWidth={2}
-      style={
-        {
-          "transform": [
-            {
-              "rotate": "0deg",
-            },
-          ],
-        }
-      }
-      width={20}
-    />
-  </View>
-  <View
-    cancelable={true}
-    disabled={false}
-    focusable={true}
-    hitSlop={[Function]}
-    minPressDuration={0}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseEnter={[Function]}
-    onMouseLeave={[Function]}
-    onPress={[Function]}
-    onPressIn={[Function]}
-    onPressOut={[Function]}
-    style={
-      {
-        "flexDirection": "column",
-        "opacity": 1,
-        "transform": [
-          {
-            "scale": 1,
-          },
-        ],
-      }
-    }
-  >
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "justifyContent": "space-between",
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "flexDirection": "column",
-          }
-        }
-      >
-        <Text
-          allowFontScaling={false}
-          maxFontSizeMultiplier={1.2}
-          style={
-            {
-              "color": "#222222",
-              "fontFamily": "Basel-Book",
-              "fontSize": 24,
-              "lineHeight": 32,
-            }
-          }
-          suppressHighlighting={true}
-        >
-          -
-           
-        </Text>
-        <Text
-          allowFontScaling={false}
-          maxFontSizeMultiplier={1.4}
-          style={
-            {
-              "color": "#7D7D7D",
-              "fontFamily": "Basel-Book",
-              "fontSize": 14,
-              "lineHeight": 20,
-            }
-          }
-          suppressHighlighting={true}
-        >
-          -
-        </Text>
-      </View>
-    </View>
-  </View>
-</View>
-`;
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/TransferTransactionDetails.test.tsx.snap b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/TransferTransactionDetails.test.tsx.snap
deleted file mode 100644
index edb02c6722f..00000000000
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/__snapshots__/TransferTransactionDetails.test.tsx.snap
+++ /dev/null
@@ -1,86 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TransferTransactionDetails Component renders TransferTransactionDetails without error 1`] = `
-<View
-  cancelable={true}
-  disabled={false}
-  focusable={true}
-  hitSlop={[Function]}
-  minPressDuration={0}
-  onBlur={[Function]}
-  onFocus={[Function]}
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
-  onPress={[Function]}
-  onPressIn={[Function]}
-  onPressOut={[Function]}
-  style={
-    {
-      "flexDirection": "column",
-      "opacity": 1,
-      "transform": [
-        {
-          "scale": 1,
-        },
-      ],
-    }
-  }
->
-  <View
-    style={
-      {
-        "alignItems": "center",
-        "flexDirection": "column",
-        "gap": 8,
-        "justifyContent": "center",
-        "paddingBottom": 32,
-        "paddingLeft": 32,
-        "paddingRight": 32,
-        "paddingTop": 32,
-      }
-    }
-  >
-    <Text
-      allowFontScaling={false}
-      maxFontSizeMultiplier={1.2}
-      style={
-        {
-          "color": "#222222",
-          "fontFamily": "Basel-Book",
-          "fontSize": 36,
-          "lineHeight": 44,
-        }
-      }
-      suppressHighlighting={true}
-    >
-      -
-    </Text>
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "gap": 8,
-          "justifyContent": "center",
-        }
-      }
-    >
-      <Text
-        allowFontScaling={false}
-        maxFontSizeMultiplier={1.4}
-        style={
-          {
-            "color": "#7D7D7D",
-            "fontFamily": "Basel-Book",
-            "fontSize": 16,
-            "lineHeight": 24,
-          }
-        }
-        suppressHighlighting={true}
-      >
-        -
-      </Text>
-    </View>
-  </View>
-</View>
-`;
diff --git a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/useTransactionActions.tsx b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/useTransactionActions.tsx
index c12ebb73654..3d50f765052 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/useTransactionActions.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/DetailsModal/useTransactionActions.tsx
@@ -2,7 +2,6 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import { providers } from 'ethers'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { IconProps, MenuContentItem, getTokenValue, isWeb, useIsDarkMode } from 'ui/src'
 import { CopySheets, HelpCenter } from 'ui/src/components/icons'
 import { UNIVERSE_CHAIN_LOGO } from 'uniswap/src/assets/chainLogos'
@@ -12,7 +11,6 @@ import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { CurrencyId } from 'uniswap/src/types/currency'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { AuthTrigger } from 'wallet/src/features/auth/types'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
@@ -34,6 +32,8 @@ import {
 import { getIsCancelable } from 'wallet/src/features/transactions/utils'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
 import { openMoonpayTransactionLink, openTransactionLink } from 'wallet/src/utils/linking'
 
 export const useTransactionActions = ({
@@ -59,7 +59,7 @@ export const useTransactionActions = ({
 
   const [showActionsModal, setShowActionsModal] = useState(false)
   const [showCancelModal, setShowCancelModal] = useState(false)
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const { status, addedTime, hash, chainId, typeInfo } = transaction
 
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.tsx
index 63b04ad29e0..91800b39633 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.tsx
@@ -1,10 +1,10 @@
 import { createElement } from 'react'
 import { useTranslation } from 'react-i18next'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
@@ -17,7 +17,6 @@ const ZERO_AMOUNT = '0.0'
 export function ApproveSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: ApproveTransactionInfo }
 }): JSX.Element {
@@ -49,6 +48,5 @@ export function ApproveSummaryItem({
       />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.tsx
index f623ecb1e07..90d88b4e73e 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.tsx
@@ -1,12 +1,12 @@
 import React, { createElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useIsDarkMode } from 'ui/src'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { getOptionalServiceProviderLogo } from 'uniswap/src/features/fiatOnRamp/utils'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
@@ -16,7 +16,6 @@ import { FiatPurchaseTransactionInfo, TransactionDetails } from 'wallet/src/feat
 export function FiatPurchaseSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: FiatPurchaseTransactionInfo }
 }): JSX.Element {
@@ -84,6 +83,5 @@ export function FiatPurchaseSummaryItem({
       />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.tsx
index 259eeed0e31..c922722e430 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.tsx
@@ -5,13 +5,11 @@ import { NFTApproveTransactionInfo, TransactionDetails, TransactionType } from '
 export function NFTApproveSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: NFTApproveTransactionInfo }
 }): JSX.Element {
   return (
     <NFTSummaryItem
-      index={index}
       layoutElement={layoutElement}
       transaction={transaction}
       transactionType={TransactionType.NFTApprove}
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.tsx
index 3528e35a2ca..94b43a674e3 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.tsx
@@ -5,16 +5,10 @@ import { NFTMintTransactionInfo, TransactionDetails, TransactionType } from 'wal
 export function NFTMintSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: NFTMintTransactionInfo }
 }): JSX.Element {
   return (
-    <NFTSummaryItem
-      index={index}
-      layoutElement={layoutElement}
-      transaction={transaction}
-      transactionType={TransactionType.NFTMint}
-    />
+    <NFTSummaryItem layoutElement={layoutElement} transaction={transaction} transactionType={TransactionType.NFTMint} />
   )
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTSummaryItem.tsx
index a96d7d79ba0..301cf1a31a9 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTSummaryItem.tsx
@@ -1,6 +1,6 @@
 import { createElement } from 'react'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
 import { TXN_HISTORY_ICON_SIZE } from 'wallet/src/features/transactions/SummaryCards/utils'
 import {
@@ -15,7 +15,6 @@ export function NFTSummaryItem({
   transaction,
   transactionType,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & {
     typeInfo: NFTApproveTransactionInfo | NFTTradeTransactionInfo | NFTMintTransactionInfo
@@ -35,6 +34,5 @@ export function NFTSummaryItem({
       />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.tsx
index 3e7cb4068d1..37fff8104cb 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.tsx
@@ -5,13 +5,11 @@ import { NFTTradeTransactionInfo, TransactionDetails } from 'wallet/src/features
 export function NFTTradeSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: NFTTradeTransactionInfo }
 }): JSX.Element {
   return (
     <NFTSummaryItem
-      index={index}
       layoutElement={layoutElement}
       transaction={transaction}
       transactionType={transaction.typeInfo.type}
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
index 8ad80c9408a..84096fc77eb 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
@@ -1,9 +1,9 @@
 import React, { createElement } from 'react'
 import { useTranslation } from 'react-i18next'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.tsx
index 1a0520597b4..0a740002f37 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.tsx
@@ -9,13 +9,11 @@ import {
 export function ReceiveSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: ReceiveTokenTransactionInfo }
 }): JSX.Element {
   return (
     <TransferTokenSummaryItem
-      index={index}
       layoutElement={layoutElement}
       otherAddress={transaction.typeInfo.sender}
       transaction={transaction}
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.tsx
index acda93df460..eeb666da176 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.tsx
@@ -5,13 +5,11 @@ import { SendTokenTransactionInfo, TransactionDetails, TransactionType } from 'w
 export function SendSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: SendTokenTransactionInfo }
 }): JSX.Element {
   return (
     <TransferTokenSummaryItem
-      index={index}
       layoutElement={layoutElement}
       otherAddress={transaction.typeInfo.recipient}
       transaction={transaction}
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.tsx
index 3e8bd0642be..8d621ae838d 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.tsx
@@ -1,18 +1,18 @@
 import { TradeType } from '@uniswap/sdk-core'
 import { createElement, useMemo } from 'react'
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
+import { getAmountsFromTrade } from 'wallet/src/features/transactions/getAmountsFromTrade'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
 import { TXN_HISTORY_ICON_SIZE } from 'wallet/src/features/transactions/SummaryCards/utils'
-import { getAmountsFromTrade } from 'wallet/src/features/transactions/getAmountsFromTrade'
 import {
   ExactInputSwapTransactionInfo,
   ExactOutputSwapTransactionInfo,
-  TransactionDetails,
   isConfirmedSwapTypeInfo,
+  TransactionDetails,
 } from 'wallet/src/features/transactions/types'
 import { getFormattedCurrencyAmount } from 'wallet/src/utils/currency'
 
@@ -22,7 +22,6 @@ export function SwapSummaryItem({
   transaction,
   layoutElement,
   swapCallbacks,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & {
     typeInfo: ExactOutputSwapTransactionInfo | ExactInputSwapTransactionInfo
@@ -87,6 +86,5 @@ export function SwapSummaryItem({
     ),
     transaction,
     onRetry: swapFormState && shouldShowRetry ? onRetry : undefined,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx
index 9fb1af300ab..336fe8a186b 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx
@@ -1,23 +1,24 @@
 import dayjs from 'dayjs'
 import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { ColorTokens, Flex, Separator, Text, isWeb } from 'ui/src'
 import { ActionSheetModalContent, MenuItemProp } from 'uniswap/src/components/modals/ActionSheetModal'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { CurrencyId } from 'uniswap/src/types/currency'
-import { setClipboard } from 'uniswap/src/utils/clipboard'
-import { openUri } from 'uniswap/src/utils/linking'
-import { logger } from 'utilities/src/logger/logger'
 import { FORMAT_DATE_LONG, useFormattedDate } from 'wallet/src/features/language/localizedDayjs'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { BaseSwapTransactionInfo, TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
-import { openLegacyFiatOnRampServiceProviderLink, openOnRampSupportLink } from 'wallet/src/utils/linking'
+import { useAppDispatch } from 'wallet/src/state'
+import { setClipboard } from 'wallet/src/utils/clipboard'
+import {
+  openLegacyFiatOnRampServiceProviderLink,
+  openOnRampSupportLink,
+  openUniswapHelpLink,
+} from 'wallet/src/utils/linking'
 
 function renderOptionItem(label: string, textColorOverride?: ColorTokens): () => JSX.Element {
   return function OptionItem(): JSX.Element {
@@ -55,7 +56,7 @@ export default function TransactionActionsModal({
   transactionDetails,
 }: TransactionActionModalProps): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const dateString = useFormattedDate(dayjs(msTimestampAdded), FORMAT_DATE_LONG)
 
@@ -203,7 +204,6 @@ export default function TransactionActionsModal({
 }
 
 export async function openSupportLink(transactionDetails: TransactionDetails): Promise<void> {
-  const params = new URLSearchParams()
   switch (transactionDetails.typeInfo.type) {
     case TransactionType.FiatPurchase:
       return openLegacyFiatOnRampServiceProviderLink(transactionDetails.typeInfo.serviceProvider ?? 'MOONPAY')
@@ -211,13 +211,7 @@ export async function openSupportLink(transactionDetails: TransactionDetails): P
     case TransactionType.OnRampTransfer:
       return openOnRampSupportLink(transactionDetails.typeInfo.serviceProvider)
     default:
-      params.append('tf_11041337007757', transactionDetails.ownerAddress ?? '') // Wallet Address
-      params.append('tf_7005922218125', isWeb ? 'uniswap_extension_issue' : 'uw_ios_app') // Report Type Dropdown
-      params.append('tf_13686083567501', 'uw_transaction_details_page_submission') // Issue type Dropdown
-      params.append('tf_9807731675917', transactionDetails.hash ?? 'N/A') // Transaction id
-      return openUri(uniswapUrls.helpRequestUrl + '?' + params.toString()).catch((e) =>
-        logger.error(e, { tags: { file: 'TransactionActionsModal', function: 'getHelpLink' } }),
-      )
+      return openUniswapHelpLink()
   }
 }
 
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx
index b3112c9012d..fb8c1b19b23 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx
@@ -32,7 +32,6 @@ function TransactionSummaryLayout({
   caption,
   postCaptionElement,
   icon,
-  index,
   onRetry,
 }: TransactionSummaryLayoutProps): JSX.Element {
   const { t } = useTranslation()
@@ -101,7 +100,7 @@ function TransactionSummaryLayout({
 
   return (
     <>
-      <TouchableArea mb="$spacing4" overflow="hidden" testID={`activity-list-item-${index ?? 0}`} onPress={onPress}>
+      <TouchableArea mb="$spacing4" overflow="hidden" onPress={onPress}>
         <Flex
           grow
           row
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransferTokenSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransferTokenSummaryItem.tsx
index 30d46a52ab7..13b6e2d709d 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransferTokenSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransferTokenSummaryItem.tsx
@@ -1,13 +1,13 @@
 import { createElement, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Unitag } from 'ui/src/components/icons'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { useUnitagByAddress } from 'uniswap/src/features/unitags/hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { shortenAddress } from 'uniswap/src/utils/addresses'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useENS } from 'wallet/src/features/ens/useENS'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
@@ -26,7 +26,6 @@ export function TransferTokenSummaryItem({
   otherAddress,
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transactionType: TransactionType.Send | TransactionType.Receive
   otherAddress: string
@@ -109,6 +108,5 @@ export function TransferTokenSummaryItem({
     icon,
     transaction,
     postCaptionElement: unitag?.username ? <Unitag size="$icon.24" /> : undefined,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.tsx
index c5549127b06..7d0467d3237 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.tsx
@@ -10,7 +10,6 @@ import { TransactionDetails, UnknownTransactionInfo } from 'wallet/src/features/
 export function UnknownSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: UnknownTransactionInfo }
 }): JSX.Element {
@@ -36,6 +35,5 @@ export function UnknownSummaryItem({
       <ContractInteraction color="$neutral2" fill={colors.surface1.get()} size="$icon.40" />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.tsx
index 301ce9c23e0..8a7d57d990d 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.tsx
@@ -7,7 +7,6 @@ import { TransactionDetails, WCConfirmInfo } from 'wallet/src/features/transacti
 export function WCSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: WCConfirmInfo }
 }): JSX.Element {
@@ -22,6 +21,5 @@ export function WCSummaryItem({
       />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.tsx
index a292cea8034..18d12ca4545 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.tsx
@@ -1,5 +1,5 @@
 import { createElement, useMemo } from 'react'
-import { SplitLogo } from 'uniswap/src/components/CurrencyLogo/SplitLogo'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useNativeCurrencyInfo, useWrappedNativeCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { SummaryItemProps, TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
@@ -10,7 +10,6 @@ import { getFormattedCurrencyAmount } from 'wallet/src/utils/currency'
 export function WrapSummaryItem({
   transaction,
   layoutElement,
-  index,
 }: SummaryItemProps & {
   transaction: TransactionDetails & { typeInfo: WrapTransactionInfo }
 }): JSX.Element {
@@ -50,6 +49,5 @@ export function WrapSummaryItem({
       />
     ),
     transaction,
-    index,
   })
 }
diff --git a/packages/wallet/src/features/transactions/SummaryCards/types.ts b/packages/wallet/src/features/transactions/SummaryCards/types.ts
index a98393ccd22..d143d203ac9 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/types.ts
+++ b/packages/wallet/src/features/transactions/SummaryCards/types.ts
@@ -1,6 +1,6 @@
-import { TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { AuthTrigger } from 'wallet/src/features/auth/types'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { TransactionDetails } from 'wallet/src/features/transactions/types'
 
 export interface TransactionSummaryLayoutProps {
@@ -10,7 +10,6 @@ export interface TransactionSummaryLayoutProps {
   caption: string
   postCaptionElement?: JSX.Element
   icon?: JSX.Element
-  index?: number
   onRetry?: () => void
 }
 
@@ -19,7 +18,6 @@ export interface SummaryItemProps {
   transaction: TransactionDetails
   layoutElement: React.FunctionComponent<TransactionSummaryLayoutProps>
   swapCallbacks?: SwapSummaryCallbacks
-  index?: number
 }
 
 export interface SwapSummaryCallbacks {
diff --git a/packages/wallet/src/features/transactions/SummaryCards/utils.ts b/packages/wallet/src/features/transactions/SummaryCards/utils.ts
index 9773894d8e6..d2dab2d4004 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/utils.ts
+++ b/packages/wallet/src/features/transactions/SummaryCards/utils.ts
@@ -39,23 +39,23 @@ export const TXN_HISTORY_ICON_SIZE = TXN_HISTORY_LOADER_ICON_SIZE
 export const TXN_STATUS_ICON_SIZE = iconSizes.icon16
 
 export type ActivityItem = TransactionDetails | SectionHeader | LoadingItem
-export type ActivityItemRenderer = ({ item, index }: { item: ActivityItem; index: number }) => JSX.Element
+export type ActivityItemRenderer = ({ item }: { item: ActivityItem }) => JSX.Element
 
 export function generateActivityItemRenderer(
   layoutElement: React.FunctionComponent<TransactionSummaryLayoutProps>,
   loadingItem: JSX.Element,
-  sectionHeaderElement: React.FunctionComponent<{ title: string; index?: number }>,
+  sectionHeaderElement: React.FunctionComponent<{ title: string }>,
   swapCallbacks: SwapSummaryCallbacks | undefined,
   authTrigger: ((args: { successCallback: () => void; failureCallback: () => void }) => Promise<void>) | undefined,
 ): ActivityItemRenderer {
-  return function ActivityItemComponent({ item, index }: { item: ActivityItem; index: number }): JSX.Element {
+  return function ActivityItemComponent({ item }: { item: ActivityItem }): JSX.Element {
     // if it's a loading item, render the loading placeholder
     if (isLoadingItem(item)) {
       return loadingItem
     }
     // if it's a section header, render it differently
     if (isSectionHeader(item)) {
-      return createElement(sectionHeaderElement, { title: item.title, key: item.title, index })
+      return createElement(sectionHeaderElement, { title: item.title, key: item.title })
     }
     // item is a transaction
     let SummaryItem
@@ -104,7 +104,6 @@ export function generateActivityItemRenderer(
       transaction: item,
       layoutElement,
       swapCallbacks,
-      index,
     })
   }
 }
diff --git a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx b/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx
index c2f09346012..85eb1e267e1 100644
--- a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx
+++ b/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx
@@ -95,7 +95,7 @@ const portfolioWithReceive = portfolio({
 })
 
 const { resolvers } = queryResolvers({
-  portfolios: (_, { ownerAddresses }) => portfolios.filter((p) => ownerAddresses.includes(p.ownerAddress)),
+  portfolios: () => portfolios,
 })
 
 describe(TransactionHistoryUpdater, () => {
@@ -120,10 +120,7 @@ describe(TransactionHistoryUpdater, () => {
 
   it('updates notification status when there are new transactions', async () => {
     const reduxState = {
-      wallet: {
-        ...walletSlice,
-        activeAccountAddress: account1.address,
-      },
+      wallet: walletSlice,
       notifications: {
         notificationQueue: [],
         notificationStatus: {},
diff --git a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx b/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx
index 23dc8ffb340..b3164076950 100644
--- a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx
+++ b/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx
@@ -2,7 +2,7 @@ import { useApolloClient } from '@apollo/client'
 import dayjs from 'dayjs'
 import { useEffect, useMemo } from 'react'
 import { View } from 'react-native'
-import { batch, useDispatch } from 'react-redux'
+import { batch } from 'react-redux'
 import { PollingInterval } from 'uniswap/src/constants/misc'
 import {
   TransactionHistoryUpdaterQueryResult,
@@ -25,7 +25,7 @@ import { useSelectAddressTransactions } from 'wallet/src/features/transactions/s
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
 import { useAccounts, useActiveAccountAddress, useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 export const GQL_QUERIES_TO_REFETCH_ON_TXN_UPDATE = [
   GQLQueries.PortfolioBalances,
@@ -95,7 +95,7 @@ function AddressTransactionHistoryUpdater({
     >['assetActivities']
   >
 }): JSX.Element | null {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const apolloClient = useApolloClient()
 
   const activeAccountAddress = useAppSelector(selectActiveAccountAddress)
@@ -145,10 +145,15 @@ function AddressTransactionHistoryUpdater({
         }
       })
 
-      if (newTransactionsFound && address === activeAccountAddress) {
+      if (newTransactionsFound) {
         // Fetch full recent txn history and dispatch receive notification if needed.
-        await fetchAndDispatchReceiveNotification(address, lastTxNotificationUpdateTimestamp, hideSpamTokens)
-        await apolloClient.refetchQueries({ include: GQL_QUERIES_TO_REFETCH_ON_TXN_UPDATE })
+        if (address === activeAccountAddress) {
+          await fetchAndDispatchReceiveNotification(address, lastTxNotificationUpdateTimestamp, hideSpamTokens)
+        }
+
+        await apolloClient.refetchQueries({
+          include: GQL_QUERIES_TO_REFETCH_ON_TXN_UPDATE,
+        })
       }
     }).catch(() => undefined)
   }, [
@@ -180,7 +185,7 @@ export function useFetchAndDispatchReceiveNotification(): (
   hideSpamTokens: boolean,
 ) => Promise<void> {
   const [fetchFullTransactionData] = useTransactionListLazyQuery()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   return async (
     address: string,
diff --git a/packages/wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter.tsx b/packages/wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter.tsx
index 6269ddfbc6f..03a504495be 100644
--- a/packages/wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter.tsx
+++ b/packages/wallet/src/features/transactions/TransactionRequest/NetworkFeeFooter.tsx
@@ -5,7 +5,6 @@ import { NetworkLogo } from 'uniswap/src/components/CurrencyLogo/NetworkLogo'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { NumberType } from 'utilities/src/format/types'
 import { isMobileApp } from 'utilities/src/platform'
-import { UniswapXFee } from 'wallet/src/components/network/NetworkFee'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { ContentRow } from 'wallet/src/features/transactions/TransactionRequest/ContentRow'
 
@@ -13,32 +12,21 @@ interface NetworkFeeFooterProps {
   chainId: WalletChainId
   showNetworkLogo: boolean
   gasFeeUSD: string | undefined
-  isUniswapX?: boolean
 }
 
-export function NetworkFeeFooter({
-  chainId,
-  showNetworkLogo,
-  gasFeeUSD,
-  isUniswapX,
-}: NetworkFeeFooterProps): JSX.Element | null {
+export function NetworkFeeFooter({ chainId, showNetworkLogo, gasFeeUSD }: NetworkFeeFooterProps): JSX.Element | null {
   const { t } = useTranslation()
   const { convertFiatAmountFormatted } = useLocalizationContext()
   const variant = isMobileApp ? 'body3' : 'body4'
 
-  const formattedFiat = convertFiatAmountFormatted(gasFeeUSD, NumberType.FiatGasPrice)
   return (
     <Flex px="$spacing8">
       <ContentRow label={t('transaction.networkCost.label')} variant={variant}>
         <Flex centered row gap="$spacing4">
           {showNetworkLogo && <NetworkLogo chainId={chainId} size={iconSizes.icon16} />}
-          {isUniswapX ? (
-            <UniswapXFee gasFee={formattedFiat} />
-          ) : (
-            <Text color="$neutral1" variant={variant}>
-              {formattedFiat}
-            </Text>
-          )}
+          <Text color="$neutral1" variant={variant}>
+            {convertFiatAmountFormatted(gasFeeUSD, NumberType.FiatGasPrice)}
+          </Text>
         </Flex>
       </ContentRow>
     </Flex>
diff --git a/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx b/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx
index d8ac7264c06..e3dfe8a5e39 100644
--- a/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx
+++ b/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx
@@ -10,11 +10,11 @@ import {
   useState,
 } from 'react'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType, TradeableAsset } from 'uniswap/src/entities/assets'
-import { CurrencyField, TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType, TradeableAsset } from 'wallet/src/entities/assets'
 import { useSwapAnalytics } from 'wallet/src/features/transactions/swap/analytics'
 import { useDerivedSwapInfo } from 'wallet/src/features/transactions/swap/trade/hooks/useDerivedSwapInfo'
+import { CurrencyField, TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 
 export type SwapFormState = {
   customSlippageTolerance?: number
diff --git a/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx b/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx
index 089a2104890..a5956678856 100644
--- a/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx
+++ b/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx
@@ -3,8 +3,8 @@ import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import {
   SwapTxAndGasInfo,
-  useSwapTxAndGasInfo,
-} from 'wallet/src/features/transactions/swap/trade/api/hooks/useSwapTxAndGasInfo'
+  useSwapTxAndGasInfoTradingApi,
+} from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useSwapTxAndGasInfoTradingApi'
 import { isClassic, isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 
 export type ValidatedSwapTxContext = Required<SwapTxAndGasInfo> & {
@@ -47,7 +47,7 @@ export const SwapTxContext = createContext<SwapTxAndGasInfo | undefined>(undefin
 
 export function SwapTxContextProviderTradingApi({ children }: PropsWithChildren): JSX.Element {
   const { derivedSwapInfo } = useSwapFormContext()
-  const swapTxContext = useSwapTxAndGasInfo({ derivedSwapInfo })
+  const swapTxContext = useSwapTxAndGasInfoTradingApi({ derivedSwapInfo })
 
   return <SwapTxContext.Provider value={swapTxContext}>{children}</SwapTxContext.Provider>
 }
diff --git a/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts b/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts
index c08758a8637..79e82606808 100644
--- a/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts
+++ b/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts
@@ -1,6 +1,5 @@
 /* eslint-disable max-lines */
 import { getNativeAddress, getWrappedNativeAddress } from 'uniswap/src/constants/addresses'
-import { DAI } from 'uniswap/src/constants/tokens'
 import {
   Chain,
   Currency,
@@ -11,6 +10,7 @@ import {
   TransactionStatus,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { DAI } from 'wallet/src/constants/tokens'
 import { extractOnRampTransactionDetails } from 'wallet/src/features/transactions/history/conversion/extractFiatOnRampTransactionDetails'
 import extractTransactionDetails from 'wallet/src/features/transactions/history/conversion/extractTransactionDetails'
 import parseApproveTransaction from 'wallet/src/features/transactions/history/conversion/parseApproveTransaction'
@@ -19,7 +19,11 @@ import parseOnRampTransaction from 'wallet/src/features/transactions/history/con
 import parseReceiveTransaction from 'wallet/src/features/transactions/history/conversion/parseReceiveTransaction'
 import parseSendTransaction from 'wallet/src/features/transactions/history/conversion/parseSendTransaction'
 import parseTradeTransaction from 'wallet/src/features/transactions/history/conversion/parseTradeTransaction'
-import { NFTTradeType, TransactionListQueryResponse, TransactionType } from 'wallet/src/features/transactions/types'
+import {
+  NFTTradeType,
+  TransactionListQueryResponse,
+  TransactionType,
+} from 'wallet/src/features/transactions/types'
 import { SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2 } from 'wallet/src/test/fixtures'
 
 /**
diff --git a/packages/wallet/src/features/transactions/history/conversion/extractMoonpayTransactionDetails.ts b/packages/wallet/src/features/transactions/history/conversion/extractMoonpayTransactionDetails.ts
new file mode 100644
index 00000000000..7d8dd214612
--- /dev/null
+++ b/packages/wallet/src/features/transactions/history/conversion/extractMoonpayTransactionDetails.ts
@@ -0,0 +1,130 @@
+import { getNativeAddress } from 'uniswap/src/constants/addresses'
+import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { logger } from 'utilities/src/logger/logger'
+import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { FiatOnRampTransactionDetails, MoonpayTransactionsResponse } from 'wallet/src/features/fiatOnRamp/types'
+import { FiatPurchaseTransactionInfo, TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
+
+const MOONPAY_ETH_CONTRACT_ADDRESS = '0x0000000000000000000000000000000000000000'
+
+function parseFiatPurchaseTransaction(
+  transaction: Partial<MoonpayTransactionsResponse[0]>,
+): FiatPurchaseTransactionInfo & { chainId: WalletChainId } {
+  const {
+    currency: outputCurrency,
+    baseCurrencyAmount: inputCurrencyAmount,
+    baseCurrency: inputCurrency,
+    quoteCurrencyAmount: outputCurrencyAmount,
+  } = transaction
+
+  if (!outputCurrency) {
+    throw new Error('Expected output currency to be defined.')
+  }
+  if (!inputCurrency) {
+    throw new Error('Expected input currency to be defined.')
+  }
+  if (!inputCurrencyAmount) {
+    throw new Error('Expected inputCurrencyAmount to be defined')
+  }
+  if (outputCurrency.type !== 'crypto') {
+    throw new Error('Expected output currency to be crypto but received ' + outputCurrency.type)
+  }
+
+  const moonpayChainId = outputCurrency.metadata?.chainId
+  const chainId = toSupportedChainId(moonpayChainId ?? undefined)
+  if (!chainId || !moonpayChainId) {
+    throw new Error('Unable to parse chain id' + outputCurrency.metadata?.chainId)
+  }
+
+  const outputTokenAddress =
+    outputCurrency.metadata?.contractAddress === MOONPAY_ETH_CONTRACT_ADDRESS
+      ? getNativeAddress(chainId)
+      : outputCurrency.metadata?.contractAddress
+  if (!outputTokenAddress) {
+    throw new Error('Expected output currency address to be defined')
+  }
+
+  return {
+    type: TransactionType.FiatPurchase,
+    id: transaction.id,
+    explorerUrl: formatReturnUrl(transaction.returnUrl, transaction.id), // Moonpay's transaction tracker page
+    inputCurrency: { type: inputCurrency.type, code: inputCurrency.code },
+    inputCurrencyAmount,
+    outputCurrency: {
+      type: outputCurrency.type,
+      metadata: { chainId: moonpayChainId, contractAddress: outputTokenAddress },
+    },
+    outputCurrencyAmount,
+    // mark this local tx as synced given we updated it with server information
+    // this marks the tx as 'valid' / ready to display in the ui
+    syncedWithBackend: true,
+    chainId,
+  }
+}
+
+function moonpayStatusToTransactionInfoStatus(status: MoonpayTransactionsResponse[0]['status']): TransactionStatus {
+  switch (status) {
+    case 'failed':
+      return TransactionStatus.Failed
+    case 'pending':
+    case 'waitingAuthorization':
+    case 'waitingPayment':
+      return TransactionStatus.Pending
+    case 'completed':
+      // completed fiat onramp transactions show up in on-chain history
+      return TransactionStatus.Success
+  }
+}
+
+// MoonPay does not always (ever?) return the transaction id inside `returnUrl`
+//  returnUrl": "https://buy-sandbox.moonpay.com/transaction_receipt
+// This adds `transactionId` param if required
+function formatReturnUrl(providedReturnUrl: string | undefined, id: string | undefined): string | undefined {
+  if (!providedReturnUrl || !id) {
+    return
+  }
+
+  if (providedReturnUrl.includes('?transactionId=')) {
+    return providedReturnUrl
+  }
+
+  // TODO: [MOB-233] improve formatting when MoonPay provides us with more info
+  return `${providedReturnUrl}?transactionId=${id}`
+}
+
+export function extractMoonpayTransactionDetails(
+  transaction?: MoonpayTransactionsResponse[0],
+): FiatOnRampTransactionDetails | undefined {
+  if (!transaction) {
+    return
+  }
+
+  // given that the `transaction` object is the raw Moonpay response,
+  // we wrap the extract block in a try-catch and log to Sentry
+  try {
+    const { chainId, ...typeInfo } = parseFiatPurchaseTransaction(transaction) ?? {
+      type: TransactionType.Unknown,
+    }
+
+    return {
+      routing: Routing.CLASSIC,
+      id: transaction.externalTransactionId,
+      chainId,
+      hash: transaction.cryptoTransactionId,
+      addedTime: new Date(transaction.createdAt).getTime(),
+      status: moonpayStatusToTransactionInfoStatus(transaction.status),
+      from: transaction.walletAddress,
+      typeInfo,
+      options: { request: {} },
+    }
+  } catch (error) {
+    logger.error(error, {
+      tags: {
+        file: 'extractFiatPurchaseTransactionDetails',
+        function: 'extractFiatOnRampTransactionDetails',
+      },
+    })
+    return
+  }
+}
diff --git a/packages/wallet/src/features/transactions/history/conversion/parseReceiveTransaction.ts b/packages/wallet/src/features/transactions/history/conversion/parseReceiveTransaction.ts
index 16b55aaf720..09d5d8fb9c6 100644
--- a/packages/wallet/src/features/transactions/history/conversion/parseReceiveTransaction.ts
+++ b/packages/wallet/src/features/transactions/history/conversion/parseReceiveTransaction.ts
@@ -1,7 +1,7 @@
-import { AssetType } from 'uniswap/src/entities/assets'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { areAddressesEqual } from 'uniswap/src/utils/addresses'
 import { SpamCode } from 'wallet/src/data/types'
+import { AssetType } from 'wallet/src/entities/assets'
 import {
   deriveCurrencyAmountFromAssetResponse,
   getAddressFromAsset,
diff --git a/packages/wallet/src/features/transactions/history/conversion/parseSendTransaction.ts b/packages/wallet/src/features/transactions/history/conversion/parseSendTransaction.ts
index 59a721e18eb..2aa21119271 100644
--- a/packages/wallet/src/features/transactions/history/conversion/parseSendTransaction.ts
+++ b/packages/wallet/src/features/transactions/history/conversion/parseSendTransaction.ts
@@ -1,5 +1,5 @@
-import { AssetType } from 'uniswap/src/entities/assets'
 import { SpamCode } from 'wallet/src/data/types'
+import { AssetType } from 'wallet/src/entities/assets'
 import {
   deriveCurrencyAmountFromAssetResponse,
   getAddressFromAsset,
diff --git a/packages/wallet/src/features/transactions/history/utils.ts b/packages/wallet/src/features/transactions/history/utils.ts
index a1ef1602be3..f8f9e6993c9 100644
--- a/packages/wallet/src/features/transactions/history/utils.ts
+++ b/packages/wallet/src/features/transactions/history/utils.ts
@@ -12,11 +12,11 @@ import {
   TransactionListQuery,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { CurrencyIdToVisibility } from 'wallet/src/features/favorites/slice'
 import { FORMAT_DATE_MONTH, FORMAT_DATE_MONTH_YEAR, LocalizedDayjs } from 'wallet/src/features/language/localizedDayjs'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { extractOnRampTransactionDetails } from 'wallet/src/features/transactions/history/conversion/extractFiatOnRampTransactionDetails'
 import extractTransactionDetails from 'wallet/src/features/transactions/history/conversion/extractTransactionDetails'
 import { extractUniswapXOrderDetails } from 'wallet/src/features/transactions/history/conversion/extractUniswapXOrderDetails'
diff --git a/packages/wallet/src/features/transactions/hooks.ts b/packages/wallet/src/features/transactions/hooks.ts
index 5abb149bdb7..14dcd42fa99 100644
--- a/packages/wallet/src/features/transactions/hooks.ts
+++ b/packages/wallet/src/features/transactions/hooks.ts
@@ -1,8 +1,6 @@
 import { Currency } from '@uniswap/sdk-core'
 import { BigNumberish } from 'ethers'
 import { useMemo } from 'react'
-import { useDispatch } from 'react-redux'
-import { TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { ensureLeading0x } from 'uniswap/src/utils/addresses'
 import { areCurrencyIdsEqual, buildCurrencyId } from 'uniswap/src/utils/currencyId'
@@ -14,6 +12,7 @@ import {
   createWrapFormFromTxDetails,
 } from 'wallet/src/features/transactions/swap/createSwapFormFromTxDetails'
 import { isClassic, isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
+import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import {
   QueuedOrderStatus,
   TransactionDetails,
@@ -23,7 +22,7 @@ import {
   isFinalizedTx,
 } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 type HashToTxMap = Map<string, TransactionDetails>
 
@@ -159,7 +158,7 @@ export function useMergeLocalAndRemoteTransactions(
   address: Address,
   remoteTransactions: TransactionDetails[] | undefined,
 ): TransactionDetails[] | undefined {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const localTransactions = useSelectAddressTransactions(address)
 
   // Merge local and remote txs into one array and reconcile data discrepancies
diff --git a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts b/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts
index 80e4725018f..81a7a0aa7da 100644
--- a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts
+++ b/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts
@@ -1,16 +1,21 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
-import { DAI, USDC } from 'uniswap/src/constants/tokens'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import i18n from 'uniswap/src/i18n/i18n'
-import { daiCurrencyInfo, ethCurrencyInfo } from 'uniswap/src/test/fixtures'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { DAI, USDC } from 'wallet/src/constants/tokens'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
 import { getSwapWarnings } from 'wallet/src/features/transactions/hooks/useSwapWarnings'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { isOffline } from 'wallet/src/features/transactions/utils'
-import { networkDown, networkUnknown, networkUp } from 'wallet/src/test/fixtures'
+import {
+  daiCurrencyInfo,
+  ethCurrencyInfo,
+  networkDown,
+  networkUnknown,
+  networkUp,
+} from 'wallet/src/test/fixtures'
 import { mockLocalizedFormatter } from 'wallet/src/test/mocks'
 
 const ETH = NativeCurrency.onChain(UniverseChainId.Mainnet)
@@ -105,7 +110,12 @@ describe(getSwapWarnings, () => {
   })
 
   it('catches insufficient balance errors', () => {
-    const warnings = getSwapWarnings(i18n.t, formatPercent, insufficientBalanceState, isOffline(networkUp()))
+    const warnings = getSwapWarnings(
+      i18n.t,
+      formatPercent,
+      insufficientBalanceState,
+      isOffline(networkUp())
+    )
     expect(warnings.length).toBe(1)
     expect(warnings[0]?.type).toEqual(WarningLabel.InsufficientFunds)
   })
@@ -123,7 +133,7 @@ describe(getSwapWarnings, () => {
       i18n.t,
       formatPercent,
       incompleteAndInsufficientBalanceState,
-      isOffline(networkUp()),
+      isOffline(networkUp())
     )
     expect(warnings.length).toBe(2)
   })
@@ -134,12 +144,22 @@ describe(getSwapWarnings, () => {
   })
 
   it('errors if there is no internet', () => {
-    const warnings = getSwapWarnings(i18n.t, formatPercent, tradeErrorState, isOffline(networkDown()))
+    const warnings = getSwapWarnings(
+      i18n.t,
+      formatPercent,
+      tradeErrorState,
+      isOffline(networkDown())
+    )
     expect(warnings.find((warning) => warning.type === WarningLabel.NetworkError)).toBeTruthy()
   })
 
   it('does not error when network state is unknown', () => {
-    const warnings = getSwapWarnings(i18n.t, formatPercent, tradeErrorState, isOffline(networkUnknown()))
+    const warnings = getSwapWarnings(
+      i18n.t,
+      formatPercent,
+      tradeErrorState,
+      isOffline(networkUnknown())
+    )
     expect(warnings.find((warning) => warning.type === WarningLabel.NetworkError)).toBeFalsy()
   })
 })
diff --git a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx b/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx
index d74e34c7b55..7e5eead551c 100644
--- a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx
+++ b/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx
@@ -4,7 +4,6 @@ import { TFunction } from 'i18next'
 import _ from 'lodash'
 import { useTranslation } from 'react-i18next'
 import { isWeb } from 'ui/src'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { normalizePriceImpact } from 'utilities/src/format/normalizePriceImpact'
 import { useMemoCompare } from 'utilities/src/react/hooks'
 import { LocalizationContextState, useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
@@ -19,8 +18,9 @@ import {
   API_RATE_LIMIT_ERROR,
   NO_QUOTE_DATA,
   SWAP_QUOTE_ERROR,
-} from 'wallet/src/features/transactions/swap/trade/api/hooks/useTrade'
+} from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { isOffline } from 'wallet/src/features/transactions/utils'
 
 const PRICE_IMPACT_THRESHOLD_MEDIUM = new Percent(3, 100) // 3%
diff --git a/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts b/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts
index e58e31579e4..c31924dcb57 100644
--- a/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts
+++ b/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts
@@ -1,7 +1,7 @@
 import { AnyAction } from '@reduxjs/toolkit'
 import { useCallback } from 'react'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 /** Set of handlers wrapping actions involving user input */
 export function useTokenFormActionHandlers(dispatch: React.Dispatch<AnyAction>): {
diff --git a/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts b/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts
index ce1a4158995..75e3c7290ce 100644
--- a/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts
+++ b/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts
@@ -1,15 +1,15 @@
 import { AnyAction } from '@reduxjs/toolkit'
 import { Currency } from '@uniswap/sdk-core'
 import { useCallback } from 'react'
-import { AssetType } from 'uniswap/src/entities/assets'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { currencyAddress } from 'uniswap/src/utils/currencyId'
 import { flowToModalName } from 'wallet/src/components/TokenSelector/flowToModalName'
+import { AssetType } from 'wallet/src/entities/assets'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 
 export function useTokenSelectorActionHandlers(
   dispatch: React.Dispatch<AnyAction>,
diff --git a/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx b/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx
index f7717c95368..aaa1eb208db 100644
--- a/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx
+++ b/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx
@@ -2,17 +2,17 @@ import { CurrencyAmount, NativeCurrency } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { isWeb } from 'ui/src'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { useOnChainNativeCurrencyBalance } from 'wallet/src/features/portfolio/api'
+import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
+import { hasSufficientFundsIncludingGas } from 'wallet/src/features/transactions/utils'
 import {
   Warning,
   WarningAction,
   WarningLabel,
   WarningSeverity,
 } from 'wallet/src/features/transactions/WarningModal/types'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
-import { hasSufficientFundsIncludingGas } from 'wallet/src/features/transactions/utils'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
 export function useTransactionGasWarning({
diff --git a/packages/wallet/src/features/transactions/orderWatcherSaga.ts b/packages/wallet/src/features/transactions/orderWatcherSaga.ts
index bb7a34ce241..332ee2a4062 100644
--- a/packages/wallet/src/features/transactions/orderWatcherSaga.ts
+++ b/packages/wallet/src/features/transactions/orderWatcherSaga.ts
@@ -6,8 +6,8 @@ import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { GetOrdersResponse } from 'wallet/src/data/tradingApi/__generated__/index'
 import { makeSelectUniswapXOrder } from 'wallet/src/features/transactions/selectors'
 import { updateTransaction } from 'wallet/src/features/transactions/slice'
-import { TRADING_API_HEADERS } from 'wallet/src/features/transactions/swap/trade/api/client'
-import { ORDER_STATUS_TO_TX_STATUS } from 'wallet/src/features/transactions/swap/trade/api/utils'
+import { TRADING_API_HEADERS } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
+import { ORDER_STATUS_TO_TX_STATUS } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import {
   QueuedOrderStatus,
diff --git a/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts b/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
index 0e82775e53f..a68f4664d25 100644
--- a/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
+++ b/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
@@ -1,5 +1,5 @@
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client'
-import { call, delay, select } from 'typed-redux-saga'
+import { call, delay } from 'typed-redux-saga'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
 import {
   PortfolioBalancesDocument,
@@ -12,7 +12,6 @@ import { CurrencyId } from 'uniswap/src/types/currency'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { GQL_QUERIES_TO_REFETCH_ON_TXN_UPDATE } from 'wallet/src/features/transactions/TransactionHistoryUpdater'
 import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
-import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { buildCurrencyId, buildNativeCurrencyId, buildWrappedNativeCurrencyId } from 'wallet/src/utils/currencyId'
 
 type CurrencyIdToBalance = Record<CurrencyId, number>
@@ -35,13 +34,7 @@ export function* refetchGQLQueries({
     apolloClient,
   })
 
-  const activeAddress = yield* select(selectActiveAccountAddress)
-  if (owner !== activeAddress) {
-    // We can ignore if the transaction does not belong to the active account.
-    return
-  }
-
-  // when there is a new local tx wait REFETCH_INTERVAL then proactively refresh portfolio and activity queries
+  // when there is a new local tx wait 1s then proactively refresh portfolio and activity queries
   yield* delay(REFETCH_INTERVAL)
 
   yield* call([apolloClient, apolloClient.refetchQueries], {
@@ -53,7 +46,7 @@ export function* refetchGQLQueries({
   }
 
   let freshnessLag = REFETCH_INTERVAL
-  // poll every REFETCH_INTERVAL until the cache has updated balances for the relevant currencies
+  // poll every second until the cache has updated balances for the relevant currencies
   for (let i = 0; i < MAX_REFETCH_ATTEMPTS; i += 1) {
     const currencyIdToUpdatedBalance = readBalancesFromCache({
       owner,
@@ -67,13 +60,6 @@ export function* refetchGQLQueries({
 
     yield* delay(REFETCH_INTERVAL)
 
-    const currentActiveAddress = yield* select(selectActiveAccountAddress)
-    if (owner !== currentActiveAddress) {
-      // We stop polling if the user has switched accounts.
-      // A call to `refetchQueries` wouldn't be useful in this case because no query with the transaction's owner is currently being watched.
-      break
-    }
-
     yield* call([apolloClient, apolloClient.refetchQueries], {
       include: GQL_QUERIES_TO_REFETCH_ON_TXN_UPDATE,
     })
diff --git a/packages/wallet/src/features/transactions/replaceTransactionSaga.test.ts b/packages/wallet/src/features/transactions/replaceTransactionSaga.test.ts
index e6c8a0a5d25..40a67eb91a4 100644
--- a/packages/wallet/src/features/transactions/replaceTransactionSaga.test.ts
+++ b/packages/wallet/src/features/transactions/replaceTransactionSaga.test.ts
@@ -6,13 +6,25 @@ import { expectSaga } from 'redux-saga-test-plan'
 import { call } from 'redux-saga/effects'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
 import { attemptReplaceTransaction } from 'wallet/src/features/transactions/replaceTransactionSaga'
-import { sendTransaction, signAndSendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
+import {
+  sendTransaction,
+  signAndSendTransaction,
+} from 'wallet/src/features/transactions/sendTransactionSaga'
 import { addTransaction } from 'wallet/src/features/transactions/slice'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
 import * as TxnUtils from 'wallet/src/features/transactions/utils'
-import { getProvider, getProviderManager, getSignerManager } from 'wallet/src/features/wallet/context'
+import {
+  getProvider,
+  getProviderManager,
+  getSignerManager,
+} from 'wallet/src/features/wallet/context'
 import { selectAccounts } from 'wallet/src/features/wallet/selectors'
-import { ACCOUNT, ethersTransactionRequest, getTxFixtures, transactionDetails } from 'wallet/src/test/fixtures'
+import {
+  ACCOUNT,
+  ethersTransactionRequest,
+  getTxFixtures,
+  transactionDetails,
+} from 'wallet/src/test/fixtures'
 import { provider, providerManager, signerManager } from 'wallet/src/test/mocks'
 
 const NEW_UNIQUE_ID = faker.datatype.uuid()
@@ -71,7 +83,7 @@ describe(sendTransaction, () => {
             transaction.options.request,
             ACCOUNT,
             provider as providers.Provider,
-            signerManager,
+            signerManager
           ),
           { transactionResponse: txResponse, populatedRequest: txRequest },
         ],
@@ -102,7 +114,7 @@ describe(sendTransaction, () => {
               maxFeePerGas: undefined,
             },
           },
-        }),
+        })
       )
       .silentRun()
   })
diff --git a/packages/wallet/src/features/transactions/sendTransactionSaga.test.ts b/packages/wallet/src/features/transactions/sendTransactionSaga.test.ts
index 7b580debea3..b03225d0b2d 100644
--- a/packages/wallet/src/features/transactions/sendTransactionSaga.test.ts
+++ b/packages/wallet/src/features/transactions/sendTransactionSaga.test.ts
@@ -4,11 +4,18 @@ import { expectSaga } from 'redux-saga-test-plan'
 import { call } from 'redux-saga/effects'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
-import { sendTransaction, signAndSendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
+import {
+  sendTransaction,
+  signAndSendTransaction,
+} from 'wallet/src/features/transactions/sendTransactionSaga'
 import { addTransaction } from 'wallet/src/features/transactions/slice'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
 import { AccountType, ReadOnlyAccount } from 'wallet/src/features/wallet/accounts/types'
-import { getProvider, getProviderManager, getSignerManager } from 'wallet/src/features/wallet/context'
+import {
+  getProvider,
+  getProviderManager,
+  getSignerManager,
+} from 'wallet/src/features/wallet/context'
 import { getTxFixtures, signerMnemonicAccount } from 'wallet/src/test/fixtures'
 import { noOpFunction, provider, providerManager, signerManager } from 'wallet/src/test/mocks'
 
@@ -45,7 +52,13 @@ describe(sendTransaction, () => {
         [call(getProviderManager), providerManager],
         [call(getSignerManager), signerManager],
         [
-          call(signAndSendTransaction, txRequest, account, provider as providers.Provider, signerManager),
+          call(
+            signAndSendTransaction,
+            txRequest,
+            account,
+            provider as providers.Provider,
+            signerManager
+          ),
           { transactionResponse: txResponse, populatedRequest: txRequest },
         ],
       ])
@@ -74,7 +87,7 @@ describe(sendTransaction, () => {
               maxFeePerGas: undefined,
             },
           },
-        }),
+        })
       )
       .silentRun()
   })
@@ -91,6 +104,8 @@ describe(sendTransaction, () => {
       ...sendParams,
       account: readOnlyAccount,
     }
-    return expectSaga(sendTransaction, params).throws(new Error('Account must support signing')).silentRun()
+    return expectSaga(sendTransaction, params)
+      .throws(new Error('Account must support signing'))
+      .silentRun()
   })
 })
diff --git a/packages/wallet/src/features/transactions/slice.test.ts b/packages/wallet/src/features/transactions/slice.test.ts
index c9eaf9d7696..58b994d8a8d 100644
--- a/packages/wallet/src/features/transactions/slice.test.ts
+++ b/packages/wallet/src/features/transactions/slice.test.ts
@@ -59,7 +59,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
       const txs = store.getState()[address]
       expect(txs?.[UniverseChainId.Mainnet]).toBeTruthy()
@@ -90,7 +90,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
 
       try {
@@ -105,7 +105,7 @@ describe('transaction reducer', () => {
             typeInfo: approveTxTypeInfo,
             status: TransactionStatus.Pending,
             addedTime: Date.now(),
-          }),
+          })
         )
       } catch (error) {
         expect(error).toEqual(Error(`addTransaction: Attempted to overwrite tx with id ${id}`))
@@ -129,10 +129,12 @@ describe('transaction reducer', () => {
             typeInfo: approveTxTypeInfo,
             status: TransactionStatus.Pending,
             addedTime: Date.now(),
-          }),
+          })
         )
       } catch (error) {
-        expect(error).toEqual(Error(`updateTransaction: Attempted to update a missing tx with id ${id}`))
+        expect(error).toEqual(
+          Error(`updateTransaction: Attempted to update a missing tx with id ${id}`)
+        )
       }
       expect(store.getState()).toEqual({})
     })
@@ -165,7 +167,9 @@ describe('transaction reducer', () => {
         store.dispatch(finalizeTransaction(finalizedTxAction.payload))
       } catch (error) {
         expect(error).toEqual(
-          Error(`finalizeTransaction: Attempted to finalize a missing tx with id ${finalizedTxAction.payload.id}`),
+          Error(
+            `finalizeTransaction: Attempted to finalize a missing tx with id ${finalizedTxAction.payload.id}`
+          )
         )
       }
       expect(store.getState()).toEqual({})
@@ -184,7 +188,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
       store.dispatch(finalizeTransaction(finalizedTxAction.payload))
       const tx = store.getState()[from]?.[chainId]?.[id]
@@ -202,10 +206,12 @@ describe('transaction reducer', () => {
             chainId: UniverseChainId.Goerli,
             cancelRequest: {},
             id,
-          }),
+          })
         )
       } catch (error) {
-        expect(error).toEqual(Error(`cancelTransaction: Attempted to cancel a tx that doesn't exist with id ${id}`))
+        expect(error).toEqual(
+          Error(`cancelTransaction: Attempted to cancel a tx that doesn't exist with id ${id}`)
+        )
       }
       expect(store.getState()).toEqual({})
     })
@@ -225,7 +231,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
       store.dispatch(cancelTransaction({ chainId, id, address, cancelRequest: {} }))
       const tx = store.getState()[address]?.[chainId]?.[id]
@@ -245,10 +251,12 @@ describe('transaction reducer', () => {
             chainId: UniverseChainId.Goerli,
             id,
             newTxParams,
-          }),
+          })
         )
       } catch (error) {
-        expect(error).toEqual(Error(`replaceTransaction: Attempted to replace a tx that doesn't exist with id ${id}`))
+        expect(error).toEqual(
+          Error(`replaceTransaction: Attempted to replace a tx that doesn't exist with id ${id}`)
+        )
       }
       expect(store.getState()).toEqual({})
     })
@@ -292,7 +300,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
       store.dispatch(
         addTransaction({
@@ -305,7 +313,7 @@ describe('transaction reducer', () => {
           typeInfo: approveTxTypeInfo,
           status: TransactionStatus.Pending,
           addedTime: Date.now(),
-        }),
+        })
       )
       const txs = store.getState()
       expect(Object.keys(txs)).toHaveLength(2)
diff --git a/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx b/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx
index 2ea4c74f097..3e26a7ec620 100644
--- a/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx
+++ b/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx
@@ -7,7 +7,6 @@ import { Flex, FlexProps, Text, TouchableArea, isWeb, useIsShortMobileDevice, us
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { fonts } from 'ui/src/theme'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { isDetoxBuild } from 'utilities/src/environment/constants'
 import { NumberType } from 'utilities/src/format/types'
@@ -18,6 +17,7 @@ import { MaxAmountButton } from 'wallet/src/components/input/MaxAmountButton'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useTokenAndFiatDisplayAmounts } from 'wallet/src/features/transactions/hooks/useTokenAndFiatDisplayAmounts'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { MAX_FIAT_INPUT_DECIMALS } from 'wallet/src/features/transactions/utils'
 import { errorShakeAnimation } from 'wallet/src/utils/animations'
 import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
@@ -184,7 +184,6 @@ export const CurrencyInputPanel = memo(
 
     const loadingFlexProgress = useSharedValue(1)
 
-    // disables looping animation during detox e2e tests which was preventing js thread from idle
     if (!isDetoxBuild) {
       loadingFlexProgress.value = withRepeat(
         withSequence(
diff --git a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.native.tsx b/packages/wallet/src/features/transactions/swap/GasAndWarningRows.native.tsx
index fb663538348..087391a924a 100644
--- a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.native.tsx
+++ b/packages/wallet/src/features/transactions/swap/GasAndWarningRows.native.tsx
@@ -6,7 +6,6 @@ import { Flex, Text, TouchableArea, useIsShortMobileDevice, useMedia } from 'ui/
 import { Gas } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { iconSizes } from 'ui/src/theme'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { NumberType } from 'utilities/src/format/types'
 import { UniswapXFee } from 'wallet/src/components/network/NetworkFee'
 import { useUSDValue } from 'wallet/src/features/gas/hooks'
@@ -21,6 +20,7 @@ import { useGasFeeHighRelativeToValue } from 'wallet/src/features/transactions/s
 import { NetworkFeeWarning } from 'wallet/src/features/transactions/swap/modals/NetworkFeeWarning'
 import { UniswapXInfo } from 'wallet/src/features/transactions/swap/modals/UniswapXInfo'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
 
diff --git a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.web.tsx b/packages/wallet/src/features/transactions/swap/GasAndWarningRows.web.tsx
index 20d5ba83e46..24d8c1e3057 100644
--- a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.web.tsx
+++ b/packages/wallet/src/features/transactions/swap/GasAndWarningRows.web.tsx
@@ -6,7 +6,6 @@ import { Flex, Text, TouchableArea } from 'ui/src'
 import { Gas } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { iconSizes } from 'ui/src/theme'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { normalizePriceImpact } from 'utilities/src/format/normalizePriceImpact'
 import { NumberType } from 'utilities/src/format/types'
 import { UniswapXFee } from 'wallet/src/components/network/NetworkFee'
@@ -24,6 +23,7 @@ import { NetworkFeeWarning } from 'wallet/src/features/transactions/swap/modals/
 import { PriceImpactWarning } from 'wallet/src/features/transactions/swap/modals/PriceImpactWarning'
 import { UniswapXInfo } from 'wallet/src/features/transactions/swap/modals/UniswapXInfo'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
 
diff --git a/packages/wallet/src/features/transactions/swap/SwapDetails.tsx b/packages/wallet/src/features/transactions/swap/SwapDetails.tsx
index e701d52aa78..b20598e7048 100644
--- a/packages/wallet/src/features/transactions/swap/SwapDetails.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapDetails.tsx
@@ -6,7 +6,6 @@ import { InfoCircleFilled } from 'ui/src/components/icons'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
 import { NumberType } from 'utilities/src/format/types'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
@@ -18,6 +17,7 @@ import { SwapRateRatio } from 'wallet/src/features/transactions/swap/SwapRateRat
 import { Trade } from 'wallet/src/features/transactions/swap/trade/types'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { getFormattedCurrencyAmount } from 'wallet/src/utils/currency'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
diff --git a/packages/wallet/src/features/transactions/swap/SwapFlow.tsx b/packages/wallet/src/features/transactions/swap/SwapFlow.tsx
index 052778a47d8..d441f8e69cf 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFlow.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapFlow.tsx
@@ -19,7 +19,7 @@ import {
   TransactionModalFooterContainer,
 } from 'wallet/src/features/transactions/swap/TransactionModal'
 import { TransactionModalProps } from 'wallet/src/features/transactions/swap/TransactionModalProps'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/api/client'
+import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
 
 export function SwapFlow({
   prefilledState,
diff --git a/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx b/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx
index b1fb6f5c777..557138bfdd3 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx
@@ -4,13 +4,13 @@ import { Keyboard } from 'react-native'
 import { Flex, Text, TouchableArea, isWeb, useSporeColors } from 'ui/src'
 import { Eye, Settings, X } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
 import { ViewOnlyModal } from 'wallet/src/features/transactions/swap/modals/ViewOnlyModal'
 import { SwapSettingsModal } from 'wallet/src/features/transactions/swap/modals/settings/SwapSettingsModal'
+import { TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
 
diff --git a/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx b/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx
index 7c04652c240..bb75b3e39fd 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx
@@ -9,7 +9,6 @@ import { iconSizes, spacing } from 'ui/src/theme'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, SectionName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 // eslint-disable-next-line no-restricted-imports
 import { formatCurrencyAmount } from 'utilities/src/format/localeBased'
@@ -29,6 +28,7 @@ import { TransactionModalInnerContainer } from 'wallet/src/features/transactions
 import { useExactOutputWillFail } from 'wallet/src/features/transactions/swap/hooks/useExactOutputWillFail'
 import { useShowSwapNetworkNotification } from 'wallet/src/features/transactions/swap/trade/hooks/useShowSwapNetworkNotification'
 import { isWrapAction } from 'wallet/src/features/transactions/swap/utils'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { MAX_FIAT_INPUT_DECIMALS } from 'wallet/src/features/transactions/utils'
 
 const SWAP_DIRECTION_BUTTON_SIZE = {
diff --git a/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx b/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx
index 353c08057f6..3507f8c59b8 100644
--- a/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx
@@ -1,13 +1,11 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn } from 'react-native-reanimated'
-import { useDispatch } from 'react-redux'
 import { Button, Flex, HapticFeedback, Separator, SpinningLoader, Text, isWeb, useIsShortMobileDevice } from 'ui/src'
 import { BackArrow } from 'ui/src/components/icons'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { iconSizes } from 'ui/src/theme'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { selectHasViewedReviewScreen } from 'wallet/src/features/behaviorHistory/selectors'
@@ -35,15 +33,16 @@ import { useSwapCallback } from 'wallet/src/features/transactions/swap/trade/hoo
 import { useWrapCallback } from 'wallet/src/features/transactions/swap/trade/hooks/useWrapCallback'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { getActionName, isWrapAction } from 'wallet/src/features/transactions/swap/utils'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { createTransactionId } from 'wallet/src/features/transactions/utils'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 // eslint-disable-next-line complexity
 export function SwapReviewScreen({ hideContent }: { hideContent: boolean }): JSX.Element | null {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const isShortMobileDevice = useIsShortMobileDevice()
 
   const account = useActiveAccountWithThrow()
diff --git a/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx b/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx
index 56b89231475..859e2ed5eda 100644
--- a/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx
+++ b/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx
@@ -1,45 +1,25 @@
 import { Currency } from '@uniswap/sdk-core'
 import { useCallback } from 'react'
-import { Keyboard, LayoutAnimation } from 'react-native'
 import { isWeb } from 'ui/src'
+import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
+import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
+import { currencyAddress } from 'uniswap/src/utils/currencyId'
 import {
   TokenSelector,
   TokenSelectorModal,
   TokenSelectorProps,
   TokenSelectorVariation,
-} from 'uniswap/src/components/TokenSelector/TokenSelector'
-import { AssetType, TradeableAsset } from 'uniswap/src/entities/assets'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
-import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
-import { currencyAddress } from 'uniswap/src/utils/currencyId'
+} from 'wallet/src/components/TokenSelector/TokenSelector'
 import { flowToModalName } from 'wallet/src/components/TokenSelector/flowToModalName'
-import {
-  useAddToSearchHistory,
-  useCommonTokensOptions,
-  useFavoriteTokensOptions,
-  useFilterCallbacks,
-  usePopularTokensOptions,
-  usePortfolioTokenOptions,
-  useTokenSectionsForEmptySearch,
-  useTokenSectionsForSearchResults,
-} from 'wallet/src/components/TokenSelector/hooks'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
+import { AssetType, TradeableAsset } from 'wallet/src/entities/assets'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import { SwapFormState, useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 
 export function SwapTokenSelector(): JSX.Element {
   const swapContext = useSwapFormContext()
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
   const { updateSwapForm, exactCurrencyField, selectingCurrencyField, output, input } = swapContext
-  const { navigateToBuyOrReceiveWithEmptyWallet } = useWalletNavigation()
-  // TODO: (MOB-3643) Share localization context with WEB
-  const { convertFiatAmountFormatted, formatNumberOrString } = useLocalizationContext()
-  const { registerSearch } = useAddToSearchHistory()
 
   if (!selectingCurrencyField) {
     throw new Error('TokenSelector rendered without `selectingCurrencyField`')
@@ -106,7 +86,6 @@ export function SwapTokenSelector(): JSX.Element {
 
   const props: TokenSelectorProps = {
     // we need to filter tokens using the chainId of the *other* currency
-    activeAccountAddress,
     chainId: selectingCurrencyField === CurrencyField.INPUT ? output?.chainId : input?.chainId,
     currencyField: selectingCurrencyField,
     flow: TokenSelectorFlow.Swap,
@@ -115,21 +94,7 @@ export function SwapTokenSelector(): JSX.Element {
         ? TokenSelectorVariation.BalancesAndPopular
         : TokenSelectorVariation.SuggestedAndFavoritesAndPopular,
     onClose: onHideTokenSelector,
-    onDismiss: () => Keyboard.dismiss(),
-    onPressAnimation: () => LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut),
     onSelectCurrency,
-    useCommonTokensOptionsHook: useCommonTokensOptions,
-    useFavoriteTokensOptionsHook: useFavoriteTokensOptions,
-    usePopularTokensOptionsHook: usePopularTokensOptions,
-    usePortfolioTokenOptionsHook: usePortfolioTokenOptions,
-    useTokenSectionsForEmptySearchHook: useTokenSectionsForEmptySearch,
-    useTokenSectionsForSearchResultsHook: useTokenSectionsForSearchResults,
-    useTokenWarningDismissedHook: useTokenWarningDismissed,
-    useFilterCallbacksHook: useFilterCallbacks,
-    navigateToBuyOrReceiveWithEmptyWalletCallback: navigateToBuyOrReceiveWithEmptyWallet,
-    convertFiatAmountFormattedCallback: convertFiatAmountFormatted,
-    formatNumberOrStringCallback: formatNumberOrString,
-    addToSearchHistoryCallback: registerSearch,
   }
   return isWeb ? <TokenSelector {...props} /> : <TokenSelectorModal {...props} />
 }
diff --git a/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx b/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx
index afab3d400c9..137324c0042 100644
--- a/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx
+++ b/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx
@@ -4,13 +4,11 @@ import { ArrowDown, X } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
-import { buildCurrencyId, currencyAddress } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 export function TransactionAmountsReview({
   acceptedDerivedSwapInfo,
@@ -23,45 +21,55 @@ export function TransactionAmountsReview({
 }): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const { convertFiatAmountFormatted, formatCurrencyAmount } = useLocalizationContext()
-  const { currencyAmountsUSDValue, exactCurrencyField, trade } = acceptedDerivedSwapInfo
+  const { convertFiatAmountFormatted, formatCurrencyAmount, formatNumberOrString } = useLocalizationContext()
 
-  if (!trade.trade) {
-    throw new Error('Missing required `trade` to render `TransactionAmountsReview`')
-  }
+  const { currencies, currencyAmounts, currencyAmountsUSDValue, exactAmountToken, exactCurrencyField } =
+    acceptedDerivedSwapInfo
+
+  const currencyInInfo = currencies[CurrencyField.INPUT]
+  const currencyOutInfo = currencies[CurrencyField.OUTPUT]
+
+  const usdAmountIn =
+    exactCurrencyField === CurrencyField.INPUT
+      ? currencyAmountsUSDValue[CurrencyField.INPUT]?.toExact()
+      : acceptedDerivedSwapInfo?.currencyAmountsUSDValue[CurrencyField.INPUT]?.toExact()
+
+  const usdAmountOut =
+    exactCurrencyField === CurrencyField.OUTPUT
+      ? currencyAmountsUSDValue[CurrencyField.OUTPUT]?.toExact()
+      : acceptedDerivedSwapInfo?.currencyAmountsUSDValue[CurrencyField.OUTPUT]?.toExact()
+
+  const formattedFiatAmountIn = convertFiatAmountFormatted(usdAmountIn, NumberType.FiatTokenQuantity)
+  const formattedFiatAmountOut = convertFiatAmountFormatted(usdAmountOut, NumberType.FiatTokenQuantity)
 
-  // Token amounts
-  // On review screen, always show values directly from trade object, to match exactly what is submitted on chain
-  const inputCurrencyAmount = trade.trade.inputAmount
-  const outputCurrencyAmount = trade.trade.outputAmount
+  const derivedCurrencyField = exactCurrencyField === CurrencyField.INPUT ? CurrencyField.OUTPUT : CurrencyField.INPUT
 
-  const formattedTokenAmountIn = formatCurrencyAmount({
-    value: inputCurrencyAmount,
+  const derivedAmount = formatCurrencyAmount({
+    value: acceptedDerivedSwapInfo?.currencyAmounts[derivedCurrencyField],
     type: NumberType.TokenTx,
   })
-  const formattedTokenAmountOut = formatCurrencyAmount({
-    value: outputCurrencyAmount,
+
+  const formattedExactAmountToken = formatNumberOrString({
+    value: exactAmountToken,
     type: NumberType.TokenTx,
   })
 
-  // USD amounts
-  const usdAmountIn = currencyAmountsUSDValue[CurrencyField.INPUT]?.toExact()
-  const usdAmountOut = currencyAmountsUSDValue[CurrencyField.OUTPUT]?.toExact()
-  const formattedFiatAmountIn = convertFiatAmountFormatted(usdAmountIn, NumberType.FiatTokenQuantity)
-  const formattedFiatAmountOut = convertFiatAmountFormatted(usdAmountOut, NumberType.FiatTokenQuantity)
+  const [formattedTokenAmountIn, formattedTokenAmountOut] =
+    exactCurrencyField === CurrencyField.INPUT
+      ? [formattedExactAmountToken, derivedAmount]
+      : [derivedAmount, formattedExactAmountToken]
 
   const shouldDimInput = newTradeRequiresAcceptance && exactCurrencyField === CurrencyField.OUTPUT
   const shouldDimOutput = newTradeRequiresAcceptance && exactCurrencyField === CurrencyField.INPUT
 
-  // Rebuild currency infos directly from trade object to ensure it matches what is submitted on chain
-  const currencyInInfo = useCurrencyInfo(
-    buildCurrencyId(inputCurrencyAmount.currency.chainId, currencyAddress(inputCurrencyAmount.currency)),
-  )
-  const currencyOutInfo = useCurrencyInfo(
-    buildCurrencyId(outputCurrencyAmount.currency.chainId, currencyAddress(outputCurrencyAmount.currency)),
-  )
-
-  if (!currencyInInfo || !currencyOutInfo) {
+  if (
+    !currencyInInfo ||
+    !currencyOutInfo ||
+    !currencyAmounts[CurrencyField.INPUT] ||
+    !currencyAmounts[CurrencyField.OUTPUT] ||
+    !acceptedDerivedSwapInfo.currencyAmounts[CurrencyField.INPUT] ||
+    !acceptedDerivedSwapInfo.currencyAmounts[CurrencyField.OUTPUT]
+  ) {
     // This should never happen. It's just to keep TS happy.
     throw new Error('Missing required props in `derivedSwapInfo` to render `TransactionAmountsReview` screen.')
   }
diff --git a/packages/wallet/src/features/transactions/swap/analytics.ts b/packages/wallet/src/features/transactions/swap/analytics.ts
index 138af2ff430..b1746e14cfc 100644
--- a/packages/wallet/src/features/transactions/swap/analytics.ts
+++ b/packages/wallet/src/features/transactions/swap/analytics.ts
@@ -3,13 +3,13 @@ import { Currency, TradeType } from '@uniswap/sdk-core'
 import { useEffect } from 'react'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { SwapTradeBaseProperties } from 'uniswap/src/features/telemetry/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { getCurrencyAddressForAnalytics } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
 import { LocalizationContextState, useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/api/utils'
+import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { Trade } from 'wallet/src/features/transactions/swap/trade/types'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
 // hook-based analytics because this one is data-lifecycle dependent
diff --git a/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts b/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts
index d4a9348222b..533a6cbaaf6 100644
--- a/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts
+++ b/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts
@@ -1,9 +1,9 @@
 import { Currency, TradeType } from '@uniswap/sdk-core'
-import { AssetType, CurrencyAsset } from 'uniswap/src/entities/assets'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { currencyAddress, currencyIdToAddress } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
+import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
 import { getAmountsFromTrade } from 'wallet/src/features/transactions/getAmountsFromTrade'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
diff --git a/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.test.ts b/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.test.ts
index 64d03c159c4..d02e46d9c68 100644
--- a/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.test.ts
+++ b/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.test.ts
@@ -1,10 +1,10 @@
 import { renderHook } from '@testing-library/react-hooks'
 import { Token } from '@uniswap/sdk-core'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { buildCurrency } from 'uniswap/src/features/dataApi/utils'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
+import { buildCurrency } from 'wallet/src/features/dataApi/utils'
 import { useExactOutputWillFail } from 'wallet/src/features/transactions/swap/hooks/useExactOutputWillFail'
-import { SAMPLE_CURRENCY_ID_1 } from 'wallet/src/test/fixtures'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { SAMPLE_CURRENCY_ID_1 } from 'wallet/src/test/fixtures/constants'
 
 describe('useExactOutputWillFail', () => {
   const createToken = (buyFeeBps?: string, sellFeeBps?: string): Token =>
@@ -33,7 +33,7 @@ describe('useExactOutputWillFail', () => {
           [CurrencyField.INPUT]: createCurrencyInfo(createToken()),
           [CurrencyField.OUTPUT]: createCurrencyInfo(createToken()),
         },
-      }),
+      })
     )
     expect(result.current).toEqual({
       outputTokenHasBuyTax: false,
@@ -49,7 +49,7 @@ describe('useExactOutputWillFail', () => {
           [CurrencyField.INPUT]: createCurrencyInfo(createToken(undefined, '100')),
           [CurrencyField.OUTPUT]: createCurrencyInfo(createToken()),
         },
-      }),
+      })
     )
     expect(result.current.exactOutputWillFail).toBe(true)
   })
@@ -61,7 +61,7 @@ describe('useExactOutputWillFail', () => {
           [CurrencyField.INPUT]: createCurrencyInfo(createToken()),
           [CurrencyField.OUTPUT]: createCurrencyInfo(createToken('100')),
         },
-      }),
+      })
     )
     expect(result.current.outputTokenHasBuyTax).toBe(true)
   })
@@ -73,7 +73,7 @@ describe('useExactOutputWillFail', () => {
           [CurrencyField.INPUT]: createCurrencyInfo(createToken('100')),
           [CurrencyField.OUTPUT]: createCurrencyInfo(createToken()),
         },
-      }),
+      })
     )
     expect(result.current.exactOutputWouldFailIfCurrenciesSwitched).toBe(true)
   })
@@ -85,7 +85,7 @@ describe('useExactOutputWillFail', () => {
           [CurrencyField.INPUT]: createCurrencyInfo(createToken()),
           [CurrencyField.OUTPUT]: createCurrencyInfo(createToken(undefined, '100')),
         },
-      }),
+      })
     )
     expect(result.current.exactOutputWouldFailIfCurrenciesSwitched).toBe(true)
   })
diff --git a/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.ts b/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.ts
index bf82d47cdee..deebdb42493 100644
--- a/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.ts
+++ b/packages/wallet/src/features/transactions/swap/hooks/useExactOutputWillFail.ts
@@ -1,6 +1,6 @@
 import { Token } from '@uniswap/sdk-core'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 export function hasTokenFee(currencyInfo: Maybe<CurrencyInfo>): {
   hasBuyTax: boolean
diff --git a/packages/wallet/src/features/transactions/swap/hooks/useSwapPrefilledState.ts b/packages/wallet/src/features/transactions/swap/hooks/useSwapPrefilledState.ts
index 7ce9e3450c3..e06c6773d23 100644
--- a/packages/wallet/src/features/transactions/swap/hooks/useSwapPrefilledState.ts
+++ b/packages/wallet/src/features/transactions/swap/hooks/useSwapPrefilledState.ts
@@ -1,14 +1,14 @@
 import { useMemo } from 'react'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType, CurrencyAsset } from 'uniswap/src/entities/assets'
+import { WalletChainId } from 'uniswap/src/types/chains'
+import { areAddressesEqual } from 'uniswap/src/utils/addresses'
+import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
+import { SwapFormState } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import {
   CurrencyField,
   TradeProtocolPreference,
   TransactionState,
-} from 'uniswap/src/features/transactions/transactionState/types'
-import { WalletChainId } from 'uniswap/src/types/chains'
-import { areAddressesEqual } from 'uniswap/src/utils/addresses'
-import { SwapFormState } from 'wallet/src/features/transactions/contexts/SwapFormContext'
+} from 'wallet/src/features/transactions/transactionState/types'
 
 export function useSwapPrefilledState(initialState: TransactionState | undefined): SwapFormState | undefined {
   const swapPrefilledState = useMemo(
diff --git a/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferWarning.tsx b/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferWarning.tsx
index c16f73b2d31..04b8a7116b8 100644
--- a/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferWarning.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferWarning.tsx
@@ -3,10 +3,10 @@ import { useTranslation } from 'react-i18next'
 import { isWeb, useSporeColors } from 'ui/src'
 import { MoneyBillSend } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { WarningInfo } from 'wallet/src/components/modals/WarningModal/WarningInfo'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 
 export function FeeOnTransferWarning({ children }: PropsWithChildren): JSX.Element {
   const { t } = useTranslation()
diff --git a/packages/wallet/src/features/transactions/swap/modals/NetworkFeeWarning.tsx b/packages/wallet/src/features/transactions/swap/modals/NetworkFeeWarning.tsx
index 81aad29ae77..5071ab4a2a8 100644
--- a/packages/wallet/src/features/transactions/swap/modals/NetworkFeeWarning.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/NetworkFeeWarning.tsx
@@ -2,11 +2,11 @@ import { PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
 import { isWeb, useSporeColors } from 'ui/src'
 import { Gas } from 'ui/src/components/icons'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { WarningInfo } from 'wallet/src/components/modals/WarningModal/WarningInfo'
 import { WarningTooltipProps } from 'wallet/src/components/modals/WarningModal/WarningTooltipProps'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 
 export function NetworkFeeWarning({
diff --git a/packages/wallet/src/features/transactions/swap/modals/QueuedOrderModal.tsx b/packages/wallet/src/features/transactions/swap/modals/QueuedOrderModal.tsx
index da2b1cf34e5..b5d32d52aa0 100644
--- a/packages/wallet/src/features/transactions/swap/modals/QueuedOrderModal.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/QueuedOrderModal.tsx
@@ -5,21 +5,21 @@ import { useDispatch } from 'react-redux'
 import { Button, Flex, Separator, Text, isWeb, useIsShortMobileDevice } from 'ui/src'
 import { AlertTriangle } from 'ui/src/components/icons'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
-import { AssetType, TradeableAsset } from 'uniswap/src/entities/assets'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { currencyAddress } from 'uniswap/src/utils/currencyId'
 import { isMobile } from 'utilities/src/platform'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
+import { AssetType, TradeableAsset } from 'wallet/src/entities/assets'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { SwapTransactionDetails } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/SwapTransactionDetails'
 import { isSwapTransactionInfo } from 'wallet/src/features/transactions/SummaryCards/DetailsModal/types'
 import { ErroredQueuedOrderStatus, useErroredQueuedOrders } from 'wallet/src/features/transactions/hooks'
 import { updateTransaction } from 'wallet/src/features/transactions/slice'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { QueuedOrderStatus, TransactionDetails, TransactionStatus } from 'wallet/src/features/transactions/types'
 import { useActiveSignerAccount } from 'wallet/src/features/wallet/hooks'
 
diff --git a/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx b/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx
index 9372256dfd4..88de1c67313 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx
@@ -5,10 +5,10 @@ import AlertTriangleIcon from 'ui/src/assets/icons/alert-triangle.svg'
 import { Settings } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
 import { BottomSheetModal } from 'uniswap/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { NumberType } from 'utilities/src/format/types'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { Trade } from 'wallet/src/features/transactions/swap/trade/types'
 import { slippageToleranceToPercent } from 'wallet/src/features/transactions/swap/utils'
diff --git a/packages/wallet/src/features/transactions/swap/modals/SwapFeeWarning.tsx b/packages/wallet/src/features/transactions/swap/modals/SwapFeeWarning.tsx
index adaf3b81b7b..b797693e996 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SwapFeeWarning.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/SwapFeeWarning.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
 import { Text, TouchableArea, isWeb, useSporeColors } from 'ui/src'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { openUri } from 'uniswap/src/utils/linking'
 import { WarningInfo } from 'wallet/src/components/modals/WarningModal/WarningInfo'
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
+import { openUri } from 'wallet/src/utils/linking'
 
 export function SwapFeeWarning({ noFee, children }: PropsWithChildren<{ noFee: boolean }>): JSX.Element {
   const colors = useSporeColors()
diff --git a/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx b/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx
index bb119d9e060..ebb1678da19 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx
@@ -1,10 +1,10 @@
 import { useTranslation } from 'react-i18next'
 import { useSporeColors } from 'ui/src'
 import { ShieldCheck } from 'ui/src/components/icons'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 
 export function SwapProtectionInfoModal({ onClose }: { onClose: () => void }): JSX.Element {
   const colors = useSporeColors()
diff --git a/packages/wallet/src/features/transactions/swap/modals/UniswapXInfo.tsx b/packages/wallet/src/features/transactions/swap/modals/UniswapXInfo.tsx
index c65fb8f6e55..7d100b6f899 100644
--- a/packages/wallet/src/features/transactions/swap/modals/UniswapXInfo.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/UniswapXInfo.tsx
@@ -3,11 +3,11 @@ import { useTranslation } from 'react-i18next'
 import { UniswapXText, isWeb } from 'ui/src'
 import { UniswapX } from 'ui/src/components/icons'
 import { colors, opacify } from 'ui/src/theme'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
 import { WarningInfo } from 'wallet/src/components/modals/WarningModal/WarningInfo'
 import { WarningTooltipProps } from 'wallet/src/components/modals/WarningModal/WarningTooltipProps'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 
 export function UniswapXInfo({
diff --git a/packages/wallet/src/features/transactions/swap/modals/UniswapXInfoModal.tsx b/packages/wallet/src/features/transactions/swap/modals/UniswapXInfoModal.tsx
deleted file mode 100644
index b5ef4e43f8d..00000000000
--- a/packages/wallet/src/features/transactions/swap/modals/UniswapXInfoModal.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { UniswapXText, isWeb } from 'ui/src'
-import { UniswapX } from 'ui/src/components/icons'
-import { colors, opacify } from 'ui/src/theme'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
-import { uniswapUrls } from 'uniswap/src/constants/urls'
-import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-
-export function UniswapXInfoModal({ onClose }: { onClose: () => void }): JSX.Element {
-  const { t } = useTranslation()
-
-  return (
-    <WarningModal
-      backgroundIconColor={opacify(16, colors.uniswapXPurple)}
-      caption={t('uniswapx.description')}
-      closeText={t('common.button.close')}
-      icon={<UniswapX size="$icon.24" />}
-      modalName={ModalName.UniswapXInfo}
-      title={<UniswapXText variant={isWeb ? 'subheading2' : 'body1'}>{t('uniswapx.label')}</UniswapXText>}
-      onClose={onClose}
-    >
-      <LearnMoreLink url={uniswapUrls.helpArticleUrls.uniswapXInfo} />
-    </WarningModal>
-  )
-}
diff --git a/packages/wallet/src/features/transactions/swap/modals/settings/ProtocolPreferenceScreen.tsx b/packages/wallet/src/features/transactions/swap/modals/settings/ProtocolPreferenceScreen.tsx
index 3c3888f6c78..185bf03084e 100644
--- a/packages/wallet/src/features/transactions/swap/modals/settings/ProtocolPreferenceScreen.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/settings/ProtocolPreferenceScreen.tsx
@@ -7,9 +7,9 @@ import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ElementName, ElementNameType } from 'uniswap/src/features/telemetry/constants'
-import { TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { isMobileApp } from 'utilities/src/platform'
 import { UniswapXInfo } from 'wallet/src/features/transactions/swap/modals/UniswapXInfo'
+import { TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 
 // TODO(WEB-4297): Update controls on this screen to allow combinations of any/all routing options once supported by TradingAPI.
 export function ProtocolPreferenceScreen({
diff --git a/packages/wallet/src/features/transactions/swap/modals/settings/SlippageSettingsScreen.tsx b/packages/wallet/src/features/transactions/swap/modals/settings/SlippageSettingsScreen.tsx
index 5b5936431a5..b8077168e5c 100644
--- a/packages/wallet/src/features/transactions/swap/modals/settings/SlippageSettingsScreen.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/settings/SlippageSettingsScreen.tsx
@@ -3,9 +3,9 @@ import { Flex, Text, TouchableArea, isWeb, useSporeColors } from 'ui/src'
 import { AnimatedFlex } from 'ui/src/components/layout/AnimatedFlex'
 import { fonts, iconSizes, spacing } from 'ui/src/theme'
 import { BottomSheetTextInput } from 'uniswap/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'uniswap/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import PlusMinusButton, { PlusMinusButtonType } from 'wallet/src/components/buttons/PlusMinusButton'
+import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { MAX_CUSTOM_SLIPPAGE_TOLERANCE } from 'wallet/src/constants/transactions'
 import { SwapSettingsMessage } from 'wallet/src/features/transactions/swap/modals/settings/SwapSettingsMessage'
 import { useSlippageSettings } from 'wallet/src/features/transactions/swap/modals/settings/useSlippageSettings'
diff --git a/packages/wallet/src/features/transactions/swap/modals/settings/SwapSettingsModal.tsx b/packages/wallet/src/features/transactions/swap/modals/settings/SwapSettingsModal.tsx
index ed3750a6a33..86d6f66b764 100644
--- a/packages/wallet/src/features/transactions/swap/modals/settings/SwapSettingsModal.tsx
+++ b/packages/wallet/src/features/transactions/swap/modals/settings/SwapSettingsModal.tsx
@@ -1,6 +1,5 @@
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
 import { Button, Flex, Separator, Text, TouchableArea, isWeb, useSporeColors } from 'ui/src'
 import { InfoCircleFilled, RotatableChevron } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
@@ -9,7 +8,6 @@ import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { Switch, WebSwitch } from 'wallet/src/components/buttons/Switch'
 import { isPrivateRpcSupportedOnChain } from 'wallet/src/features/providers'
@@ -21,8 +19,10 @@ import {
 import { SlippageSettingsRow } from 'wallet/src/features/transactions/swap/modals/settings/SlippageSettingsRow'
 import { SlippageSettingsScreen } from 'wallet/src/features/transactions/swap/modals/settings/SlippageSettingsScreen'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+import { TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 import { useSwapProtectionSetting } from 'wallet/src/features/wallet/hooks'
 import { SwapProtectionSetting, setSwapProtectionSetting } from 'wallet/src/features/wallet/slice'
+import { useAppDispatch } from 'wallet/src/state'
 
 enum SwapSettingsModalView {
   Options,
@@ -195,7 +195,7 @@ function SwapSettingsOptions({
 
 function SwapProtectionSettingsRow({ chainId }: { chainId: WalletChainId }): JSX.Element {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const swapProtectionSetting = useSwapProtectionSetting()
 
   const toggleSwapProtectionSetting = useCallback(() => {
diff --git a/packages/wallet/src/features/transactions/swap/submitOrderSaga.ts b/packages/wallet/src/features/transactions/swap/submitOrderSaga.ts
index cf35e817345..a8e0a15e35a 100644
--- a/packages/wallet/src/features/transactions/swap/submitOrderSaga.ts
+++ b/packages/wallet/src/features/transactions/swap/submitOrderSaga.ts
@@ -9,7 +9,7 @@ import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { OrderRequest, Routing } from 'wallet/src/data/tradingApi/__generated__/index'
 import { finalizeTransaction, transactionActions } from 'wallet/src/features/transactions/slice'
 import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
-import { TRADING_API_HEADERS } from 'wallet/src/features/transactions/swap/trade/api/client'
+import { TRADING_API_HEADERS } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
 import {
   QueuedOrderStatus,
   TransactionStatus,
diff --git a/packages/wallet/src/features/transactions/swap/swapSaga.test.ts b/packages/wallet/src/features/transactions/swap/swapSaga.test.ts
index e28b93e39af..3b38077ff38 100644
--- a/packages/wallet/src/features/transactions/swap/swapSaga.test.ts
+++ b/packages/wallet/src/features/transactions/swap/swapSaga.test.ts
@@ -5,11 +5,11 @@ import { TradeType } from '@uniswap/sdk-core'
 import { UNIVERSAL_ROUTER_ADDRESS } from '@uniswap/universal-router-sdk'
 import { expectSaga } from 'redux-saga-test-plan'
 import { EffectProviders, StaticProvider } from 'redux-saga-test-plan/providers'
-import { DAI } from 'uniswap/src/constants/tokens'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { currencyId } from 'uniswap/src/utils/currencyId'
+import { DAI } from 'wallet/src/constants/tokens'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
 import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
 import { SwapParams, approveAndSwap } from 'wallet/src/features/transactions/swap/swapSaga'
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useDerivedSwapInfo.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useDerivedSwapInfo.ts
index d75f7ee985a..b5f1da6f507 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useDerivedSwapInfo.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useDerivedSwapInfo.ts
@@ -2,16 +2,16 @@ import { TradeType } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
 import { useOnChainCurrencyBalance } from 'wallet/src/features/portfolio/api'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { useTrade } from 'wallet/src/features/transactions/swap/trade/api/hooks/useTrade'
 import { useSetTradeSlippage } from 'wallet/src/features/transactions/swap/trade/hooks/useSetTradeSlippage'
 import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { useTradingApiTrade } from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { getWrapType, isWrapAction } from 'wallet/src/features/transactions/swap/utils'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
@@ -84,10 +84,10 @@ export function useDerivedSwapInfo(state: TransactionState): DerivedSwapInfo {
     tradeProtocolPreference: isOptionalRoutingEnabled ? tradeProtocolPreference : undefined,
   }
 
-  const tradeTradeWithoutSlippage = useTrade(tradeParams)
+  const tradingApiTrade = useTradingApiTrade(tradeParams)
 
   // Calculate auto slippage tolerance for trade. If customSlippageTolerance is undefined, then the Trade slippage is set to the calculated value.
-  const { trade, autoSlippageTolerance } = useSetTradeSlippage(tradeTradeWithoutSlippage, customSlippageTolerance)
+  const { trade, autoSlippageTolerance } = useSetTradeSlippage(tradingApiTrade, customSlippageTolerance)
 
   const currencyAmounts = useMemo(
     () =>
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useSetTradeSlippage.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useSetTradeSlippage.ts
index c3898481ad2..71e6e846ffa 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useSetTradeSlippage.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useSetTradeSlippage.ts
@@ -1,13 +1,13 @@
 import { useMemo } from 'react'
-import { isMainnetChainId, toSupportedChainId } from 'uniswap/src/features/chains/utils'
-import { DynamicConfigs, SlippageConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
+import { isL2Chain, toSupportedChainId } from 'uniswap/src/features/chains/utils'
+import { DynamicConfigs } from 'uniswap/src/features/gating/configs'
+import { useDynamicConfig } from 'uniswap/src/features/gating/hooks'
 import { MAX_AUTO_SLIPPAGE_TOLERANCE, MIN_AUTO_SLIPPAGE_TOLERANCE } from 'wallet/src/constants/transactions'
+import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
 import {
   getClassicQuoteFromResponse,
   transformTradingApiResponseToTrade,
-} from 'wallet/src/features/transactions/swap/trade/api/utils'
-import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+} from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { Trade, TradeWithStatus } from 'wallet/src/features/transactions/swap/trade/types'
 
 export function useSetTradeSlippage(
@@ -63,12 +63,12 @@ export function useSetTradeSlippage(
 function useCalculateAutoSlippage(trade: Maybe<Trade>): number {
   const outputAmountUSD = useUSDCValue(trade?.outputAmount)?.toExact()
 
-  const minAutoSlippageToleranceL2 = useSlippageValueFromDynamicConfig(SlippageConfigKey.MinAutoSlippageToleranceL2)
+  const minAutoSlippageToleranceL2 = useSlippageValueFromDynamicConfig(SlippageConfigName.MinAutoSlippageToleranceL2)
 
   return useMemo<number>(() => {
     const quote = getClassicQuoteFromResponse(trade?.quote)
     const chainId = toSupportedChainId(quote?.chainId) ?? undefined
-    const onL2 = !isMainnetChainId(chainId)
+    const onL2 = isL2Chain(chainId)
     const gasCostUSD = quote?.gasFeeUSD
     return calculateAutoSlippage({
       onL2,
@@ -111,8 +111,20 @@ function calculateAutoSlippage({
   return Number(suggestedSlippageTolerance.toFixed(2))
 }
 
-function useSlippageValueFromDynamicConfig(configName: SlippageConfigKey): number {
-  const slippageValue = useDynamicConfigValue(DynamicConfigs.Slippage, configName, '')
+enum SlippageConfigName {
+  MinAutoSlippageToleranceL2,
+}
+
+// Allows us to type the values stored in the JSON dynamic config object for slippage params.
+// Names in mapping should exatcly match the JSON object in statsig.
+export const SLIPPAGE_CONFIG_NAMES = new Map<SlippageConfigName, string>([
+  [SlippageConfigName.MinAutoSlippageToleranceL2, 'minAutoSlippageToleranceL2'],
+])
+
+function useSlippageValueFromDynamicConfig(configName: SlippageConfigName): number {
+  const slippageConfig = useDynamicConfig(DynamicConfigs.Slippage)
+
+  const slippageValue = slippageConfig.getValue(SLIPPAGE_CONFIG_NAMES.get(configName)) as string
 
   // Format as % number
   return parseInt(slippageValue, 10)
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useShowSwapNetworkNotification.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useShowSwapNetworkNotification.ts
index cf321b0dfaa..077fd4db4c1 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useShowSwapNetworkNotification.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useShowSwapNetworkNotification.ts
@@ -1,13 +1,13 @@
 import { useEffect } from 'react'
-import { useDispatch } from 'react-redux'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { usePrevious } from 'utilities/src/react/hooks'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function useShowSwapNetworkNotification(chainId?: WalletChainId): void {
   const prevChainId = usePrevious(chainId)
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   useEffect(() => {
     // don't fire notification toast for first network selection
     if (!prevChainId || !chainId || prevChainId === chainId) {
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useSwapCallback.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useSwapCallback.ts
index 43bd5e5c53b..12ef611fa62 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useSwapCallback.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useSwapCallback.ts
@@ -1,7 +1,6 @@
 import { SwapEventName } from '@uniswap/analytics-events'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { setHasSubmittedHoldToSwap } from 'wallet/src/features/behaviorHistory/slice'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
@@ -10,10 +9,10 @@ import { updateSwapStartTimestamp } from 'wallet/src/features/timing/slice'
 import { ValidatedSwapTxContext } from 'wallet/src/features/transactions/contexts/SwapTxContext'
 import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
 import { swapActions } from 'wallet/src/features/transactions/swap/swapSaga'
-import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/api/utils'
+import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { isClassic } from 'wallet/src/features/transactions/swap/trade/utils'
 import { SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 import { toStringish } from 'wallet/src/utils/number'
 
 interface SwapCallbackArgs {
@@ -31,7 +30,7 @@ interface SwapCallbackArgs {
 
 /** Callback to submit trades and track progress */
 export function useSwapCallback(): (args: SwapCallbackArgs) => void {
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   const formatter = useLocalizationContext()
   const swapStartTimestamp = useAppSelector(selectSwapStartTimestamp)
 
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice.ts
index 22135a819a8..cf980377e5e 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice.ts
@@ -17,7 +17,7 @@ import {
   USDT_BNB,
   USDzC,
 } from 'wallet/src/constants/tokens'
-import { useTrade } from 'wallet/src/features/transactions/swap/trade/api/hooks/useTrade'
+import { useTradingApiTrade } from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade'
 import { isClassic } from 'wallet/src/features/transactions/swap/trade/utils'
 
 // Stablecoin amounts used when calculating spot price for a given currency.
@@ -53,7 +53,7 @@ export function useUSDCPrice(currency?: Currency): Price<Currency, Currency> | u
   )
   const amountSpecified = currencyIsStablecoin ? undefined : quoteAmount
 
-  const { trade } = useTrade({
+  const { trade } = useTradingApiTrade({
     amountSpecified,
     otherCurrency: currency,
     tradeType: TradeType.EXACT_OUTPUT,
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapCallback.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapCallback.ts
index d04c1eff9ae..8c73418f5a8 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapCallback.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapCallback.ts
@@ -1,12 +1,12 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { providers } from 'ethers'
 import { useMemo } from 'react'
-import { useDispatch } from 'react-redux'
 import { logger } from 'utilities/src/logger/logger'
 import { isWrapAction } from 'wallet/src/features/transactions/swap/utils'
 import { WrapParams, tokenWrapActions } from 'wallet/src/features/transactions/swap/wrapSaga'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 export function useWrapCallback(
   inputCurrencyAmount: CurrencyAmount<Currency> | null | undefined,
@@ -17,7 +17,7 @@ export function useWrapCallback(
 ): {
   wrapCallback: () => void
 } {
-  const appDispatch = useDispatch()
+  const appDispatch = useAppDispatch()
   const account = useActiveAccount()
 
   return useMemo(() => {
diff --git a/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapTransactionRequest.ts b/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapTransactionRequest.ts
index 213e210a7d2..af3e8b88884 100644
--- a/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapTransactionRequest.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/hooks/useWrapTransactionRequest.ts
@@ -1,13 +1,13 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { providers } from 'ethers'
 import { useCallback } from 'react'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { Trade } from 'wallet/src/features/transactions/swap/trade/types'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { getWethContract } from 'wallet/src/features/transactions/swap/wrapSaga'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { useProvider } from 'wallet/src/features/wallet/context'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/client.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/client.ts
similarity index 100%
rename from packages/wallet/src/features/transactions/swap/trade/api/client.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/client.ts
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useSwapTxAndGasInfo.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useSwapTxAndGasInfoTradingApi.ts
similarity index 92%
rename from packages/wallet/src/features/transactions/swap/trade/api/hooks/useSwapTxAndGasInfo.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useSwapTxAndGasInfoTradingApi.ts
index d968658cf24..43e1c9c44b4 100644
--- a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useSwapTxAndGasInfo.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useSwapTxAndGasInfoTradingApi.ts
@@ -1,14 +1,14 @@
 import { providers } from 'ethers'
 import { useMemo } from 'react'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { OrderRequest, Routing } from 'wallet/src/data/tradingApi/__generated__/index'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
-import { useTokenApprovalInfo } from 'wallet/src/features/transactions/swap/trade/api/hooks/useTokenApprovalInfo'
-import { useTransactionRequestInfo } from 'wallet/src/features/transactions/swap/trade/api/hooks/useTransactionRequestInfo'
+import { useTokenApprovalInfo } from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTokenApprovalInfo'
+import { useTransactionRequestInfo } from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTransactionRequestInfo'
 import { ApprovalAction, ClassicTrade, UniswapXTrade } from 'wallet/src/features/transactions/swap/trade/types'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { sumGasFees } from 'wallet/src/features/transactions/swap/utils'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 export type SwapTxAndGasInfo = ClassicSwapTxAndGasInfo | UniswapXSwapTxAndGasInfo
 
@@ -41,7 +41,11 @@ function validateTransactionRequest(
   return undefined
 }
 
-export function useSwapTxAndGasInfo({ derivedSwapInfo }: { derivedSwapInfo: DerivedSwapInfo }): SwapTxAndGasInfo {
+export function useSwapTxAndGasInfoTradingApi({
+  derivedSwapInfo,
+}: {
+  derivedSwapInfo: DerivedSwapInfo
+}): SwapTxAndGasInfo {
   const {
     chainId,
     wrapType,
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTokenApprovalInfo.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTokenApprovalInfo.ts
similarity index 96%
rename from packages/wallet/src/features/transactions/swap/trade/api/hooks/useTokenApprovalInfo.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTokenApprovalInfo.ts
index dd9f10a482e..42510e04946 100644
--- a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTokenApprovalInfo.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTokenApprovalInfo.ts
@@ -6,11 +6,11 @@ import { WalletChainId } from 'uniswap/src/types/chains'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
 import { ApprovalRequest, ApprovalResponse, Routing } from 'wallet/src/data/tradingApi/__generated__/index'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/api/client'
+import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
 import {
   getTokenAddressForApi,
   toTradingApiSupportedChainId,
-} from 'wallet/src/features/transactions/swap/trade/api/utils'
+} from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { ApprovalAction, TokenApprovalInfo } from 'wallet/src/features/transactions/swap/trade/types'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTrade.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade.ts
similarity index 84%
rename from packages/wallet/src/features/transactions/swap/trade/api/hooks/useTrade.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade.ts
index 4944bccd136..dec997a3c22 100644
--- a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTrade.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade.ts
@@ -1,13 +1,12 @@
 import { ApolloError, NetworkStatus } from '@apollo/client'
 import { TradeType } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
+import { PollingInterval } from 'uniswap/src/constants/misc'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { useRestQuery } from 'uniswap/src/data/rest'
-import { isMainnetChainId } from 'uniswap/src/features/chains/utils'
-import { DynamicConfigs, PollingIntervalsConfigKey } from 'uniswap/src/features/gating/configs'
+import { isL2Chain } from 'uniswap/src/features/chains/utils'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
-import { useDynamicConfigValue, useFeatureFlag } from 'uniswap/src/features/gating/hooks'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
+import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { areCurrencyIdsEqual, currencyId } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
@@ -15,19 +14,20 @@ import { ONE_SECOND_MS, inXMinutesUnix } from 'utilities/src/time/time'
 import { useDebounceWithStatus } from 'utilities/src/time/timing'
 import { QuoteRequest, TradeType as TradingApiTradeType } from 'wallet/src/data/tradingApi/__generated__/index'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/api/client'
+import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
 import {
   getRoutingPreferenceForSwapRequest,
   getTokenAddressForApi,
   toTradingApiSupportedChainId,
   transformTradingApiResponseToTrade,
   validateTrade,
-} from 'wallet/src/features/transactions/swap/trade/api/utils'
+} from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import {
   DiscriminatedQuoteResponse,
   TradeWithStatus,
   UseTradeArgs,
 } from 'wallet/src/features/transactions/swap/trade/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
 // error strings hardcoded in @uniswap/unified-routing-api
@@ -43,7 +43,7 @@ export const SWAP_FORM_DEBOUNCE_TIME_MS = 250
 
 export const API_RATE_LIMIT_ERROR = 'TOO_MANY_REQUESTS'
 
-export function useTrade(args: UseTradeArgs): TradeWithStatus {
+export function useTradingApiTrade(args: UseTradeArgs): TradeWithStatus {
   const {
     amountSpecified,
     otherCurrency,
@@ -95,7 +95,7 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
     // Temporary logging to help debug invalid requests with missing `swappper` param
     if (!activeAccountAddress) {
       logger.error(new Error('Missing account address in /swap request'), {
-        tags: { file: 'useTrade', function: 'quote' },
+        tags: { file: 'useTradingApiTrade', function: 'quote' },
         extra: {
           activeAccountAddress,
         },
@@ -134,8 +134,7 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
 
   /***** Fetch quote from trading API  ******/
 
-  const pollingIntervalForChain = usePollingIntervalByChain(currencyIn?.chainId)
-  const internalPollInterval = pollInterval ?? pollingIntervalForChain
+  const internalPollInterval = pollInterval ?? getPollIntervalByChain(currencyIn?.chainId)
 
   const response = useRestQuery<DiscriminatedQuoteResponse, QuoteRequest | Record<string, never>>(
     uniswapUrls.tradingApiPaths.quote,
@@ -162,11 +161,11 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
   return useMemo(() => {
     // Error logging
     if (error && !isUSDQuote) {
-      logger.error(error, { tags: { file: 'useTrade', function: 'quote' } })
+      logger.error(error, { tags: { file: 'useTradingApiTrade', function: 'quote' } })
     }
     if (data && !data.quote) {
       logger.error(new Error('Unexpected empty Trading API response'), {
-        tags: { file: 'useTrade', function: 'quote' },
+        tags: { file: 'useTradingApiTrade', function: 'quote' },
         extra: {
           quoteRequestArgs,
         },
@@ -248,21 +247,6 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
   ])
 }
 
-const FALLBACK_L1_BLOCK_TIME_MS = 12000
-const FALLBACK_L2_BLOCK_TIME_MS = 3000
-
-function usePollingIntervalByChain(chainId?: WalletChainId): number {
-  const averageL1BlockTimeMs = useDynamicConfigValue(
-    DynamicConfigs.PollingIntervals,
-    PollingIntervalsConfigKey.AverageL1BlockTimeMs,
-    FALLBACK_L1_BLOCK_TIME_MS,
-  )
-
-  const averageL2BlockTimeMs = useDynamicConfigValue(
-    DynamicConfigs.PollingIntervals,
-    PollingIntervalsConfigKey.AverageL2BlockTimeMs,
-    FALLBACK_L2_BLOCK_TIME_MS,
-  )
-
-  return isMainnetChainId(chainId) ? averageL1BlockTimeMs : averageL2BlockTimeMs
+function getPollIntervalByChain(chainId?: WalletChainId): number {
+  return isL2Chain(chainId) ? PollingInterval.AverageL2BlockTime : PollingInterval.AverageL1BlockTime
 }
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTransactionRequestInfo.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTransactionRequestInfo.ts
similarity index 87%
rename from packages/wallet/src/features/transactions/swap/trade/api/hooks/useTransactionRequestInfo.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTransactionRequestInfo.ts
index 6615e336eb7..d2dfdb1192f 100644
--- a/packages/wallet/src/features/transactions/swap/trade/api/hooks/useTransactionRequestInfo.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTransactionRequestInfo.ts
@@ -3,11 +3,7 @@ import { providers } from 'ethers'
 import { useEffect, useMemo, useRef } from 'react'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { useRestQuery } from 'uniswap/src/data/rest'
-import { DynamicConfigs, PollingIntervalsConfigKey } from 'uniswap/src/features/gating/configs'
-import { useDynamicConfigValue } from 'uniswap/src/features/gating/hooks'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { isDetoxBuild } from 'utilities/src/environment/constants'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import {
@@ -19,18 +15,21 @@ import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
 import { GasFeeResult, GasSpeed } from 'wallet/src/features/gas/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { getBaseTradeAnalyticsPropertiesFromSwapInfo } from 'wallet/src/features/transactions/swap/analytics'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/api/client'
-import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/api/utils'
 import { useWrapTransactionRequest } from 'wallet/src/features/transactions/swap/trade/hooks/useWrapTransactionRequest'
+import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/trade/tradingApi/client'
+import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { ApprovalAction, TokenApprovalInfo } from 'wallet/src/features/transactions/swap/trade/types'
 import { isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { usePermit2SignatureWithData } from 'wallet/src/features/transactions/swap/usePermit2Signature'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { WrapType } from 'wallet/src/features/transactions/types'
 
 export const UNKNOWN_SIM_ERROR = 'Unknown gas simulation error'
 
-const FALLBACK_SWAP_REQUEST_POLL_INTERVAL_MS = 1000
+// Poll often to ensure swap quote is never expected to fail
+const SWAP_REQUEST_POLL_INTERVAL = ONE_SECOND_MS
+
 export interface TransactionRequestInfo {
   transactionRequest: providers.TransactionRequest | undefined
   permitSignature: string | undefined
@@ -114,22 +113,14 @@ export function useTransactionRequestInfo({
 
   const skipTransactionRequest = !swapRequestArgs || isWrapApplicable || skip
 
-  // We will remove this cast in follow up change to dynamic config typing
-  const tradingApiSwapRequestMs = useDynamicConfigValue(
-    DynamicConfigs.PollingIntervals,
-    PollingIntervalsConfigKey.TradingApiSwapRequestMs,
-    FALLBACK_SWAP_REQUEST_POLL_INTERVAL_MS,
-  )
-
   const { data, error, loading } = useRestQuery<CreateSwapResponse, CreateSwapRequest | Record<string, never>>(
     uniswapUrls.tradingApiPaths.swap,
     swapRequestArgs ?? {},
     ['swap', 'gasFee', 'requestId', 'txFailureReasons'],
     {
-      // disables react query polling during e2e testing which was preventing js thread from idle
-      pollInterval: isDetoxBuild ? undefined : tradingApiSwapRequestMs,
+      pollInterval: SWAP_REQUEST_POLL_INTERVAL,
       clearIfStale: true,
-      ttlMs: tradingApiSwapRequestMs + ONE_SECOND_MS * 5, // Small buffer if connection is lost
+      ttlMs: SWAP_REQUEST_POLL_INTERVAL + ONE_SECOND_MS * 5, // Small buffer if connection is lost
       skip: skipTransactionRequest,
     },
     'POST',
diff --git a/packages/wallet/src/features/transactions/swap/trade/api/utils.ts b/packages/wallet/src/features/transactions/swap/trade/tradingApi/utils.ts
similarity index 97%
rename from packages/wallet/src/features/transactions/swap/trade/api/utils.ts
rename to packages/wallet/src/features/transactions/swap/trade/tradingApi/utils.ts
index 420957590b5..da0d6398bf5 100644
--- a/packages/wallet/src/features/transactions/swap/trade/api/utils.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/tradingApi/utils.ts
@@ -4,8 +4,6 @@ import { UnsignedV2DutchOrderInfo } from '@uniswap/uniswapx-sdk'
 import { Pair, Route as V2Route } from '@uniswap/v2-sdk'
 import { FeeAmount, Pool, Route as V3Route } from '@uniswap/v3-sdk'
 import { BigNumber } from 'ethers'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
-import { CurrencyField, TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { areAddressesEqual } from 'uniswap/src/utils/addresses'
 import { currencyId } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
@@ -24,6 +22,7 @@ import {
   V3PoolInRoute as TradingApiV3PoolInRoute,
 } from 'wallet/src/data/tradingApi/__generated__/index'
 import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
 import {
   ClassicTrade,
@@ -32,6 +31,7 @@ import {
   Trade,
   UniswapXTrade,
 } from 'wallet/src/features/transactions/swap/trade/types'
+import { CurrencyField, TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
 
@@ -51,7 +51,7 @@ export function transformTradingApiResponseToTrade(params: TradingApiResponseToT
 
   switch (data?.routing) {
     case Routing.CLASSIC: {
-      const routes = computeRoutes(currencyIn.isNative, currencyOut.isNative, data)
+      const routes = computeRoutesTradingApi(currencyIn.isNative, currencyOut.isNative, data)
 
       if (!routes) {
         return null
@@ -101,7 +101,7 @@ export function getSwapFee(quoteResponse?: DiscriminatedQuoteResponse): SwapFee
  * Transforms a trading API quote into an array of routes that can be used to
  * create a `Trade`.
  */
-export function computeRoutes(
+export function computeRoutesTradingApi(
   tokenInIsNative: boolean,
   tokenOutIsNative: boolean,
   quoteResponse?: QuoteResponse,
diff --git a/packages/wallet/src/features/transactions/swap/trade/types.ts b/packages/wallet/src/features/transactions/swap/trade/types.ts
index 8b27b52a038..ee98046c901 100644
--- a/packages/wallet/src/features/transactions/swap/trade/types.ts
+++ b/packages/wallet/src/features/transactions/swap/trade/types.ts
@@ -7,9 +7,9 @@ import { Route as V2RouteSDK } from '@uniswap/v2-sdk'
 import { Route as V3RouteSDK } from '@uniswap/v3-sdk'
 import { providers } from 'ethers'
 import { PollingInterval } from 'uniswap/src/constants/misc'
-import { TradeProtocolPreference } from 'uniswap/src/features/transactions/transactionState/types'
 import { ClassicQuote, DutchQuoteV2, QuoteResponse, Routing } from 'wallet/src/data/tradingApi/__generated__/index'
-import { getSwapFee, transformToDutchOrderInfo } from 'wallet/src/features/transactions/swap/trade/api/utils'
+import { getSwapFee, transformToDutchOrderInfo } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
+import { TradeProtocolPreference } from 'wallet/src/features/transactions/transactionState/types'
 
 // TradingAPI team is looking into updating type generation to produce the following types for it's current QuoteResponse type:
 // See: https://linear.app/uniswap/issue/API-236/explore-changing-the-quote-schema-to-pull-out-a-basequoteresponse
diff --git a/packages/wallet/src/features/transactions/swap/types.ts b/packages/wallet/src/features/transactions/swap/types.ts
index 0e250607d3a..c894d64bf21 100644
--- a/packages/wallet/src/features/transactions/swap/types.ts
+++ b/packages/wallet/src/features/transactions/swap/types.ts
@@ -1,8 +1,8 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
-import { useTrade } from 'wallet/src/features/transactions/swap/trade/api/hooks/useTrade'
+import { useTradingApiTrade } from 'wallet/src/features/transactions/swap/trade/tradingApi/hooks/useTradingApiTrade'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { BaseDerivedInfo } from 'wallet/src/features/transactions/transfer/types'
 import { WrapType } from 'wallet/src/features/transactions/types'
 
@@ -25,7 +25,7 @@ export type DerivedSwapInfo<
     [CurrencyField.OUTPUT]: Maybe<CurrencyAmount<Currency>>
   }
   focusOnCurrencyField: CurrencyField | null
-  trade: ReturnType<typeof useTrade>
+  trade: ReturnType<typeof useTradingApiTrade>
   wrapType: WrapType
   selectingCurrencyField?: CurrencyField
   txId?: string
diff --git a/packages/wallet/src/features/transactions/swap/utils.test.ts b/packages/wallet/src/features/transactions/swap/utils.test.ts
index 2e25ae3ecf5..f2a23cfe542 100644
--- a/packages/wallet/src/features/transactions/swap/utils.test.ts
+++ b/packages/wallet/src/features/transactions/swap/utils.test.ts
@@ -1,19 +1,22 @@
 import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
 import { Route } from '@uniswap/v3-sdk'
-import { UNI, WBTC } from 'uniswap/src/constants/tokens'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId } from 'uniswap/src/types/chains'
-import { wrappedNativeCurrency } from 'uniswap/src/utils/currency'
+import { UNI, WBTC, wrappedNativeCurrency } from 'wallet/src/constants/tokens'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { ClassicTrade } from 'wallet/src/features/transactions/swap/trade/types'
-import { getWrapType, requireAcceptNewTrade, serializeQueryParams } from 'wallet/src/features/transactions/swap/utils'
+import {
+  getWrapType,
+  requireAcceptNewTrade,
+  serializeQueryParams,
+} from 'wallet/src/features/transactions/swap/utils'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { mockPool } from 'wallet/src/test/mocks'
 
 describe(serializeQueryParams, () => {
   it('handles the correct types', () => {
-    expect(serializeQueryParams({ a: '0x6B175474E89094C44Da98b954EedeAC495271d0F', b: 2, c: false })).toBe(
-      'a=0x6B175474E89094C44Da98b954EedeAC495271d0F&b=2&c=false',
-    )
+    expect(
+      serializeQueryParams({ a: '0x6B175474E89094C44Da98b954EedeAC495271d0F', b: 2, c: false })
+    ).toBe('a=0x6B175474E89094C44Da98b954EedeAC495271d0F&b=2&c=false')
   })
 
   it('escapes characters', () => {
diff --git a/packages/wallet/src/features/transactions/swap/utils.ts b/packages/wallet/src/features/transactions/swap/utils.ts
index de391ffcf76..13dcde6ad6f 100644
--- a/packages/wallet/src/features/transactions/swap/utils.ts
+++ b/packages/wallet/src/features/transactions/swap/utils.ts
@@ -8,9 +8,7 @@ import {
 import { FeeOptions } from '@uniswap/v3-sdk'
 import { BigNumber } from 'ethers'
 import { AppTFunction } from 'ui/src/i18n/types'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { ElementName, ElementNameType } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { CurrencyId } from 'uniswap/src/types/currency'
 import { getSymbolDisplayText } from 'uniswap/src/utils/currency'
@@ -22,11 +20,13 @@ import {
   currencyIdToChain,
 } from 'uniswap/src/utils/currencyId'
 import { NumberType } from 'utilities/src/format/types'
+import { AssetType } from 'wallet/src/entities/assets'
 import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
-import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/api/utils'
+import { getClassicQuoteFromResponse } from 'wallet/src/features/transactions/swap/trade/tradingApi/utils'
 import { ClassicTrade, Trade } from 'wallet/src/features/transactions/swap/trade/types'
 import { isClassic, isUniswapX } from 'wallet/src/features/transactions/swap/trade/utils'
 import { PermitSignatureInfo } from 'wallet/src/features/transactions/swap/usePermit2Signature'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import {
   ExactInputSwapTransactionInfo,
   ExactOutputSwapTransactionInfo,
diff --git a/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts b/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts
index 279fb5dd00a..e8c1be487b1 100644
--- a/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts
+++ b/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts
@@ -1,7 +1,7 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import { testSaga } from 'redux-saga-test-plan'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
 import { WrapParams, wrap } from 'wallet/src/features/transactions/swap/wrapSaga'
 import { TransactionType, WrapTransactionInfo } from 'wallet/src/features/transactions/types'
diff --git a/packages/wallet/src/features/transactions/transactionState/transactionState.test.ts b/packages/wallet/src/features/transactions/transactionState/transactionState.test.ts
index 3efc11190cb..ecb81299e62 100644
--- a/packages/wallet/src/features/transactions/transactionState/transactionState.test.ts
+++ b/packages/wallet/src/features/transactions/transactionState/transactionState.test.ts
@@ -1,8 +1,7 @@
 import { AnyAction } from '@reduxjs/toolkit'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType, CurrencyAsset } from 'uniswap/src/entities/assets'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
 import {
   INITIAL_TRANSACTION_STATE,
   selectCurrency,
@@ -11,6 +10,10 @@ import {
   updateExactAmountFiat,
   updateExactAmountToken,
 } from 'wallet/src/features/transactions/transactionState/transactionState'
+import {
+  CurrencyField,
+  TransactionState,
+} from 'wallet/src/features/transactions/transactionState/types'
 
 const chainId = UniverseChainId.Goerli
 const ethAddress = getNativeAddress(UniverseChainId.Goerli)
@@ -42,8 +45,8 @@ describe(selectCurrency, () => {
         selectCurrency({
           field: CurrencyField.INPUT,
           tradeableAsset: ethTradeableAsset,
-        }),
-      ),
+        })
+      )
     ).toEqual({
       ...previousState,
       [CurrencyField.INPUT]: ethTradeableAsset,
@@ -58,8 +61,8 @@ describe(selectCurrency, () => {
         selectCurrency({
           field: CurrencyField.OUTPUT,
           tradeableAsset: daiTradeableAsset,
-        }),
-      ),
+        })
+      )
     ).toEqual({
       ...previousState,
       [CurrencyField.OUTPUT]: daiTradeableAsset,
@@ -77,8 +80,8 @@ describe(selectCurrency, () => {
         selectCurrency({
           field: CurrencyField.OUTPUT,
           tradeableAsset: ethTradeableAsset,
-        }),
-      ),
+        })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.OUTPUT,
@@ -99,8 +102,8 @@ describe(selectCurrency, () => {
         selectCurrency({
           field: CurrencyField.OUTPUT,
           tradeableAsset: ethTradeableAsset,
-        }),
-      ),
+        })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.OUTPUT,
@@ -126,8 +129,8 @@ describe(selectCurrency, () => {
             chainId: otherChainId,
             type: AssetType.Currency,
           },
-        }),
-      ),
+        })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.OUTPUT,
@@ -168,7 +171,10 @@ describe(updateExactAmountToken, () => {
     const previousState = { ...testInitialState }
 
     expect(
-      transactionStateReducer(previousState, updateExactAmountToken({ field: CurrencyField.INPUT, amount: '1' })),
+      transactionStateReducer(
+        previousState,
+        updateExactAmountToken({ field: CurrencyField.INPUT, amount: '1' })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.INPUT,
@@ -180,7 +186,10 @@ describe(updateExactAmountToken, () => {
     const previousState = { ...testInitialState }
 
     expect(
-      transactionStateReducer(previousState, updateExactAmountFiat({ field: CurrencyField.INPUT, amount: '1' })),
+      transactionStateReducer(
+        previousState,
+        updateExactAmountFiat({ field: CurrencyField.INPUT, amount: '1' })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.INPUT,
@@ -192,7 +201,10 @@ describe(updateExactAmountToken, () => {
     const previousState = { ...testInitialState }
 
     expect(
-      transactionStateReducer(previousState, updateExactAmountToken({ field: CurrencyField.OUTPUT, amount: '5' })),
+      transactionStateReducer(
+        previousState,
+        updateExactAmountToken({ field: CurrencyField.OUTPUT, amount: '5' })
+      )
     ).toEqual({
       ...previousState,
       exactCurrencyField: CurrencyField.OUTPUT,
diff --git a/packages/wallet/src/features/transactions/transactionState/transactionState.ts b/packages/wallet/src/features/transactions/transactionState/transactionState.ts
index 2a59a0582d0..bbfa503c2a4 100644
--- a/packages/wallet/src/features/transactions/transactionState/transactionState.ts
+++ b/packages/wallet/src/features/transactions/transactionState/transactionState.ts
@@ -1,9 +1,9 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { shallowEqual } from 'react-redux'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType, TradeableAsset } from 'uniswap/src/entities/assets'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType, TradeableAsset } from 'wallet/src/entities/assets'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 
 const ETH_TRADEABLE_ASSET: TradeableAsset = {
   address: getNativeAddress(UniverseChainId.Mainnet),
diff --git a/packages/uniswap/src/features/transactions/transactionState/types.ts b/packages/wallet/src/features/transactions/transactionState/types.ts
similarity index 91%
rename from packages/uniswap/src/features/transactions/transactionState/types.ts
rename to packages/wallet/src/features/transactions/transactionState/types.ts
index 81438a00d19..6c37c318225 100644
--- a/packages/uniswap/src/features/transactions/transactionState/types.ts
+++ b/packages/wallet/src/features/transactions/transactionState/types.ts
@@ -1,4 +1,4 @@
-import { TradeableAsset } from 'uniswap/src/entities/assets'
+import { TradeableAsset } from 'wallet/src/entities/assets'
 
 export enum CurrencyField {
   INPUT = 'input',
diff --git a/packages/wallet/src/features/transactions/transactionWatcherSaga.test.ts b/packages/wallet/src/features/transactions/transactionWatcherSaga.test.ts
index 2fc88d96ece..1df9f246e83 100644
--- a/packages/wallet/src/features/transactions/transactionWatcherSaga.test.ts
+++ b/packages/wallet/src/features/transactions/transactionWatcherSaga.test.ts
@@ -6,7 +6,7 @@ import { PollingInterval } from 'uniswap/src/constants/misc'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { sleep } from 'utilities/src/time/timing'
-import { fetchFiatOnRampTransaction } from 'wallet/src/features/fiatOnRamp/api'
+import { fetchMoonpayTransaction } from 'wallet/src/features/fiatOnRamp/api'
 import { attemptCancelTransaction } from 'wallet/src/features/transactions/cancelTransactionSaga'
 import {
   addTransaction,
@@ -42,15 +42,12 @@ const {
 
 const { mockProvider, mockProviderManager } = getTxProvidersMocks(ethersTxReceipt)
 
-const ACTIVE_ACCOUNT_ADDRESS = '0x000000000000000000000000000000000000000001'
-
 describe(transactionWatcher, () => {
   it('Triggers watchers successfully', () => {
     const approveTxDetailsPending = transactionDetails({
       typeInfo: approveTransactionInfo(),
       status: TransactionStatus.Pending,
       hash: faker.datatype.uuid(),
-      from: ACTIVE_ACCOUNT_ADDRESS,
     })
 
     return expectSaga(transactionWatcher, { apolloClient: mockApolloClient })
@@ -65,7 +62,6 @@ describe(transactionWatcher, () => {
             },
           },
         },
-        wallet: { activeAccountAddress: ACTIVE_ACCOUNT_ADDRESS },
       })
       .provide([
         [call(getProvider, UniverseChainId.Mainnet), mockProvider],
@@ -108,9 +104,6 @@ describe(watchTransaction, () => {
       transaction: txDetailsPending,
       apolloClient: mockApolloClient,
     })
-      .withState({
-        wallet: { activeAccountAddress: ACTIVE_ACCOUNT_ADDRESS },
-      })
       .provide([[call(getProvider, chainId), receiptProvider]])
       .put(finalizeTransaction(finalizedTxAction.payload))
       .silentRun()
@@ -128,9 +121,6 @@ describe(watchTransaction, () => {
       transaction: txDetailsPending,
       apolloClient: mockApolloClient,
     })
-      .withState({
-        wallet: { activeAccountAddress: ACTIVE_ACCOUNT_ADDRESS },
-      })
       .provide([
         [call(getProvider, chainId), receiptProvider],
         [call(attemptCancelTransaction, txDetailsPending, cancelRequest), true],
@@ -152,9 +142,6 @@ describe(watchTransaction, () => {
       transaction: txDetailsPending,
       apolloClient: mockApolloClient,
     })
-      .withState({
-        wallet: { activeAccountAddress: ACTIVE_ACCOUNT_ADDRESS },
-      })
       .provide([
         [call(getProvider, chainId), receiptProvider],
         [call(waitForTxnInvalidated, chainId, id, options.request.nonce), true],
@@ -171,7 +158,7 @@ describe(watchFiatOnRampTransaction, () => {
     return (
       expectSaga(watchFiatOnRampTransaction, txDetailsPending)
         .provide([
-          [call(fetchFiatOnRampTransaction, txDetailsPending, false), staleTx],
+          [call(fetchMoonpayTransaction, txDetailsPending), staleTx],
           [matchers.call.fn(sendAnalyticsEvent), undefined],
         ])
         .put(
@@ -198,7 +185,7 @@ describe(watchFiatOnRampTransaction, () => {
         .provide([
           {
             call(effect): TransactionDetails | undefined {
-              if (effect.fn === fetchFiatOnRampTransaction) {
+              if (effect.fn === fetchMoonpayTransaction) {
                 switch (fetchCalledCount++) {
                   case 0:
                   case 1:
@@ -210,9 +197,9 @@ describe(watchFiatOnRampTransaction, () => {
               }
             },
           },
-          [delay(PollingInterval.Fast), Promise.resolve(() => undefined)],
+          [delay(PollingInterval.Normal), Promise.resolve(() => undefined)],
         ])
-        .delay(PollingInterval.Fast)
+        .delay(PollingInterval.Normal)
         // only called once
         .put(transactionActions.upsertFiatOnRampTransaction(confirmedTx))
         .silentRun()
@@ -230,7 +217,7 @@ describe(watchFiatOnRampTransaction, () => {
         .provide([
           {
             call(effect): TransactionDetails | undefined {
-              if (effect.fn === fetchFiatOnRampTransaction) {
+              if (effect.fn === fetchMoonpayTransaction) {
                 switch (fetchCalledCount++) {
                   case 0:
                   case 1:
@@ -256,7 +243,7 @@ describe(watchFiatOnRampTransaction, () => {
     const confirmedTx = { ...txDetailsPending, status: TransactionStatus.Success }
     return expectSaga(watchFiatOnRampTransaction, txDetailsPending)
       .provide([
-        [call(fetchFiatOnRampTransaction, txDetailsPending, false), confirmedTx],
+        [call(fetchMoonpayTransaction, txDetailsPending), confirmedTx],
         [matchers.call.fn(sendAnalyticsEvent), undefined],
       ])
       .put(transactionActions.upsertFiatOnRampTransaction(confirmedTx))
diff --git a/packages/wallet/src/features/transactions/transactionWatcherSaga.ts b/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
index 92dcb3fe420..9260441869d 100644
--- a/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
+++ b/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
@@ -3,7 +3,7 @@ import { ApolloClient, NormalizedCacheObject } from '@apollo/client'
 import { SwapEventName } from '@uniswap/analytics-events'
 import { TradeType } from '@uniswap/sdk-core'
 import { BigNumberish, providers } from 'ethers'
-import { call, delay, fork, put, race, take, takeEvery } from 'typed-redux-saga'
+import { call, delay, fork, put, race, select, take, takeEvery } from 'typed-redux-saga'
 import { isWeb } from 'ui/src'
 import { PollingInterval } from 'uniswap/src/constants/misc'
 import { FeatureFlags, getFeatureFlagName } from 'uniswap/src/features/gating/flags'
@@ -20,7 +20,7 @@ import { WalletChainId } from 'uniswap/src/types/chains'
 import { logger } from 'utilities/src/logger/logger'
 import { selectExtensionBetaFeedbackState } from 'wallet/src/features/behaviorHistory/selectors'
 import { ExtensionBetaFeedbackState, setExtensionBetaFeedbackState } from 'wallet/src/features/behaviorHistory/slice'
-import { fetchFiatOnRampTransaction } from 'wallet/src/features/fiatOnRamp/api'
+import { fetchFiatOnRampTransaction, fetchMoonpayTransaction } from 'wallet/src/features/fiatOnRamp/api'
 import { FiatOnRampTransactionDetails } from 'wallet/src/features/fiatOnRamp/types'
 import { pushNotification, setNotificationStatus } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
@@ -50,7 +50,8 @@ import {
   isFinalizedTx,
 } from 'wallet/src/features/transactions/types'
 import { getFinalizedTransactionStatus, receiptFromEthersReceipt } from 'wallet/src/features/transactions/utils'
-import { getProvider } from 'wallet/src/features/wallet/context'
+import { getProvider, getSignerManager } from 'wallet/src/features/wallet/context'
+import { selectActiveAccount } from 'wallet/src/features/wallet/selectors'
 import { appSelect } from 'wallet/src/state'
 
 export function* transactionWatcher({ apolloClient }: { apolloClient: ApolloClient<NormalizedCacheObject> }) {
@@ -111,13 +112,40 @@ export function* transactionWatcher({ apolloClient }: { apolloClient: ApolloClie
 }
 
 export function* fetchUpdatedFiatOnRampTransaction(transaction: FiatOnRampTransactionDetails, forceFetch: boolean) {
-  return yield* call(fetchFiatOnRampTransaction, transaction, forceFetch)
+  const activeAccount = yield* select(selectActiveAccount)
+  if (!activeAccount) {
+    return
+  }
+  const signerManager = yield* call(getSignerManager)
+
+  return yield* call(
+    fetchFiatOnRampTransaction,
+    /** previousTransactionDetails= */ transaction,
+    forceFetch,
+    activeAccount,
+    signerManager,
+  )
+}
+
+export function* fetchUpdatedMoonpayTransaction(transaction: FiatOnRampTransactionDetails) {
+  return yield* call(fetchMoonpayTransaction, /** previousTransactionDetails= */ transaction)
 }
 
 export function* watchFiatOnRampTransaction(transaction: FiatOnRampTransactionDetails) {
+  // we want to re-fetch this every time we've added a transaction,
+  // as this feature flag could be changed after the app has started
+  const useOldMoonpayIntegration = !Statsig.checkGate(getFeatureFlagName(FeatureFlags.ForAggregator))
+
   const { id } = transaction
 
-  logger.debug('transactionWatcherSaga', 'watchFiatOnRampTransaction', 'Watching for updates for fiat onramp tx:', id)
+  logger.debug(
+    'transactionWatcherSaga',
+    'watchFiatOnRampTransaction',
+    'Watching for updates for fiat onramp tx:',
+    id,
+    'useOldMoonpayIntegration:',
+    useOldMoonpayIntegration,
+  )
 
   let latestStatus = transaction.status
   let syncedWithBackend = transaction.typeInfo.syncedWithBackend
@@ -125,7 +153,9 @@ export function* watchFiatOnRampTransaction(transaction: FiatOnRampTransactionDe
 
   try {
     while (true) {
-      const updatedTransaction = yield* fetchUpdatedFiatOnRampTransaction(transaction, forceFetch)
+      const updatedTransaction = yield* useOldMoonpayIntegration
+        ? fetchUpdatedMoonpayTransaction(transaction)
+        : fetchUpdatedFiatOnRampTransaction(transaction, forceFetch)
 
       forceFetch = false
       // We've got an invalid response from backend
@@ -186,7 +216,7 @@ export function* watchFiatOnRampTransaction(transaction: FiatOnRampTransactionDe
       // try again after a waiting period or when we've come back WebView
       const raceResult = yield* race({
         forceFetch: take(forceFetchFiatOnRampTransactions),
-        timeout: delay(PollingInterval.Fast),
+        timeout: delay(useOldMoonpayIntegration ? PollingInterval.Normal : PollingInterval.Fast),
       })
 
       if (raceResult.forceFetch) {
diff --git a/packages/wallet/src/features/transactions/transfer/TokenSelectorPanel.tsx b/packages/wallet/src/features/transactions/transfer/TokenSelectorPanel.tsx
index b2b222468bd..6394bdf1610 100644
--- a/packages/wallet/src/features/transactions/transfer/TokenSelectorPanel.tsx
+++ b/packages/wallet/src/features/transactions/transfer/TokenSelectorPanel.tsx
@@ -1,31 +1,17 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, LayoutAnimation } from 'react-native'
 import { Flex, Text, TouchableArea } from 'ui/src'
 import { RotatableChevron } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
 import { CurrencyLogo } from 'uniswap/src/components/CurrencyLogo/CurrencyLogo'
-import { TokenSelector, TokenSelectorVariation } from 'uniswap/src/components/TokenSelector/TokenSelector'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { SearchContext } from 'uniswap/src/features/search/SearchContext'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { NumberType } from 'utilities/src/format/types'
-import {
-  useAddToSearchHistory,
-  useCommonTokensOptions,
-  useFavoriteTokensOptions,
-  useFilterCallbacks,
-  usePopularTokensOptions,
-  usePortfolioTokenOptions,
-  useTokenSectionsForEmptySearch,
-  useTokenSectionsForSearchResults,
-} from 'wallet/src/components/TokenSelector/hooks'
+import { TokenSelector, TokenSelectorVariation } from 'wallet/src/components/TokenSelector/TokenSelector'
 import { MaxAmountButton } from 'wallet/src/components/input/MaxAmountButton'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { SearchContext } from 'wallet/src/features/search/SearchContext'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 
 interface TokenSelectorPanelProps {
   currencyInfo: Maybe<CurrencyInfo>
@@ -49,11 +35,7 @@ export function TokenSelectorPanel({
   showTokenSelector,
 }: TokenSelectorPanelProps): JSX.Element {
   const { t } = useTranslation()
-  const { formatNumberOrString, convertFiatAmountFormatted, formatCurrencyAmount } = useLocalizationContext()
-  const { navigateToBuyOrReceiveWithEmptyWallet } = useWalletNavigation()
-  const { registerSearch } = useAddToSearchHistory()
-
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
+  const { formatCurrencyAmount } = useLocalizationContext()
 
   const showMaxButton = currencyBalance && !currencyBalance.equalTo(0)
   const formattedCurrencyBalance = formatCurrencyAmount({
@@ -65,26 +47,11 @@ export function TokenSelectorPanel({
     return (
       <Flex fill overflow="hidden">
         <TokenSelector
-          activeAccountAddress={activeAccountAddress}
-          addToSearchHistoryCallback={registerSearch}
-          convertFiatAmountFormattedCallback={convertFiatAmountFormatted}
           currencyField={CurrencyField.INPUT}
           flow={TokenSelectorFlow.Transfer}
-          formatNumberOrStringCallback={formatNumberOrString}
           isSurfaceReady={true}
-          navigateToBuyOrReceiveWithEmptyWalletCallback={navigateToBuyOrReceiveWithEmptyWallet}
-          useCommonTokensOptionsHook={useCommonTokensOptions}
-          useFavoriteTokensOptionsHook={useFavoriteTokensOptions}
-          useFilterCallbacksHook={useFilterCallbacks}
-          usePopularTokensOptionsHook={usePopularTokensOptions}
-          usePortfolioTokenOptionsHook={usePortfolioTokenOptions}
-          useTokenSectionsForEmptySearchHook={useTokenSectionsForEmptySearch}
-          useTokenSectionsForSearchResultsHook={useTokenSectionsForSearchResults}
-          useTokenWarningDismissedHook={useTokenWarningDismissed}
           variation={TokenSelectorVariation.BalancesOnly}
           onClose={onHideTokenSelector}
-          onDismiss={() => Keyboard.dismiss()}
-          onPressAnimation={() => LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)}
           onSelectCurrency={onSelectCurrency}
         />
       </Flex>
diff --git a/packages/wallet/src/features/transactions/transfer/TransferAmountInput.tsx b/packages/wallet/src/features/transactions/transfer/TransferAmountInput.tsx
index 211a9458092..7aacd659a42 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferAmountInput.tsx
+++ b/packages/wallet/src/features/transactions/transfer/TransferAmountInput.tsx
@@ -5,12 +5,12 @@ import { Flex, FlexProps, Text, TouchableArea } from 'ui/src'
 import { ArrowUpDown } from 'ui/src/components/icons'
 import { fonts } from 'ui/src/theme'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { AmountInput } from 'wallet/src/components/input/AmountInput'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
 import { ParsedWarnings } from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
 import { useTokenAndFiatDisplayAmounts } from 'wallet/src/features/transactions/hooks/useTokenAndFiatDisplayAmounts'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
 
 type TransferAmountInputProps = {
diff --git a/packages/wallet/src/features/transactions/transfer/TransferReview.tsx b/packages/wallet/src/features/transactions/transfer/TransferReview.tsx
index fe6c5f94f4c..42eec6ff17d 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferReview.tsx
+++ b/packages/wallet/src/features/transactions/transfer/TransferReview.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { iconSizes } from 'ui/src/theme'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { NumberType } from 'utilities/src/format/types'
 import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
@@ -15,6 +14,7 @@ import { TransactionReview } from 'wallet/src/features/transactions/TransactionR
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import { ParsedWarnings } from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
 import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountAddressWithThrow, useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx b/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx
index 8f3fe70d4e6..3c78d30e900 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx
+++ b/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx
@@ -13,8 +13,6 @@ import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { TextInputProps } from 'uniswap/src/components/input/TextInput'
 import { ModalName } from 'uniswap/src/features/telemetry/constants'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'uniswap/src/features/transactions/transfer/types'
 import { TestID } from 'uniswap/src/test/fixtures/testIDs'
 import { usePrevious } from 'utilities/src/react/hooks'
 import { TransferArrowButton } from 'wallet/src/components/buttons/TransferArrowButton'
@@ -30,10 +28,15 @@ import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions
 import { useUSDCValue } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDCPrice'
 import { useUSDTokenUpdater } from 'wallet/src/features/transactions/swap/trade/hooks/useUSDTokenUpdater'
 import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { TransferFormSpeedbumps } from 'wallet/src/features/transactions/transfer/TransferFormWarnings'
 import { useSetShowRecipientSelector } from 'wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector'
 import { useShowSendNetworkNotification } from 'wallet/src/features/transactions/transfer/hooks/useShowSendNetworkNotification'
-import { DerivedTransferInfo, TransferSpeedbump } from 'wallet/src/features/transactions/transfer/types'
+import {
+  DerivedTransferInfo,
+  TokenSelectorFlow,
+  TransferSpeedbump,
+} from 'wallet/src/features/transactions/transfer/types'
 import { createTransactionId } from 'wallet/src/features/transactions/utils'
 import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlocked, useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
diff --git a/packages/wallet/src/features/transactions/transfer/getSendPrefilledState.ts b/packages/wallet/src/features/transactions/transfer/getSendPrefilledState.ts
index 87c1cc3291f..4ed18e3fd92 100644
--- a/packages/wallet/src/features/transactions/transfer/getSendPrefilledState.ts
+++ b/packages/wallet/src/features/transactions/transfer/getSendPrefilledState.ts
@@ -1,7 +1,7 @@
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { AssetType, CurrencyAsset } from 'uniswap/src/entities/assets'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
+import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 
 export function getSendPrefilledState({
   chainId,
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts b/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts
index 619a5b40bb8..6731624d58b 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts
+++ b/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts
@@ -1,11 +1,11 @@
 import { useMemo } from 'react'
-import { AssetType } from 'uniswap/src/entities/assets'
-import { CurrencyField, TransactionState } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useNFT } from 'wallet/src/features/nfts/hooks'
 import { useOnChainCurrencyBalance, useOnChainNativeCurrencyBalance } from 'wallet/src/features/portfolio/api'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
+import { CurrencyField, TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
 import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts b/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts
index 5a73c29d6a0..c15c3adb690 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts
+++ b/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts
@@ -1,11 +1,11 @@
 import { providers } from 'ethers'
 import { useMemo } from 'react'
-import { useDispatch } from 'react-redux'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { WalletChainId } from 'uniswap/src/types/chains'
+import { AssetType } from 'wallet/src/entities/assets'
 import { transferTokenActions } from 'wallet/src/features/transactions/transfer/transferTokenSaga'
 import { TransferTokenParams } from 'wallet/src/features/transactions/transfer/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
+import { useAppDispatch } from 'wallet/src/state'
 
 /** Helper transfer callback for ERC20s */
 export function useTransferERC20Callback(
@@ -71,7 +71,7 @@ function useTransferCallback(
   txRequest?: providers.TransactionRequest,
   onSubmit?: () => void,
 ): null | (() => void) {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   return useMemo(() => {
     if (!transferTokenParams || !txRequest) {
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts b/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts
index 2a2e20619bf..dedbcc098fd 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts
+++ b/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts
@@ -4,13 +4,13 @@ import ERC1155_ABI from 'uniswap/src/abis/erc1155.json'
 import ERC20_ABI from 'uniswap/src/abis/erc20.json'
 import ERC721_ABI from 'uniswap/src/abis/erc721.json'
 import { Erc1155, Erc20, Erc721 } from 'uniswap/src/abis/types'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { currencyAddress, isNativeCurrencyAddress } from 'uniswap/src/utils/currencyId'
 import { useAsyncData } from 'utilities/src/react/hooks'
+import { AssetType } from 'wallet/src/entities/assets'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import {
   DerivedTransferInfo,
   TransferCurrencyParams,
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts b/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts
index 15d76937d22..1a21cdc7785 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts
+++ b/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts
@@ -1,16 +1,15 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
-import { AssetType } from 'uniswap/src/entities/assets'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import i18n from 'uniswap/src/i18n/i18n'
-import { uniCurrencyInfo } from 'uniswap/src/test/fixtures'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { AssetType } from 'wallet/src/entities/assets'
 import { GQLNftAsset } from 'wallet/src/features/nfts/hooks'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { getTransferWarnings } from 'wallet/src/features/transactions/transfer/hooks/useTransferWarnings'
 import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
 import { isOffline } from 'wallet/src/features/transactions/utils'
-import { networkDown, networkUnknown, networkUp } from 'wallet/src/test/fixtures'
+import { networkDown, networkUnknown, networkUp, uniCurrencyInfo } from 'wallet/src/test/fixtures'
 
 const ETH = NativeCurrency.onChain(UniverseChainId.Mainnet)
 
@@ -170,7 +169,11 @@ describe(getTransferWarnings, () => {
       },
     }
 
-    const warnings = getTransferWarnings(i18n.t, incompleteAndInsufficientBalanceState, isOffline(networkUp()))
+    const warnings = getTransferWarnings(
+      i18n.t,
+      incompleteAndInsufficientBalanceState,
+      isOffline(networkUp())
+    )
     expect(warnings.length).toBe(2)
   })
 })
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts b/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts
index 31ff3fe3f2a..6a3939bc124 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts
+++ b/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts
@@ -2,7 +2,6 @@ import { useNetInfo } from '@react-native-community/netinfo'
 import { TFunction } from 'i18next'
 import _ from 'lodash'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { currencyAddress } from 'uniswap/src/utils/currencyId'
 import { useMemoCompare } from 'utilities/src/react/hooks'
@@ -14,6 +13,7 @@ import {
   WarningLabel,
   WarningSeverity,
 } from 'wallet/src/features/transactions/WarningModal/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
 import { isOffline } from 'wallet/src/features/transactions/utils'
 
diff --git a/packages/wallet/src/features/transactions/transfer/transferTokenSaga.test.ts b/packages/wallet/src/features/transactions/transfer/transferTokenSaga.test.ts
index d84bfa6e864..1edf6f5fb04 100644
--- a/packages/wallet/src/features/transactions/transfer/transferTokenSaga.test.ts
+++ b/packages/wallet/src/features/transactions/transfer/transferTokenSaga.test.ts
@@ -3,12 +3,15 @@ import { BigNumber } from 'ethers'
 import { expectSaga } from 'redux-saga-test-plan'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { DAI } from 'uniswap/src/constants/tokens'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { DAI } from 'wallet/src/constants/tokens'
+import { AssetType } from 'wallet/src/entities/assets'
 import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
 import { transferToken } from 'wallet/src/features/transactions/transfer/transferTokenSaga'
-import { TransferCurrencyParams, TransferNFTParams } from 'wallet/src/features/transactions/transfer/types'
+import {
+  TransferCurrencyParams,
+  TransferNFTParams,
+} from 'wallet/src/features/transactions/transfer/types'
 import { SendTokenTransactionInfo, TransactionType } from 'wallet/src/features/transactions/types'
 import { getContractManager, getProvider } from 'wallet/src/features/wallet/context'
 import { getTxFixtures, signerMnemonicAccount } from 'wallet/src/test/fixtures'
diff --git a/packages/wallet/src/features/transactions/transfer/transferTokenSaga.ts b/packages/wallet/src/features/transactions/transfer/transferTokenSaga.ts
index 91d70001ed9..e833c60dec9 100644
--- a/packages/wallet/src/features/transactions/transfer/transferTokenSaga.ts
+++ b/packages/wallet/src/features/transactions/transfer/transferTokenSaga.ts
@@ -4,11 +4,11 @@ import ERC1155_ABI from 'uniswap/src/abis/erc1155.json'
 import ERC20_ABI from 'uniswap/src/abis/erc20.json'
 import ERC721_ABI from 'uniswap/src/abis/erc721.json'
 import { Erc1155, Erc20, Erc721 } from 'uniswap/src/abis/types'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { isNativeCurrencyAddress } from 'uniswap/src/utils/currencyId'
 import { logger } from 'utilities/src/logger/logger'
+import { AssetType } from 'wallet/src/entities/assets'
 import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
 import { TransferTokenParams } from 'wallet/src/features/transactions/transfer/types'
 import { SendTokenTransactionInfo, TransactionType } from 'wallet/src/features/transactions/types'
diff --git a/packages/wallet/src/features/transactions/transfer/types.ts b/packages/wallet/src/features/transactions/transfer/types.ts
index 2ec37ba6422..4cb5b046f07 100644
--- a/packages/wallet/src/features/transactions/transfer/types.ts
+++ b/packages/wallet/src/features/transactions/transfer/types.ts
@@ -1,9 +1,9 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { AssetType, NFTAssetType } from 'uniswap/src/entities/assets'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { CurrencyField } from 'uniswap/src/features/transactions/transactionState/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
+import { AssetType, NFTAssetType } from 'wallet/src/entities/assets'
 import { GQLNftAsset } from 'wallet/src/features/nfts/hooks'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 
 interface BaseTransferParams {
@@ -58,3 +58,8 @@ export interface TransferSpeedbump {
   hasWarning: boolean
   loading: boolean
 }
+
+export enum TokenSelectorFlow {
+  Swap,
+  Transfer,
+}
diff --git a/packages/wallet/src/features/transactions/types.ts b/packages/wallet/src/features/transactions/types.ts
index 3958e7823db..648cbd63dfb 100644
--- a/packages/wallet/src/features/transactions/types.ts
+++ b/packages/wallet/src/features/transactions/types.ts
@@ -4,11 +4,11 @@ import { TradeType } from '@uniswap/sdk-core'
 import { providers } from 'ethers'
 import { Dispatch } from 'react'
 import { TransactionListQuery } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { AssetType } from 'uniswap/src/entities/assets'
 import { FORLogo } from 'uniswap/src/features/fiatOnRamp/types'
 import { WalletChainId } from 'uniswap/src/types/chains'
 import { DappInfo } from 'uniswap/src/types/walletConnect'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { AssetType } from 'wallet/src/entities/assets'
 import { MoonpayCurrency } from 'wallet/src/features/fiatOnRamp/types'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { ParsedWarnings } from 'wallet/src/features/transactions/hooks/useParsedTransactionWarnings'
diff --git a/packages/wallet/src/features/transactions/utils.test.ts b/packages/wallet/src/features/transactions/utils.test.ts
index fc8432f07a0..7288e47f371 100644
--- a/packages/wallet/src/features/transactions/utils.test.ts
+++ b/packages/wallet/src/features/transactions/utils.test.ts
@@ -1,7 +1,6 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
-import { MAINNET_CURRENCY } from 'uniswap/src/test/fixtures'
 import { hasSufficientFundsIncludingGas, isOffline } from 'wallet/src/features/transactions/utils'
-import { networkDown, networkUnknown, networkUp } from 'wallet/src/test/fixtures'
+import { MAINNET_CURRENCY, networkDown, networkUnknown, networkUp } from 'wallet/src/test/fixtures'
 
 const ZERO_ETH = CurrencyAmount.fromRawAmount(MAINNET_CURRENCY, 0)
 const ONE_ETH = CurrencyAmount.fromRawAmount(MAINNET_CURRENCY, 1e18)
diff --git a/packages/wallet/src/features/unitags/hooks.ts b/packages/wallet/src/features/unitags/hooks.ts
index 22a67a4eaea..937e25410a1 100644
--- a/packages/wallet/src/features/unitags/hooks.ts
+++ b/packages/wallet/src/features/unitags/hooks.ts
@@ -2,7 +2,6 @@ import { TFunction } from 'i18next'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { getUniqueId } from 'react-native-device-info'
-import { useDispatch } from 'react-redux'
 import { FeatureFlags } from 'uniswap/src/features/gating/flags'
 import { useFeatureFlag } from 'uniswap/src/features/gating/hooks'
 import { UnitagEventName } from 'uniswap/src/features/telemetry/constants'
@@ -35,7 +34,7 @@ import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useWalletSigners } from 'wallet/src/features/wallet/context'
 import { useAccounts, useActiveAccount, useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { SignerManager } from 'wallet/src/features/wallet/signing/SignerManager'
-import { useAppSelector } from 'wallet/src/state'
+import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 const MIN_UNITAG_LENGTH = 3
 const MAX_UNITAG_LENGTH = 20
@@ -155,7 +154,7 @@ export const useClaimUnitag = (): ((
   account?: Account,
 ) => Promise<{ claimError?: string }>) => {
   const { t } = useTranslation()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const { data: deviceId } = useAsyncData(getUniqueId)
   const accounts = useAccounts()
   const signerManager = useWalletSigners()
@@ -290,7 +289,7 @@ export const useShowExtensionPromoBanner = (): {
   loading: boolean
   showExtensionPromoBanner: boolean
 } => {
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
   const extensionOnboardingEnabledBeta = useFeatureFlag(FeatureFlags.ExtensionOnboarding)
   const extensionPromotionGAEnabled = useFeatureFlag(FeatureFlags.ExtensionPromotionGA)
   const extensionOnboardingState = useAppSelector(selectExtensionOnboardingState)
diff --git a/packages/wallet/src/features/wallet/Keyring/Keyring.test.ts b/packages/wallet/src/features/wallet/Keyring/Keyring.test.ts
index a577fcbab8b..839f8cc07cf 100644
--- a/packages/wallet/src/features/wallet/Keyring/Keyring.test.ts
+++ b/packages/wallet/src/features/wallet/Keyring/Keyring.test.ts
@@ -33,8 +33,12 @@ jest.mock('./crypto', () => ({
   }),
   generateNewSalt: jest
     .fn()
-    .mockReturnValue(new Uint8Array([190, 197, 42, 2, 229, 18, 122, 161, 234, 166, 219, 110, 247, 102, 197, 214])),
-  generateNewIV: jest.fn().mockReturnValue(new Uint8Array([142, 65, 15, 198, 69, 200, 74, 43, 159, 8, 170, 46])),
+    .mockReturnValue(
+      new Uint8Array([190, 197, 42, 2, 229, 18, 122, 161, 234, 166, 219, 110, 247, 102, 197, 214])
+    ),
+  generateNewIV: jest
+    .fn()
+    .mockReturnValue(new Uint8Array([142, 65, 15, 198, 69, 200, 74, 43, 159, 8, 170, 46])),
 }))
 
 const mockStore = async ({ data }: { data: Record<string, string> }): Promise<void> => {
diff --git a/packages/wallet/src/features/wallet/Keyring/Keyring.web.ts b/packages/wallet/src/features/wallet/Keyring/Keyring.web.ts
new file mode 100644
index 00000000000..f48a9f1ea81
--- /dev/null
+++ b/packages/wallet/src/features/wallet/Keyring/Keyring.web.ts
@@ -0,0 +1,548 @@
+/* eslint-disable max-lines */
+import { Signature, Wallet } from 'ethers'
+import { SigningKey, defaultPath, joinSignature } from 'ethers/lib/utils'
+import { logger } from 'utilities/src/logger/logger'
+import { IKeyring } from 'wallet/src/features/wallet/Keyring/Keyring'
+import {
+  PBKDF2_PARAMS,
+  SecretPayload,
+  convertBase64SeedToCryptoKey,
+  decodeFromStorage,
+  decrypt,
+  encodeForStorage,
+  encrypt,
+  exportKey,
+  generateNewIV,
+  generateNewSalt,
+  getEncryptionKeyFromPassword,
+} from 'wallet/src/features/wallet/Keyring/crypto'
+import { ENCRYPTION_KEY_STORAGE_KEY, PersistedStorage, prefix } from 'wallet/src/utils/persistedStorage'
+
+const mnemonicPrefix = '.mnemonic.'
+const privateKeyPrefix = '.privateKey.'
+const entireMnemonicPrefix = prefix + mnemonicPrefix
+const entirePrivateKeyPrefix = prefix + privateKeyPrefix
+
+enum ErrorType {
+  StoreMnemonicError = 'storeMnemonicError',
+  RetrieveMnemonicError = 'retrieveMnemonicError',
+  RetrievePasswordError = 'retrievePasswordError',
+}
+
+/**
+ * Provides the generation, storage, and signing logic for mnemonics and private keys on web.
+ *
+ * Mnemonics and private keys are stored and accessed in secure local key-value store via associated keys formed from concatenating a constant prefix with the associated public address.
+ *
+ * @link https://github.com/Uniswap/universe/blob/main/apps/mobile/ios/RNEthersRS.swift
+ */
+export class WebKeyring implements IKeyring {
+  constructor(
+    private storage = new PersistedStorage('local'),
+    private session = new PersistedStorage('session'),
+  ) {
+    this.generateAndStoreMnemonic = this.generateAndStoreMnemonic.bind(this)
+    this.generateAddressForMnemonic = this.generateAddressForMnemonic.bind(this)
+    this.generateAndStorePrivateKey = this.generateAndStorePrivateKey.bind(this)
+    this.getMnemonicIds = this.getMnemonicIds.bind(this)
+    this.importMnemonic = this.importMnemonic.bind(this)
+    this.keyForMnemonicId = this.keyForMnemonicId.bind(this)
+    this.keyForPrivateKey = this.keyForPrivateKey.bind(this)
+    this.retrieveMnemonic = this.retrieveMnemonic.bind(this)
+    this.retrieveMnemonicUnlocked = this.retrieveMnemonicUnlocked.bind(this)
+    this.storeNewMnemonic = this.storeNewMnemonic.bind(this)
+    this.unlock = this.unlock.bind(this)
+    this.lock = this.lock.bind(this)
+  }
+
+  /**
+   * Fetches all mnemonic IDs, which are used as keys to access the actual mnemonics
+   * in key-value store.
+   * @param mnemonic
+   * @returns array of mnemonic IDs
+   */
+  async getMnemonicIds(): Promise<string[]> {
+    const allKeys = Object.keys(await this.storage.getAll())
+
+    const mnemonicIds = allKeys
+      .filter((k) => k.includes(mnemonicPrefix))
+      .map((k) => k.replaceAll(entireMnemonicPrefix, ''))
+
+    return mnemonicIds
+  }
+
+  async removeAllMnemonicsAndPrivateKeys(): Promise<boolean> {
+    const allKeys = Object.keys(await this.storage.getAll())
+
+    const mnemonicStorageKeys = allKeys.filter((k) => k.includes(mnemonicPrefix))
+    const privateKeyStorageKeys = allKeys.filter((k) => k.includes(privateKeyPrefix))
+
+    await this.storage.removeItem(mnemonicStorageKeys)
+    await this.storage.removeItem(privateKeyStorageKeys)
+
+    return true
+  }
+
+  async isUnlocked(): Promise<boolean> {
+    const firstMnemonicId = (await this.getMnemonicIds())[0]
+
+    if (!firstMnemonicId) {
+      return false
+    }
+
+    try {
+      const mnemonic = await this.retrieveMnemonicUnlocked(firstMnemonicId)
+      return !!mnemonic
+    } catch {
+      return false
+    }
+  }
+
+  /** Tries to unlock the wallet with the provided password.  */
+  async unlock(password: string): Promise<boolean> {
+    // assumes every mnemonic is encrypted withe same password
+    const firstMnemonicId = (await this.getMnemonicIds())[0]
+
+    if (!firstMnemonicId) {
+      throw new Error(`${ErrorType.RetrieveMnemonicError}: Attempted to unlock wallet, but storage is empty.`)
+    }
+
+    const mnemonicKey = this.keyForMnemonicId(firstMnemonicId)
+    const storedSecretPayload = await this.storage.getItem(mnemonicKey)
+    if (!storedSecretPayload) {
+      return false
+    }
+    const secretPayload = JSON.parse(storedSecretPayload) as Maybe<SecretPayload>
+    if (!secretPayload) {
+      return false
+    }
+    const encryptionKey = await getEncryptionKeyFromPassword(password, secretPayload)
+    const mnemonic = await this.retrieveMnemonic(secretPayload, encryptionKey, firstMnemonicId)
+    if (!mnemonic) {
+      return false
+    }
+
+    const keyBase64 = await exportKey(encryptionKey)
+
+    await this.session.setItem(ENCRYPTION_KEY_STORAGE_KEY, keyBase64)
+    return true
+  }
+
+  async lock(): Promise<boolean> {
+    await this.session.removeItem(ENCRYPTION_KEY_STORAGE_KEY) // Clear password
+    return true
+  }
+
+  async checkPassword(password: string): Promise<boolean> {
+    try {
+      const currentPasswordBase64String = await this.session.getItem(ENCRYPTION_KEY_STORAGE_KEY)
+      const firstMnemonicId = (await this.getMnemonicIds())[0]
+      if (!firstMnemonicId) {
+        return false
+      }
+      const keyForMnemonicId = this.keyForMnemonicId(firstMnemonicId)
+      const storedSecretPayload = await this.storage.getItem(keyForMnemonicId)
+      if (!storedSecretPayload) {
+        return false
+      }
+      const secretPayload = JSON.parse(storedSecretPayload) as Maybe<SecretPayload>
+      if (!secretPayload || !secretPayload.ciphertext) {
+        return false
+      }
+      const passwordPasswordEncryptionKey = await getEncryptionKeyFromPassword(password, secretPayload)
+      const passwordPasswordBase64String = await exportKey(passwordPasswordEncryptionKey)
+      return currentPasswordBase64String === passwordPasswordBase64String
+    } catch (_e) {
+      return false
+    }
+  }
+
+  async removePassword(): Promise<boolean> {
+    await this.session.removeItem(ENCRYPTION_KEY_STORAGE_KEY)
+    return true
+  }
+
+  /**
+   * Changes the password by re-encrypting the mnemonic with a new password
+   * @param newPassword new password to encrypt with
+   * @returns true if successful
+   */
+  async changePassword(newPassword: string): Promise<boolean> {
+    try {
+      const firstMnemonicId = (await this.getMnemonicIds())[0]
+
+      if (!firstMnemonicId) {
+        throw new Error(`${ErrorType.RetrieveMnemonicError}: Attempted to change password, but storage is empty.`)
+      }
+
+      const mnemonic = await this.retrieveMnemonicUnlocked(firstMnemonicId)
+      if (!mnemonic) {
+        return false
+      }
+
+      await this.importMnemonic(mnemonic, newPassword, true)
+      return true
+    } catch (err) {
+      logger.error(err, { tags: { file: 'Keyring.web.ts', function: 'changePassword' } })
+      return false
+    }
+  }
+
+  /**
+   * Derives private key from mnemonic with derivation index 0 and retrieves
+   * associated public address. Stores imported mnemonic in store with the
+   * mnemonic ID key as the public address.
+
+   * @param mnemonic the mnemonic phrase to import
+   * @param password the password to encrypt the mnemonic. Marked as optional depending on the platform.
+*                    Currently only used on web.
+   * @returns public address from the mnemonic's first derived private key
+   */
+  async importMnemonic(mnemonic: string, password: string, changingPassword = false): Promise<string> {
+    const wallet = Wallet.fromMnemonic(mnemonic)
+
+    const address = wallet.address
+
+    const mnemonicId = await this.storeNewMnemonic(mnemonic, password, address, changingPassword)
+    if (!mnemonicId) {
+      throw changingPassword
+        ? new Error(`${ErrorType.StoreMnemonicError}: Failed to store mnemonic with new password`)
+        : new Error(`${ErrorType.StoreMnemonicError}: Failed to import mnemonic`)
+    }
+
+    return mnemonicId
+  }
+
+  /**
+   * Removes the mnemonic from storage.
+   * @param mnemonicId key string associated with mnemonic to remove
+   */
+  async removeMnemonic(mnemonicId: string): Promise<boolean> {
+    const key = this.keyForMnemonicId(mnemonicId)
+    await this.storage.removeItem(key)
+    return true
+  }
+
+  /**
+   * Generates a new mnemonic and retrieves associated public address. Stores new mnemonic in native keychain with the mnemonic ID key as the public address.
+   * @param password the password to encrypt the mnemonic
+   * @returns public address from the mnemonic's first derived private key
+   */
+  async generateAndStoreMnemonic(password: string): Promise<string> {
+    const newWallet = Wallet.createRandom()
+
+    const mnemonic = newWallet.mnemonic.phrase
+    const address = newWallet.address
+
+    if (!(await this.storeNewMnemonic(mnemonic, password, address))) {
+      throw new Error(`${ErrorType.StoreMnemonicError}: Failed to generate and store mnemonic`)
+    }
+    return address
+  }
+
+  private async storeNewMnemonic(
+    mnemonic: string,
+    password: string,
+    address: string,
+    forceOverwrite = false,
+  ): Promise<string | undefined> {
+    const mnemonicKey = this.keyForMnemonicId(address)
+    const mnemonicStorageValue = await this.storage.getItem(mnemonicKey)
+
+    if (mnemonicStorageValue !== undefined && !forceOverwrite) {
+      logger.debug('Keyring.web', 'storeNewMnemonic', 'mnemonic already stored. Did you mean to reimport?')
+
+      return address
+    }
+
+    const salt = generateNewSalt()
+    const iv = generateNewIV()
+    const secretPayload: SecretPayload = {
+      ...PBKDF2_PARAMS,
+      iv: encodeForStorage(iv),
+      salt: encodeForStorage(salt),
+    }
+    const encryptionKey = await getEncryptionKeyFromPassword(password, secretPayload)
+    const ciphertext = await encrypt({
+      plaintext: mnemonic,
+      encryptionKey,
+      iv,
+      additionalData: address,
+    })
+    secretPayload.ciphertext = ciphertext
+
+    await this.storage.setItem(mnemonicKey, JSON.stringify(secretPayload))
+    const keyBase64 = await exportKey(encryptionKey)
+    await this.session.setItem(ENCRYPTION_KEY_STORAGE_KEY, keyBase64)
+
+    return address
+  }
+
+  private keyForMnemonicId(mnemonicId: string): string {
+    // NOTE: small difference with mobile implementation--native keychain prepends a custom prefix, but we must do it ourselves here.
+    return entireMnemonicPrefix + mnemonicId
+  }
+
+  private async retrieveMnemonic(
+    secretPayload: SecretPayload,
+    encryptionKey: CryptoKey,
+    expectedAddress: string,
+  ): Promise<string | undefined> {
+    try {
+      if (!secretPayload.ciphertext) {
+        return undefined
+      }
+
+      const mnemonic = await decrypt({
+        encryptionKey,
+        ciphertext: decodeFromStorage(secretPayload.ciphertext),
+        iv: decodeFromStorage(secretPayload.iv),
+        additionalData: expectedAddress,
+      })
+
+      if (!mnemonic) {
+        return undefined
+      }
+
+      // validate mnemonic (will throw if invalid)
+      Wallet.fromMnemonic(mnemonic)
+
+      return mnemonic
+    } catch (e) {
+      throw new Error(`${ErrorType.RetrieveMnemonicError}: ${e}`)
+    }
+  }
+
+  async retrieveMnemonicUnlocked(mnemonicId: string): Promise<string | undefined> {
+    const encryptionKeyString = await this.session.getItem(ENCRYPTION_KEY_STORAGE_KEY)
+    const mnemonicStorageKey = this.keyForMnemonicId(mnemonicId)
+    const storedSecret = await this.storage.getItem(mnemonicStorageKey)
+
+    if (!storedSecret || !encryptionKeyString) {
+      return undefined
+    }
+    const encryptionKey = await convertBase64SeedToCryptoKey(encryptionKeyString)
+
+    try {
+      const secretPayload = JSON.parse(storedSecret) as Maybe<SecretPayload>
+      if (!secretPayload || !secretPayload.ciphertext) {
+        return undefined
+      }
+      const mnemonic = await decrypt({
+        encryptionKey,
+        ciphertext: decodeFromStorage(secretPayload.ciphertext),
+        iv: decodeFromStorage(secretPayload.iv),
+        additionalData: mnemonicId,
+      })
+
+      if (!mnemonic) {
+        return undefined
+      }
+
+      // validate mnemonic (will throw if invalid)
+      Wallet.fromMnemonic(mnemonic)
+
+      return mnemonic
+    } catch (e) {
+      throw new Error(`${ErrorType.RetrieveMnemonicError}: ${e}`)
+    }
+  }
+
+  /**
+   * Fetches all public addresses from private keys stored under `privateKeyPrefix` in store.
+   * Used from to verify the store has the private key for an account that is attempting create a NativeSigner that calls signing methods
+   * @returns public addresses for all stored private keys
+   */
+  async getAddressesForStoredPrivateKeys(): Promise<string[]> {
+    const addresses = Object.keys(await this.storage.getAll())
+      .filter((k) => k.includes(privateKeyPrefix))
+      .map((k) => k.replaceAll(entirePrivateKeyPrefix, ''))
+
+    return addresses
+  }
+
+  /**
+   * Derives public address from mnemonic for a given `derivationIndex`.
+   * @param mnemonic mnemonic to generate public address for
+   * @param derivationIndex number used to specify a which derivation index to use for deriving a private key from the mnemonic
+   * @returns public address associated with private key generated from the mnemonic at given derivation index
+   */
+  async generateAddressForMnemonic(mnemonic: string, derivationIndex: number): Promise<string> {
+    const derivationPath = defaultPath + derivationIndex
+    const walletAtIndex = Wallet.fromMnemonic(mnemonic, derivationPath)
+    return walletAtIndex.address
+  }
+
+  /**
+   * Derives private key and public address from mnemonic associated with `mnemonicId` for given `derivationIndex`. Stores the private key in store with key.
+   * @param mnemonicId key string associated with mnemonic to generate private key for (currently convention is to use public address associated with mnemonic)
+   * @param derivationIndex number used to specify a which derivation index to use for deriving a private key from the mnemonic
+   * @returns public address associated with private key generated from the mnemonic at given derivation index
+   */
+  async generateAndStorePrivateKey(mnemonicId: string, derivationIndex: number): Promise<string> {
+    const encryptionKeyString = await this.session.getItem(ENCRYPTION_KEY_STORAGE_KEY)
+    if (!encryptionKeyString) {
+      throw new Error(ErrorType.RetrievePasswordError)
+    }
+    const encryptionKey = await convertBase64SeedToCryptoKey(encryptionKeyString)
+    const mnemonicKey = this.keyForMnemonicId(mnemonicId)
+    const storedSecretPayload = await this.storage.getItem(mnemonicKey)
+    if (!storedSecretPayload) {
+      throw new Error(ErrorType.RetrieveMnemonicError)
+    }
+    const secretPayload = JSON.parse(storedSecretPayload) as Maybe<SecretPayload>
+    if (!secretPayload || !secretPayload.ciphertext) {
+      throw new Error(ErrorType.RetrieveMnemonicError)
+    }
+    const mnemonic = await this.retrieveMnemonic(secretPayload, encryptionKey, mnemonicId)
+
+    if (!mnemonic) {
+      throw new Error(ErrorType.RetrieveMnemonicError)
+    }
+
+    const derivationPath = defaultPath + derivationIndex
+    const walletAtIndex = Wallet.fromMnemonic(mnemonic, derivationPath)
+
+    const privateKey = walletAtIndex.privateKey
+    const address = walletAtIndex.address
+
+    return await this.storeNewPrivateKey(address, privateKey)
+  }
+
+  /**
+   * Removes the private key from storage for the given address.
+   * @param address account address to remove private key for
+   * @returns success of removal
+   */
+  async removePrivateKey(address: string): Promise<boolean> {
+    const key = this.keyForPrivateKey(address)
+    try {
+      await this.storage.removeItem(key)
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+
+  /** @returns address is store call was successfull. */
+  private async storeNewPrivateKey(address: string, privateKey: string): Promise<string> {
+    const checkStored = await this.retrievePrivateKey(address)
+
+    if (checkStored !== undefined) {
+      logger.debug('Keyring.web', 'storeNewPrivateKey', 'privateKey already stored. Did you mean to reimport?')
+
+      return address
+    }
+
+    const encryptionKeyString = await this.session.getItem(ENCRYPTION_KEY_STORAGE_KEY)
+    if (!encryptionKeyString) {
+      throw new Error(ErrorType.RetrievePasswordError)
+    }
+
+    const encryptionKey = await convertBase64SeedToCryptoKey(encryptionKeyString)
+
+    try {
+      const salt = generateNewSalt()
+      const iv = generateNewIV()
+      const secretPayload: SecretPayload = {
+        ...PBKDF2_PARAMS,
+        iv: encodeForStorage(iv),
+        salt: encodeForStorage(salt),
+      }
+      const ciphertext = await encrypt({
+        plaintext: privateKey,
+        encryptionKey,
+        iv,
+        additionalData: address,
+      })
+      secretPayload.ciphertext = ciphertext
+
+      const newPrivateKeyStorageKey = this.keyForPrivateKey(address)
+      logger.debug('Keyring.web', 'storeNewPrivateKey', 'storing new private key')
+      await this.storage.setItem(newPrivateKeyStorageKey, JSON.stringify(secretPayload))
+
+      return address
+    } catch (e) {
+      throw new Error(ErrorType.StoreMnemonicError + `: ${e}`)
+    }
+  }
+
+  private async retrievePrivateKey(address: string): Promise<string | undefined> {
+    const key = this.keyForPrivateKey(address)
+    const result = await this.storage.getItem(key)
+
+    if (!result) {
+      return undefined
+    }
+
+    try {
+      const maybeSecretPayload = JSON.parse(result) as Maybe<SecretPayload>
+      const encryptionKeyString = await this.session.getItem(ENCRYPTION_KEY_STORAGE_KEY)
+      if (!encryptionKeyString || !maybeSecretPayload?.ciphertext) {
+        throw new Error(ErrorType.RetrievePasswordError)
+      }
+
+      const encryptionKey = await convertBase64SeedToCryptoKey(encryptionKeyString)
+
+      const privateKey = await decrypt({
+        encryptionKey,
+        ciphertext: decodeFromStorage(maybeSecretPayload.ciphertext),
+        iv: decodeFromStorage(maybeSecretPayload.iv),
+        additionalData: address,
+      })
+
+      if (!privateKey) {
+        return undefined
+      }
+
+      // validate private key (will throw if invalid)
+      const wallet = new Wallet(privateKey)
+      if (!wallet) {
+        throw new Error('Invalid private key')
+      }
+
+      return privateKey
+    } catch (e) {
+      throw new Error(`${ErrorType.RetrieveMnemonicError}: ${e}`)
+    }
+  }
+
+  private keyForPrivateKey(address: string): string {
+    return entirePrivateKeyPrefix + address
+  }
+
+  /**
+   * @returns the Signature of the signed transaction in string form.
+   **/
+  async signTransactionHashForAddress(address: string, hash: string, chainId: number): Promise<string> {
+    // Ethers.js doesn't differentiate between signing a random hash and signing a transaction hash
+    return this.signHashForAddress(address, hash, chainId)
+  }
+
+  // adds EIP-191 prefix
+  // https://docs.ethers.org/v5/api/signer/#Signer-signMessage
+  async signMessageForAddress(address: string, message: string): Promise<string> {
+    const privateKey = await this.retrievePrivateKey(address)
+    if (!privateKey) {
+      throw Error('No private key found for address')
+    }
+    const wallet = new Wallet(privateKey)
+    return wallet.signMessage(message)
+  }
+
+  /**
+   * signs raw 32-byte hashes
+   * @returns the Signature of the signed hash in string form.
+   **/
+  async signHashForAddress(address: string, hash: string, _chainId: number): Promise<string> {
+    const privateKey = await this.retrievePrivateKey(address)
+    if (!privateKey) {
+      throw Error('No private key found for address')
+    }
+    const signingKey = new SigningKey(privateKey)
+    const signature: Signature = signingKey.signDigest(hash)
+    return joinSignature(signature)
+  }
+}
+
+export const Keyring = new WebKeyring()
diff --git a/packages/wallet/src/features/wallet/create/createAccountsSaga.test.ts b/packages/wallet/src/features/wallet/create/createAccountsSaga.test.ts
index 7ca88550a8b..0a8c9baaa2c 100644
--- a/packages/wallet/src/features/wallet/create/createAccountsSaga.test.ts
+++ b/packages/wallet/src/features/wallet/create/createAccountsSaga.test.ts
@@ -1,14 +1,21 @@
 import dayjs from 'dayjs'
 import { expectSaga } from 'redux-saga-test-plan'
-import { Account, AccountType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
-import { CreateAccountsParams, createAccounts } from 'wallet/src/features/wallet/create/createAccountsSaga'
+import {
+  Account,
+  AccountType,
+  SignerMnemonicAccount,
+} from 'wallet/src/features/wallet/accounts/types'
+import {
+  CreateAccountsParams,
+  createAccounts,
+} from 'wallet/src/features/wallet/create/createAccountsSaga'
 import { sharedRootReducer } from 'wallet/src/state/reducer'
 import { ACCOUNT, ACCOUNT2, ACCOUNT3 } from 'wallet/src/test/fixtures'
 
 const createNativeAccounts = async (
   payload: CreateAccountsParams,
   initialAccounts = {},
-  timeout = 250,
+  timeout = 250
 ): Promise<{
   wallet: {
     accounts: Account
@@ -71,7 +78,7 @@ describe(createAccounts, () => {
           name: 'READONLY ACCOUNT',
           timeImportedMs: dayjs().valueOf(),
         },
-      },
+      }
     )
 
     const wallets = state.wallet.accounts
@@ -96,7 +103,7 @@ describe(createAccounts, () => {
           name: 'READONLY ACCOUNT',
           timeImportedMs: dayjs().valueOf(),
         },
-      },
+      }
     )
 
     const wallets = state.wallet.accounts
@@ -116,7 +123,7 @@ describe(createAccounts, () => {
       { accounts: [ACCOUNT2, ACCOUNT] },
       {
         [ACCOUNT3.address]: ACCOUNT3,
-      },
+      }
     )
 
     const wallets = state.wallet.accounts
@@ -135,7 +142,7 @@ describe(createAccounts, () => {
       { accounts: [ACCOUNT2, ACCOUNT] },
       {
         [ACCOUNT3.address]: ACCOUNT3,
-      },
+      }
     )
 
     const wallets = state.wallet.accounts
diff --git a/packages/wallet/src/features/wallet/slice.test.ts b/packages/wallet/src/features/wallet/slice.test.ts
index 31178c0352b..3e52aff2e67 100644
--- a/packages/wallet/src/features/wallet/slice.test.ts
+++ b/packages/wallet/src/features/wallet/slice.test.ts
@@ -51,7 +51,7 @@ describe(walletReducer, () => {
 
   it('throws when setting unknown active account', () => {
     expect(() => store.dispatch(setAccountAsActive(ACCOUNT_1.address))).toThrow(
-      `Cannot activate missing account ${ACCOUNT_1.address}`,
+      `Cannot activate missing account ${ACCOUNT_1.address}`
     )
   })
 
@@ -89,13 +89,13 @@ describe(walletReducer, () => {
 
   it('throws when removing unknown active account', () => {
     expect(() => store.dispatch(removeAccounts([ACCOUNT_1.address]))).toThrow(
-      `Cannot remove missing account ${ACCOUNT_1.address}`,
+      `Cannot remove missing account ${ACCOUNT_1.address}`
     )
   })
 
   it('throws when removing unknown active accounts', () => {
     expect(() => store.dispatch(removeAccounts([ACCOUNT_1.address, ACCOUNT_2.address]))).toThrow(
-      `Cannot remove missing account ${ACCOUNT_1.address}`,
+      `Cannot remove missing account ${ACCOUNT_1.address}`
     )
   })
 })
diff --git a/packages/wallet/src/state/index.ts b/packages/wallet/src/state/index.ts
index ccd9c989cd4..3d4aa4c06a5 100644
--- a/packages/wallet/src/state/index.ts
+++ b/packages/wallet/src/state/index.ts
@@ -1,6 +1,6 @@
 import type { Middleware, PreloadedState, Reducer, StoreEnhancer } from '@reduxjs/toolkit'
 import { configureStore } from '@reduxjs/toolkit'
-import { TypedUseSelectorHook, useSelector } from 'react-redux'
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
 import { PersistState } from 'redux-persist'
 import createSagaMiddleware, { Saga } from 'redux-saga'
 import { SagaGenerator, select } from 'typed-redux-saga'
@@ -76,8 +76,10 @@ export function createStore({
 export type RootState = ReturnType<typeof sharedRootReducer> & {
   saga: Record<string, SagaState>
 } & { _persist?: PersistState }
+export type AppDispatch = ReturnType<typeof createStore>['dispatch']
 export type AppSelector<T> = (state: RootState) => T
 
+export const useAppDispatch: () => AppDispatch = useDispatch
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
 
 // Use in sagas for better typing when selecting from redux state
diff --git a/packages/wallet/src/state/reducer.ts b/packages/wallet/src/state/reducer.ts
index 107d2ef5bb8..856aeb3c079 100644
--- a/packages/wallet/src/state/reducer.ts
+++ b/packages/wallet/src/state/reducer.ts
@@ -1,9 +1,10 @@
 import { combineReducers } from 'redux'
-import { fiatOnRampAggregatorApi } from 'uniswap/src/features/fiatOnRamp/api'
+import { fiatOnRampAggregatorApi as sharedFiatOnRampAggregatorApi } from 'uniswap/src/features/fiatOnRamp/api'
 import { appearanceSettingsReducer } from 'wallet/src/features/appearance/slice'
 import { behaviorHistoryReducer } from 'wallet/src/features/behaviorHistory/slice'
 import { favoritesReducer } from 'wallet/src/features/favorites/slice'
 import { fiatCurrencySettingsReducer } from 'wallet/src/features/fiatCurrency/slice'
+import { fiatOnRampAggregatorApi, fiatOnRampApi } from 'wallet/src/features/fiatOnRamp/api'
 import { languageSettingsReducer } from 'wallet/src/features/language/slice'
 import { notificationReducer } from 'wallet/src/features/notifications/slice'
 import { searchHistoryReducer } from 'wallet/src/features/search/searchHistorySlice'
@@ -14,7 +15,9 @@ import { transactionReducer } from 'wallet/src/features/transactions/slice'
 import { walletReducer } from 'wallet/src/features/wallet/slice'
 
 export const sharedReducers = {
+  [fiatOnRampApi.reducerPath]: fiatOnRampApi.reducer,
   [fiatOnRampAggregatorApi.reducerPath]: fiatOnRampAggregatorApi.reducer,
+  [sharedFiatOnRampAggregatorApi.reducerPath]: sharedFiatOnRampAggregatorApi.reducer,
   appearanceSettings: appearanceSettingsReducer,
   behaviorHistory: behaviorHistoryReducer,
   favorites: favoritesReducer,
diff --git a/packages/wallet/src/test/fixtures/gql/assets/constants.ts b/packages/wallet/src/test/fixtures/constants.ts
similarity index 100%
rename from packages/wallet/src/test/fixtures/gql/assets/constants.ts
rename to packages/wallet/src/test/fixtures/constants.ts
diff --git a/packages/wallet/src/test/fixtures/gql/activities/index.ts b/packages/wallet/src/test/fixtures/gql/activities/index.ts
index b40c83ce496..5ffceb4d63e 100644
--- a/packages/wallet/src/test/fixtures/gql/activities/index.ts
+++ b/packages/wallet/src/test/fixtures/gql/activities/index.ts
@@ -6,8 +6,6 @@ import {
   TransactionStatus,
   TransactionType,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { MAX_FIXTURE_TIMESTAMP, faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import {
   erc20ApproveAssetChange,
   erc20TokenTransferOut,
@@ -15,7 +13,8 @@ import {
 } from 'wallet/src/test/fixtures/gql/activities/tokens'
 import { GQL_CHAINS } from 'wallet/src/test/fixtures/gql/misc'
 import { gqlTransaction, gqlTransactionDetails } from 'wallet/src/test/fixtures/gql/transactions'
-import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
+import { MAX_FIXTURE_TIMESTAMP, faker } from 'wallet/src/test/shared'
+import { createFixture, randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 export * from './nfts'
 export * from './swap'
 export * from './tokens'
diff --git a/packages/wallet/src/test/fixtures/gql/activities/nfts.ts b/packages/wallet/src/test/fixtures/gql/activities/nfts.ts
index 821a59d4505..f35692f1de1 100644
--- a/packages/wallet/src/test/fixtures/gql/activities/nfts.ts
+++ b/packages/wallet/src/test/fixtures/gql/activities/nfts.ts
@@ -5,10 +5,9 @@ import {
   NftTransfer,
   TransactionDirection,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { nftAsset } from 'wallet/src/test/fixtures/gql/assets'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 export const nftApproval = createFixture<NftApproval>()(() => ({
   __typename: 'NftApproval',
diff --git a/packages/wallet/src/test/fixtures/gql/activities/swap.ts b/packages/wallet/src/test/fixtures/gql/activities/swap.ts
index bf7f2caadfe..3a8c8fefc0b 100644
--- a/packages/wallet/src/test/fixtures/gql/activities/swap.ts
+++ b/packages/wallet/src/test/fixtures/gql/activities/swap.ts
@@ -3,10 +3,9 @@ import {
   SwapOrderStatus,
   SwapOrderType,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { daiToken, ethToken } from 'wallet/src/test/fixtures/gql/assets'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 export const swapOrderDetails = createFixture<SwapOrderDetails>()(() => ({
   __typename: 'SwapOrderDetails',
diff --git a/packages/wallet/src/test/fixtures/gql/activities/tokens.ts b/packages/wallet/src/test/fixtures/gql/activities/tokens.ts
index dc9c759bfc5..654a3e93026 100644
--- a/packages/wallet/src/test/fixtures/gql/activities/tokens.ts
+++ b/packages/wallet/src/test/fixtures/gql/activities/tokens.ts
@@ -5,11 +5,10 @@ import {
   TokenTransfer,
   TransactionDirection,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { amount } from 'wallet/src/test/fixtures/gql/amounts'
 import { daiToken, ethToken } from 'wallet/src/test/fixtures/gql/assets'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 /**
  * Base fixtures
diff --git a/packages/wallet/src/test/fixtures/gql/amounts.ts b/packages/wallet/src/test/fixtures/gql/amounts.ts
index d618c176d94..39c12b51ee1 100644
--- a/packages/wallet/src/test/fixtures/gql/amounts.ts
+++ b/packages/wallet/src/test/fixtures/gql/amounts.ts
@@ -3,9 +3,8 @@ import {
   Currency,
   TimestampedAmount,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { MAX_FIXTURE_TIMESTAMP, faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { MAX_FIXTURE_TIMESTAMP, faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 export const amount = createFixture<Amount>()(() => ({
   __typename: 'Amount',
diff --git a/packages/wallet/src/test/fixtures/gql/assets/index.ts b/packages/wallet/src/test/fixtures/gql/assets/index.ts
index e13db27d2ab..776b36b4145 100644
--- a/packages/wallet/src/test/fixtures/gql/assets/index.ts
+++ b/packages/wallet/src/test/fixtures/gql/assets/index.ts
@@ -1,3 +1,2 @@
-export * from './constants'
 export * from './nfts'
 export * from './tokens'
diff --git a/packages/wallet/src/test/fixtures/gql/assets/nfts.ts b/packages/wallet/src/test/fixtures/gql/assets/nfts.ts
index 95c071865ba..fdfeba498db 100644
--- a/packages/wallet/src/test/fixtures/gql/assets/nfts.ts
+++ b/packages/wallet/src/test/fixtures/gql/assets/nfts.ts
@@ -4,10 +4,9 @@ import {
   NftCollection,
   NftContract,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { GQL_CHAINS, image } from 'wallet/src/test/fixtures/gql/misc'
-import { createArray, randomChoice } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createArray, createFixture, randomChoice } from 'wallet/src/test/utils'
 
 /**
  * Base fixtures
diff --git a/packages/wallet/src/test/fixtures/gql/assets/tokens.ts b/packages/wallet/src/test/fixtures/gql/assets/tokens.ts
index affd1b5c4c5..9ab5406123e 100644
--- a/packages/wallet/src/test/fixtures/gql/assets/tokens.ts
+++ b/packages/wallet/src/test/fixtures/gql/assets/tokens.ts
@@ -12,8 +12,6 @@ import {
   TokenProjectMarket,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { toGraphQLChain } from 'uniswap/src/features/chains/utils'
-import { MAX_FIXTURE_TIMESTAMP, faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { amounts } from 'wallet/src/test/fixtures/gql/amounts'
 import { get24hPriceChange, getLatestPrice, priceHistory } from 'wallet/src/test/fixtures/gql/history'
 import { GQL_CHAINS, image } from 'wallet/src/test/fixtures/gql/misc'
@@ -27,7 +25,8 @@ import {
   USDC_POLYGON,
   WETH,
 } from 'wallet/src/test/fixtures/lib'
-import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
+import { MAX_FIXTURE_TIMESTAMP, faker } from 'wallet/src/test/shared'
+import { createFixture, randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 
 /**
  * Base fixtures
diff --git a/packages/wallet/src/test/fixtures/gql/history.ts b/packages/wallet/src/test/fixtures/gql/history.ts
index c738531ba16..56bb6927dce 100644
--- a/packages/wallet/src/test/fixtures/gql/history.ts
+++ b/packages/wallet/src/test/fixtures/gql/history.ts
@@ -3,11 +3,10 @@ import {
   HistoryDuration,
   TimestampedAmount,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { ONE_DAY_MS, ONE_HOUR_MS, ONE_MINUTE_MS } from 'utilities/src/time/time'
 import { amount, timestampedAmount } from 'wallet/src/test/fixtures/gql/amounts'
-import { createArray, randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createArray, createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 /**
  * Constants
diff --git a/packages/wallet/src/test/fixtures/gql/misc.ts b/packages/wallet/src/test/fixtures/gql/misc.ts
index e6cf1af9781..50bca8503e4 100644
--- a/packages/wallet/src/test/fixtures/gql/misc.ts
+++ b/packages/wallet/src/test/fixtures/gql/misc.ts
@@ -1,6 +1,6 @@
 import { Chain, Image } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const GQL_CHAINS = [
   Chain.Ethereum,
diff --git a/packages/wallet/src/test/fixtures/gql/portfolio.ts b/packages/wallet/src/test/fixtures/gql/portfolio.ts
index ac676ed2c22..46b0c503c90 100644
--- a/packages/wallet/src/test/fixtures/gql/portfolio.ts
+++ b/packages/wallet/src/test/fixtures/gql/portfolio.ts
@@ -1,10 +1,9 @@
 import { Portfolio } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { assetActivity } from 'wallet/src/test/fixtures/gql/activities'
 import { amount } from 'wallet/src/test/fixtures/gql/amounts'
 import { tokenBalance } from 'wallet/src/test/fixtures/gql/assets'
-import { createArray } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createArray, createFixture } from 'wallet/src/test/utils'
 
 type PortfolioOptions = {
   activitiesCount: number
diff --git a/packages/wallet/src/test/fixtures/gql/transactions.ts b/packages/wallet/src/test/fixtures/gql/transactions.ts
index 63b3d8c9fad..04959f447cb 100644
--- a/packages/wallet/src/test/fixtures/gql/transactions.ts
+++ b/packages/wallet/src/test/fixtures/gql/transactions.ts
@@ -5,9 +5,8 @@ import {
   TransactionStatus,
   TransactionType,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 export const gqlTransaction = createFixture<Transaction>()(() => ({
   __typename: 'Transaction',
diff --git a/packages/wallet/src/test/fixtures/index.ts b/packages/wallet/src/test/fixtures/index.ts
index 15c26d7917f..c2582058659 100644
--- a/packages/wallet/src/test/fixtures/index.ts
+++ b/packages/wallet/src/test/fixtures/index.ts
@@ -1,4 +1,4 @@
+export * from './constants'
 export * from './gql'
-export * from './gql/assets/constants'
 export * from './lib'
 export * from './wallet'
diff --git a/packages/wallet/src/test/fixtures/lib/ethers.ts b/packages/wallet/src/test/fixtures/lib/ethers.ts
index adb739d0daa..73c8e0fc310 100644
--- a/packages/wallet/src/test/fixtures/lib/ethers.ts
+++ b/packages/wallet/src/test/fixtures/lib/ethers.ts
@@ -1,7 +1,7 @@
 import { TransactionReceipt, TransactionRequest, TransactionResponse } from '@ethersproject/providers'
 import { BigNumber, Transaction } from 'ethers'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const ethersTransaction = createFixture<Transaction>()(() => ({
   chainId: faker.datatype.number(),
diff --git a/packages/wallet/src/test/fixtures/lib/netinfo.ts b/packages/wallet/src/test/fixtures/lib/netinfo.ts
index eae4b353710..889854351bc 100644
--- a/packages/wallet/src/test/fixtures/lib/netinfo.ts
+++ b/packages/wallet/src/test/fixtures/lib/netinfo.ts
@@ -4,7 +4,7 @@ import {
   NetInfoStateType,
   NetInfoUnknownState,
 } from '@react-native-community/netinfo'
-import { createFixture } from 'uniswap/src/test/utils'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const networkUnknown = createFixture<NetInfoUnknownState>()(() => ({
   isConnected: null,
diff --git a/packages/wallet/src/test/fixtures/wallet/accounts.ts b/packages/wallet/src/test/fixtures/wallet/accounts.ts
index 49d1ce290a3..56991a5981f 100644
--- a/packages/wallet/src/test/fixtures/wallet/accounts.ts
+++ b/packages/wallet/src/test/fixtures/wallet/accounts.ts
@@ -1,5 +1,3 @@
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import {
   AccountBase,
   AccountType,
@@ -7,8 +5,9 @@ import {
   ReadOnlyAccount,
   SignerMnemonicAccount,
 } from 'wallet/src/features/wallet/accounts/types'
-import { SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2, SAMPLE_SEED_ADDRESS_3 } from 'wallet/src/test/fixtures'
-import { randomEnumValue } from 'wallet/src/test/utils'
+import { SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2, SAMPLE_SEED_ADDRESS_3 } from 'wallet/src/test/fixtures/constants'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomEnumValue } from 'wallet/src/test/utils'
 
 /**
  * Base fixtures
diff --git a/packages/wallet/src/test/fixtures/wallet/balances.ts b/packages/wallet/src/test/fixtures/wallet/balances.ts
index b3246a253e9..51e3f12ee35 100644
--- a/packages/wallet/src/test/fixtures/wallet/balances.ts
+++ b/packages/wallet/src/test/fixtures/wallet/balances.ts
@@ -1,13 +1,13 @@
 import { Portfolio, Token, TokenBalance } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'uniswap/src/features/chains/utils'
 import { PortfolioBalance } from 'uniswap/src/features/dataApi/types'
-import { buildCurrency } from 'uniswap/src/features/dataApi/utils'
-import { currencyInfo } from 'uniswap/src/test/fixtures/wallet/currencies'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { currencyId } from 'uniswap/src/utils/currencyId'
+import { buildCurrency } from 'wallet/src/features/dataApi/utils'
 import { portfolio } from 'wallet/src/test/fixtures/gql'
 import { tokenBalance } from 'wallet/src/test/fixtures/gql/assets'
+import { currencyInfo } from 'wallet/src/test/fixtures/wallet/currencies'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 const portfolioBalanceBase = createFixture<PortfolioBalance>()(() => ({
   cacheId: faker.datatype.uuid(),
diff --git a/packages/uniswap/src/test/fixtures/wallet/currencies.ts b/packages/wallet/src/test/fixtures/wallet/currencies.ts
similarity index 94%
rename from packages/uniswap/src/test/fixtures/wallet/currencies.ts
rename to packages/wallet/src/test/fixtures/wallet/currencies.ts
index a17797269c2..95bd807f2cf 100644
--- a/packages/uniswap/src/test/fixtures/wallet/currencies.ts
+++ b/packages/wallet/src/test/fixtures/wallet/currencies.ts
@@ -1,10 +1,10 @@
 import { SafetyLevel } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
 import { CurrencyInfo } from 'uniswap/src/features/dataApi/types'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import { currencyId } from 'uniswap/src/utils/currencyId'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const MAINNET_CURRENCY = NativeCurrency.onChain(UniverseChainId.Mainnet)
 export const BASE_CURRENCY = NativeCurrency.onChain(UniverseChainId.Base)
diff --git a/packages/wallet/src/test/fixtures/wallet/index.ts b/packages/wallet/src/test/fixtures/wallet/index.ts
index 21af252fb0a..5ee4f7bb4a1 100644
--- a/packages/wallet/src/test/fixtures/wallet/index.ts
+++ b/packages/wallet/src/test/fixtures/wallet/index.ts
@@ -1,5 +1,6 @@
 export * from './accounts'
 export * from './balances'
+export * from './currencies'
 export * from './notifications'
 export * from './recipients'
 export * from './redux'
diff --git a/packages/wallet/src/test/fixtures/wallet/notifications.ts b/packages/wallet/src/test/fixtures/wallet/notifications.ts
index 2ddd3aa9200..10560848e41 100644
--- a/packages/wallet/src/test/fixtures/wallet/notifications.ts
+++ b/packages/wallet/src/test/fixtures/wallet/notifications.ts
@@ -1,9 +1,6 @@
-import { AssetType } from 'uniswap/src/entities/assets'
-import { currencyInfo } from 'uniswap/src/test/fixtures/wallet/currencies'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { WALLET_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
 import { WalletConnectEvent } from 'uniswap/src/types/walletConnect'
+import { AssetType } from 'wallet/src/entities/assets'
 import {
   AppErrorNotification,
   AppNotificationBase,
@@ -36,7 +33,9 @@ import {
   TransactionType,
   WrapType,
 } from 'wallet/src/features/transactions/types'
-import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
+import { currencyInfo } from 'wallet/src/test/fixtures/wallet/currencies'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 
 export const FINALIZED_TRANSACTION_STATUSES: FinalizedTransactionStatus[] = [
   TransactionStatus.Success,
diff --git a/packages/wallet/src/test/fixtures/wallet/recipients.ts b/packages/wallet/src/test/fixtures/wallet/recipients.ts
index a41ea71776b..5050ef16ac6 100644
--- a/packages/wallet/src/test/fixtures/wallet/recipients.ts
+++ b/packages/wallet/src/test/fixtures/wallet/recipients.ts
@@ -1,7 +1,7 @@
 import { SectionListData } from 'react-native'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const searchableRecipient = createFixture<SearchableRecipient>()(() => ({
   address: faker.finance.ethereumAddress(),
diff --git a/packages/wallet/src/test/fixtures/wallet/redux.ts b/packages/wallet/src/test/fixtures/wallet/redux.ts
index 325250bcc8c..84bd7b0abff 100644
--- a/packages/wallet/src/test/fixtures/wallet/redux.ts
+++ b/packages/wallet/src/test/fixtures/wallet/redux.ts
@@ -1,9 +1,9 @@
 import { PreloadedState } from 'redux'
-import { createFixture } from 'uniswap/src/test/utils'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { WalletState, initialWalletState } from 'wallet/src/features/wallet/slice'
 import { SharedState } from 'wallet/src/state/reducer'
 import { signerMnemonicAccount } from 'wallet/src/test/fixtures/wallet/accounts'
+import { createFixture } from 'wallet/src/test/utils'
 
 type WalletPreloaedStateOptions = {
   account: Account
diff --git a/packages/wallet/src/test/fixtures/wallet/transactions/fixtures.ts b/packages/wallet/src/test/fixtures/wallet/transactions/fixtures.ts
index a145fb766dc..9bea3dbcfdb 100644
--- a/packages/wallet/src/test/fixtures/wallet/transactions/fixtures.ts
+++ b/packages/wallet/src/test/fixtures/wallet/transactions/fixtures.ts
@@ -1,10 +1,8 @@
 import { TransactionRequest } from '@ethersproject/providers'
 import { TradeType } from '@uniswap/sdk-core'
-import { AssetType } from 'uniswap/src/entities/assets'
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { WALLET_SUPPORTED_CHAIN_IDS } from 'uniswap/src/types/chains'
 import { Routing } from 'wallet/src/data/tradingApi/__generated__/index'
+import { AssetType } from 'wallet/src/entities/assets'
 import { finalizeTransaction } from 'wallet/src/features/transactions/slice'
 import {
   ApproveTransactionInfo,
@@ -32,7 +30,8 @@ import {
   WrapTransactionInfo,
 } from 'wallet/src/features/transactions/types'
 import { dappInfoWC } from 'wallet/src/test/fixtures/wallet/walletConnect'
-import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture, randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 
 export const transactionId = createFixture<TransactionId>()(() => ({
   id: faker.datatype.uuid(),
diff --git a/packages/wallet/src/test/fixtures/wallet/transactions/helpers.ts b/packages/wallet/src/test/fixtures/wallet/transactions/helpers.ts
index 6da7816c5a6..54b9e1b364f 100644
--- a/packages/wallet/src/test/fixtures/wallet/transactions/helpers.ts
+++ b/packages/wallet/src/test/fixtures/wallet/transactions/helpers.ts
@@ -1,7 +1,6 @@
 import { TransactionRequest, TransactionResponse } from '@ethersproject/providers'
 import { BigNumber, providers } from 'ethers'
 import { merge } from 'lodash'
-import { faker } from 'uniswap/src/test/shared'
 import { finalizeTransaction } from 'wallet/src/features/transactions/slice'
 import {
   ClassicTransactionDetails,
@@ -19,6 +18,7 @@ import {
   transactionDetails,
   transactionReceipt,
 } from 'wallet/src/test/fixtures/wallet/transactions/fixtures'
+import { faker } from 'wallet/src/test/shared'
 
 type TxFixtures<T extends ClassicTransactionDetails> = {
   txDetailsPending: T
diff --git a/packages/wallet/src/test/fixtures/wallet/walletConnect.ts b/packages/wallet/src/test/fixtures/wallet/walletConnect.ts
index 5a4960913bd..b2ca006c065 100644
--- a/packages/wallet/src/test/fixtures/wallet/walletConnect.ts
+++ b/packages/wallet/src/test/fixtures/wallet/walletConnect.ts
@@ -1,6 +1,6 @@
-import { faker } from 'uniswap/src/test/shared'
-import { createFixture } from 'uniswap/src/test/utils'
 import { DappInfoUwULink, DappInfoWC } from 'uniswap/src/types/walletConnect'
+import { faker } from 'wallet/src/test/shared'
+import { createFixture } from 'wallet/src/test/utils'
 
 export const dappInfoWC = createFixture<DappInfoWC>()(() => ({
   source: 'walletconnect',
diff --git a/packages/wallet/src/test/mocks/gql/mocks.ts b/packages/wallet/src/test/mocks/gql/mocks.ts
index af7419deb76..29e15537974 100644
--- a/packages/wallet/src/test/mocks/gql/mocks.ts
+++ b/packages/wallet/src/test/mocks/gql/mocks.ts
@@ -5,8 +5,8 @@ import {
   SwapOrderStatus,
   TransactionStatus,
 } from 'uniswap/src/data/graphql/uniswap-data-api/__generated__/types-and-hooks'
-import { MAX_FIXTURE_TIMESTAMP, faker } from 'uniswap/src/test/shared'
 import { GQL_CHAINS } from 'wallet/src/test/fixtures'
+import { MAX_FIXTURE_TIMESTAMP, faker } from 'wallet/src/test/shared'
 import { randomChoice, randomEnumValue } from 'wallet/src/test/utils'
 
 export const mocks = {
diff --git a/packages/wallet/src/test/mocks/providers.ts b/packages/wallet/src/test/mocks/providers.ts
index 826222d662f..efda1df14e1 100644
--- a/packages/wallet/src/test/mocks/providers.ts
+++ b/packages/wallet/src/test/mocks/providers.ts
@@ -4,8 +4,8 @@ import ERC20_ABI from 'uniswap/src/abis/erc20.json'
 import { Erc20 } from 'uniswap/src/abis/types'
 import WETH_ABI from 'uniswap/src/abis/weth.json'
 import { getWrappedNativeAddress } from 'uniswap/src/constants/addresses'
-import { DAI } from 'uniswap/src/constants/tokens'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
+import { DAI } from 'wallet/src/constants/tokens'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
 import { SignerManager } from 'wallet/src/features/wallet/signing/SignerManager'
 import { ethersTransactionReceipt } from 'wallet/src/test/fixtures'
diff --git a/packages/wallet/src/test/mocks/sdk.ts b/packages/wallet/src/test/mocks/sdk.ts
index 945b77c54ac..15d4cb1c6df 100644
--- a/packages/wallet/src/test/mocks/sdk.ts
+++ b/packages/wallet/src/test/mocks/sdk.ts
@@ -1,6 +1,6 @@
 import { FeeAmount, Pool } from '@uniswap/v3-sdk'
-import { UNI, WBTC } from 'uniswap/src/constants/tokens'
 import { UniverseChainId } from 'uniswap/src/types/chains'
+import { UNI, WBTC } from 'wallet/src/constants/tokens'
 
 export const mockPool = new Pool(
   UNI[UniverseChainId.Mainnet],
diff --git a/packages/uniswap/src/test/shared.ts b/packages/wallet/src/test/shared.ts
similarity index 100%
rename from packages/uniswap/src/test/shared.ts
rename to packages/wallet/src/test/shared.ts
diff --git a/packages/wallet/src/test/test-utils.ts b/packages/wallet/src/test/test-utils.ts
index d456fc81768..c6a21d9624c 100644
--- a/packages/wallet/src/test/test-utils.ts
+++ b/packages/wallet/src/test/test-utils.ts
@@ -1,6 +1,6 @@
 import { renderHookWithProviders, renderWithProviders } from 'wallet/src/test/render'
 
-export { MAX_FIXTURE_TIMESTAMP, faker } from '../../../uniswap/src/test/shared'
+export { MAX_FIXTURE_TIMESTAMP, faker } from './shared'
 export { createArray } from './utils'
 
 // re-export everything
diff --git a/packages/uniswap/src/test/utils/factory.ts b/packages/wallet/src/test/utils/factory.ts
similarity index 100%
rename from packages/uniswap/src/test/utils/factory.ts
rename to packages/wallet/src/test/utils/factory.ts
diff --git a/packages/wallet/src/test/utils/index.ts b/packages/wallet/src/test/utils/index.ts
index 7245d93bf08..11d4c1ad971 100644
--- a/packages/wallet/src/test/utils/index.ts
+++ b/packages/wallet/src/test/utils/index.ts
@@ -1,4 +1,5 @@
 export * from './array'
+export * from './factory'
 export * from './random'
 export * from './resolvers'
 export * from './wallet'
diff --git a/packages/wallet/src/utils/balance.test.ts b/packages/wallet/src/utils/balance.test.ts
index d99cd3a2b35..da34a0e9cbd 100644
--- a/packages/wallet/src/utils/balance.test.ts
+++ b/packages/wallet/src/utils/balance.test.ts
@@ -1,7 +1,12 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import JSBI from 'jsbi'
-import { DAI } from 'uniswap/src/constants/tokens'
-import { ARBITRUM_CURRENCY, MAINNET_CURRENCY, OPTIMISM_CURRENCY, POLYGON_CURRENCY } from 'uniswap/src/test/fixtures'
+import { DAI } from 'wallet/src/constants/tokens'
+import {
+  ARBITRUM_CURRENCY,
+  MAINNET_CURRENCY,
+  OPTIMISM_CURRENCY,
+  POLYGON_CURRENCY,
+} from 'wallet/src/test/fixtures'
 import {
   MIN_ARBITRUM_FOR_GAS,
   MIN_ETH_FOR_GAS,
@@ -26,7 +31,7 @@ describe(maxAmountSpend, () => {
   it('reserves gas for large amounts on ETH Mainnet', () => {
     const amount = CurrencyAmount.fromRawAmount(
       MAINNET_CURRENCY,
-      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_ETH_FOR_GAS)),
+      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_ETH_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('99')
@@ -35,7 +40,7 @@ describe(maxAmountSpend, () => {
   it('handles small amounts on ETH Mainnet', () => {
     const amount = CurrencyAmount.fromRawAmount(
       MAINNET_CURRENCY,
-      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_ETH_FOR_GAS)),
+      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_ETH_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('0')
@@ -46,7 +51,7 @@ describe(maxAmountSpend, () => {
   it('reserves gas for large amounts on Polygon', () => {
     const amount = CurrencyAmount.fromRawAmount(
       POLYGON_CURRENCY,
-      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_POLYGON_FOR_GAS)),
+      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_POLYGON_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('99')
@@ -55,7 +60,7 @@ describe(maxAmountSpend, () => {
   it('handles small amounts on Polygon', () => {
     const amount = CurrencyAmount.fromRawAmount(
       POLYGON_CURRENCY,
-      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_POLYGON_FOR_GAS)),
+      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_POLYGON_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('0')
@@ -66,7 +71,7 @@ describe(maxAmountSpend, () => {
   it('reserves gas for large amounts on Arbitrum', () => {
     const amount = CurrencyAmount.fromRawAmount(
       ARBITRUM_CURRENCY,
-      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_ARBITRUM_FOR_GAS)),
+      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_ARBITRUM_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('99')
@@ -75,7 +80,7 @@ describe(maxAmountSpend, () => {
   it('handles small amounts on Arbitrum', () => {
     const amount = CurrencyAmount.fromRawAmount(
       ARBITRUM_CURRENCY,
-      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_ARBITRUM_FOR_GAS)),
+      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_ARBITRUM_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('0')
@@ -86,7 +91,7 @@ describe(maxAmountSpend, () => {
   it('reserves gas for large amounts on Optimism', () => {
     const amount = CurrencyAmount.fromRawAmount(
       OPTIMISM_CURRENCY,
-      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_OPTIMISM_FOR_GAS)),
+      JSBI.add(JSBI.BigInt(99), JSBI.BigInt(MIN_OPTIMISM_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('99')
@@ -95,7 +100,7 @@ describe(maxAmountSpend, () => {
   it('handles small amounts on Optimism', () => {
     const amount = CurrencyAmount.fromRawAmount(
       OPTIMISM_CURRENCY,
-      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_OPTIMISM_FOR_GAS)),
+      JSBI.subtract(JSBI.BigInt(99), JSBI.BigInt(MIN_OPTIMISM_FOR_GAS))
     )
     const amount1Spend = maxAmountSpend(amount)
     expect(amount1Spend?.quotient.toString()).toEqual('0')
diff --git a/packages/uniswap/src/utils/clipboard.native.ts b/packages/wallet/src/utils/clipboard.native.ts
similarity index 97%
rename from packages/uniswap/src/utils/clipboard.native.ts
rename to packages/wallet/src/utils/clipboard.native.ts
index 12c7fde9765..0840dfdc306 100644
--- a/packages/uniswap/src/utils/clipboard.native.ts
+++ b/packages/wallet/src/utils/clipboard.native.ts
@@ -1,6 +1,6 @@
 import * as ExpoClipboard from 'expo-clipboard'
-import { IClipboard } from 'uniswap/src/utils/clipboard'
 import { logger } from 'utilities/src/logger/logger'
+import { IClipboard } from 'wallet/src/utils/clipboard'
 
 const Clipboard: IClipboard = {
   setClipboard: async (value: string) => {
diff --git a/packages/uniswap/src/utils/clipboard.ts b/packages/wallet/src/utils/clipboard.ts
similarity index 100%
rename from packages/uniswap/src/utils/clipboard.ts
rename to packages/wallet/src/utils/clipboard.ts
diff --git a/packages/uniswap/src/utils/clipboard.web.ts b/packages/wallet/src/utils/clipboard.web.ts
similarity index 94%
rename from packages/uniswap/src/utils/clipboard.web.ts
rename to packages/wallet/src/utils/clipboard.web.ts
index a0157827985..c81df0ef0d0 100644
--- a/packages/uniswap/src/utils/clipboard.web.ts
+++ b/packages/wallet/src/utils/clipboard.web.ts
@@ -1,5 +1,5 @@
-import { IClipboard } from 'uniswap/src/utils/clipboard'
 import { logger } from 'utilities/src/logger/logger'
+import { IClipboard } from 'wallet/src/utils/clipboard'
 
 const Clipboard: IClipboard = {
   setClipboard: async (value: string) => {
diff --git a/packages/uniswap/src/utils/colors.test.ts b/packages/wallet/src/utils/colors.test.ts
similarity index 98%
rename from packages/uniswap/src/utils/colors.test.ts
rename to packages/wallet/src/utils/colors.test.ts
index b8c6de3014e..8c70391740c 100644
--- a/packages/uniswap/src/utils/colors.test.ts
+++ b/packages/wallet/src/utils/colors.test.ts
@@ -6,7 +6,7 @@ import {
   getColorDiffScore,
   hexToRGB,
   opacify,
-} from 'uniswap/src/utils/colors'
+} from 'wallet/src/utils/colors'
 
 it('returns an hex color with opacity', () => {
   expect(opacify(10, '#000000')).toEqual('#0000001a')
diff --git a/packages/uniswap/src/utils/colors.tsx b/packages/wallet/src/utils/colors.tsx
similarity index 100%
rename from packages/uniswap/src/utils/colors.tsx
rename to packages/wallet/src/utils/colors.tsx
diff --git a/packages/wallet/src/utils/currency.test.ts b/packages/wallet/src/utils/currency.test.ts
index b9cfa53d307..4e4645581c0 100644
--- a/packages/wallet/src/utils/currency.test.ts
+++ b/packages/wallet/src/utils/currency.test.ts
@@ -1,10 +1,12 @@
-import { DAI, USDC } from 'uniswap/src/constants/tokens'
+import { DAI, USDC } from 'wallet/src/constants/tokens'
 import { mockLocalizedFormatter, noOpFunction } from 'wallet/src/test/mocks/utils'
 import { getCurrencyDisplayText, getFormattedCurrencyAmount } from 'wallet/src/utils/currency'
 
 describe(getFormattedCurrencyAmount, () => {
   it('formats valid amount', () => {
-    expect(getFormattedCurrencyAmount(DAI, '1000000000000000000', mockLocalizedFormatter)).toEqual('1.00 ')
+    expect(getFormattedCurrencyAmount(DAI, '1000000000000000000', mockLocalizedFormatter)).toEqual(
+      '1.00 '
+    )
   })
 
   it('handles invalid Currency', () => {
diff --git a/packages/wallet/src/utils/currencyId.test.ts b/packages/wallet/src/utils/currencyId.test.ts
index 6d4976bae91..16710bd77b8 100644
--- a/packages/wallet/src/utils/currencyId.test.ts
+++ b/packages/wallet/src/utils/currencyId.test.ts
@@ -1,6 +1,4 @@
 import { getNativeAddress } from 'uniswap/src/constants/addresses'
-import { DAI } from 'uniswap/src/constants/tokens'
-import { NativeCurrency } from 'uniswap/src/features/tokens/NativeCurrency'
 import { UniverseChainId } from 'uniswap/src/types/chains'
 import {
   NATIVE_ANALYTICS_ADDRESS_VALUE,
@@ -15,6 +13,8 @@ import {
   getCurrencyAddressForAnalytics,
   isNativeCurrencyAddress,
 } from 'uniswap/src/utils/currencyId'
+import { DAI } from 'wallet/src/constants/tokens'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 
 const ETH = NativeCurrency.onChain(UniverseChainId.Mainnet)
 const DAI_ADDRESS = '0x6B175474E89094C44Da98b954EedeAC495271d0F'
@@ -25,13 +25,17 @@ describe(currencyId, () => {
   })
 
   it('builds correct ID for native asset', () => {
-    expect(currencyId(ETH)).toEqual(`${UniverseChainId.Mainnet}-${getNativeAddress(UniverseChainId.Mainnet)}`)
+    expect(currencyId(ETH)).toEqual(
+      `${UniverseChainId.Mainnet}-${getNativeAddress(UniverseChainId.Mainnet)}`
+    )
   })
 })
 
 describe(buildCurrencyId, () => {
   it('builds correct ID for token', () => {
-    expect(buildCurrencyId(UniverseChainId.Mainnet, DAI.address)).toEqual(`${UniverseChainId.Mainnet}-${DAI.address}`)
+    expect(buildCurrencyId(UniverseChainId.Mainnet, DAI.address)).toEqual(
+      `${UniverseChainId.Mainnet}-${DAI.address}`
+    )
   })
 })
 
@@ -41,7 +45,12 @@ describe(areCurrencyIdsEqual, () => {
   })
 
   it('returns correct comparison between a checksummed and lowercased currencyId', () => {
-    expect(areCurrencyIdsEqual(currencyId(DAI), `${UniverseChainId.Mainnet}-${DAI.address.toLowerCase()}`)).toBe(true)
+    expect(
+      areCurrencyIdsEqual(
+        currencyId(DAI),
+        `${UniverseChainId.Mainnet}-${DAI.address.toLowerCase()}`
+      )
+    ).toBe(true)
   })
 
   it('returns correct comparison for the different currencyIds', () => {
@@ -71,25 +80,35 @@ describe(getCurrencyAddressForAnalytics, () => {
 
 describe(buildNativeCurrencyId, () => {
   it('builds correct ID for Mainnet', () => {
-    expect(buildNativeCurrencyId(UniverseChainId.Mainnet)).toEqual(`1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`)
+    expect(buildNativeCurrencyId(UniverseChainId.Mainnet)).toEqual(
+      `1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`
+    )
   })
 
   it('builds correct ID for Polygon', () => {
-    expect(buildNativeCurrencyId(UniverseChainId.Polygon)).toEqual(`137-0x0000000000000000000000000000000000001010`)
+    expect(buildNativeCurrencyId(UniverseChainId.Polygon)).toEqual(
+      `137-0x0000000000000000000000000000000000001010`
+    )
   })
 
   it('builds correct ID for BNB', () => {
-    expect(buildNativeCurrencyId(UniverseChainId.Bnb)).toEqual(`56-0xb8c77482e45f1f44de1745f52c74426c631bdd52`)
+    expect(buildNativeCurrencyId(UniverseChainId.Bnb)).toEqual(
+      `56-0xb8c77482e45f1f44de1745f52c74426c631bdd52`
+    )
   })
 })
 
 describe(isNativeCurrencyAddress, () => {
   it('returns true for native address', () => {
-    expect(isNativeCurrencyAddress(UniverseChainId.Mainnet, getNativeAddress(UniverseChainId.Mainnet))).toEqual(true)
+    expect(
+      isNativeCurrencyAddress(UniverseChainId.Mainnet, getNativeAddress(UniverseChainId.Mainnet))
+    ).toEqual(true)
   })
 
   it('returns true for matic native address', () => {
-    expect(isNativeCurrencyAddress(UniverseChainId.Polygon, getNativeAddress(UniverseChainId.Polygon))).toEqual(true)
+    expect(
+      isNativeCurrencyAddress(UniverseChainId.Polygon, getNativeAddress(UniverseChainId.Polygon))
+    ).toEqual(true)
   })
 
   it('returns true for null currency addresses', () => {
@@ -97,7 +116,9 @@ describe(isNativeCurrencyAddress, () => {
   })
 
   it('returns false for mainnet with Polygon native address', () => {
-    expect(isNativeCurrencyAddress(UniverseChainId.Mainnet, getNativeAddress(UniverseChainId.Polygon))).toEqual(false)
+    expect(
+      isNativeCurrencyAddress(UniverseChainId.Mainnet, getNativeAddress(UniverseChainId.Polygon))
+    ).toEqual(false)
   })
 
   it('returns false for token address', () => {
@@ -112,7 +133,7 @@ describe(currencyIdToAddress, () => {
 
   it('returns correct address for native asset', () => {
     expect(currencyIdToAddress(`1-${getNativeAddress(UniverseChainId.Mainnet)}`)).toEqual(
-      getNativeAddress(UniverseChainId.Mainnet),
+      getNativeAddress(UniverseChainId.Mainnet)
     )
   })
 })
@@ -128,12 +149,14 @@ describe(currencyIdToGraphQLAddress, () => {
 
   it('returns MATIC address for Polygon native asset', () => {
     expect(currencyIdToGraphQLAddress('137-0x0000000000000000000000000000000000001010')).toEqual(
-      '0x0000000000000000000000000000000000001010',
+      '0x0000000000000000000000000000000000001010'
     )
   })
 
   it('returns null for BNB native asset', () => {
-    expect(currencyIdToGraphQLAddress('56-0xB8c77482e45F1F44dE1745F52C74426C631bDD52')).toEqual(null)
+    expect(currencyIdToGraphQLAddress('56-0xB8c77482e45F1F44dE1745F52C74426C631bDD52')).toEqual(
+      null
+    )
   })
 })
 
@@ -143,7 +166,9 @@ describe(currencyIdToChain, () => {
   })
 
   it('returns correct chain for native asset', () => {
-    expect(currencyIdToChain(`1-${getNativeAddress(UniverseChainId.Mainnet)}`)).toEqual(UniverseChainId.Mainnet)
+    expect(currencyIdToChain(`1-${getNativeAddress(UniverseChainId.Mainnet)}`)).toEqual(
+      UniverseChainId.Mainnet
+    )
   })
 
   it('handles invalid currencyId', () => {
diff --git a/packages/wallet/src/utils/getCurrencyAmount.test.ts b/packages/wallet/src/utils/getCurrencyAmount.test.ts
index 3d4fa107619..8f9b42bc10f 100644
--- a/packages/wallet/src/utils/getCurrencyAmount.test.ts
+++ b/packages/wallet/src/utils/getCurrencyAmount.test.ts
@@ -1,5 +1,5 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
-import { DAI } from 'uniswap/src/constants/tokens'
+import { DAI } from 'wallet/src/constants/tokens'
 import { noOpFunction } from 'wallet/src/test/mocks'
 import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
@@ -9,23 +9,33 @@ const FRACTION_OF_DAI = CurrencyAmount.fromRawAmount(DAI, '1000000000000000')
 
 describe(getCurrencyAmount, () => {
   it('handle undefined inputs', () => {
-    expect(getCurrencyAmount({ value: undefined, valueType: ValueType.Raw, currency: undefined })).toBeUndefined()
+    expect(
+      getCurrencyAmount({ value: undefined, valueType: ValueType.Raw, currency: undefined })
+    ).toBeUndefined()
   })
 
   it('handle undefined float value', () => {
-    expect(getCurrencyAmount({ value: undefined, valueType: ValueType.Exact, currency: DAI })).toBeUndefined()
+    expect(
+      getCurrencyAmount({ value: undefined, valueType: ValueType.Exact, currency: DAI })
+    ).toBeUndefined()
   })
 
   it('handle undefined uin5256 value', () => {
-    expect(getCurrencyAmount({ value: undefined, valueType: ValueType.Raw, currency: DAI })).toBeUndefined()
+    expect(
+      getCurrencyAmount({ value: undefined, valueType: ValueType.Raw, currency: DAI })
+    ).toBeUndefined()
   })
 
   it('handle undefined Currency wit defined float value', () => {
-    expect(getCurrencyAmount({ value: '1.6', valueType: ValueType.Exact, currency: undefined })).toBeUndefined()
+    expect(
+      getCurrencyAmount({ value: '1.6', valueType: ValueType.Exact, currency: undefined })
+    ).toBeUndefined()
   })
 
   it('handle undefined Currency with defined uint256 value', () => {
-    expect(getCurrencyAmount({ value: '1000000000', valueType: ValueType.Exact, currency: undefined })).toBeUndefined()
+    expect(
+      getCurrencyAmount({ value: '1000000000', valueType: ValueType.Exact, currency: undefined })
+    ).toBeUndefined()
   })
 
   it('return null when float value is 0', () => {
@@ -33,7 +43,9 @@ describe(getCurrencyAmount, () => {
   })
 
   it('parse standard float amount', () => {
-    expect(getCurrencyAmount({ value: '1', valueType: ValueType.Exact, currency: DAI })).toEqual(ONE_DAI)
+    expect(getCurrencyAmount({ value: '1', valueType: ValueType.Exact, currency: DAI })).toEqual(
+      ONE_DAI
+    )
   })
 
   it('parse standard raw amount', () => {
@@ -42,12 +54,14 @@ describe(getCurrencyAmount, () => {
         value: '1000000000000000000',
         valueType: ValueType.Raw,
         currency: DAI,
-      }),
+      })
     ).toEqual(ONE_DAI)
   })
 
   it('parse decimal float amount', () => {
-    expect(getCurrencyAmount({ value: '0.5', valueType: ValueType.Exact, currency: DAI })).toEqual(HALF_DAI)
+    expect(getCurrencyAmount({ value: '0.5', valueType: ValueType.Exact, currency: DAI })).toEqual(
+      HALF_DAI
+    )
   })
 
   it('parse fractional raw amount', () => {
@@ -56,7 +70,7 @@ describe(getCurrencyAmount, () => {
         value: '500000000000000000',
         valueType: ValueType.Raw,
         currency: DAI,
-      }),
+      })
     ).toEqual(HALF_DAI)
   })
 
@@ -67,7 +81,7 @@ describe(getCurrencyAmount, () => {
         value: '0.00000000000000000000001',
         valueType: ValueType.Exact,
         currency: DAI,
-      }),
+      })
     ).toBeNull()
   })
 
@@ -78,7 +92,7 @@ describe(getCurrencyAmount, () => {
         value: '0.1',
         valueType: ValueType.Raw,
         currency: DAI,
-      }),
+      })
     ).toBeNull()
   })
 
@@ -88,7 +102,7 @@ describe(getCurrencyAmount, () => {
         value: '.',
         valueType: ValueType.Exact,
         currency: DAI,
-      }),
+      })
     ).toBeNull()
   })
 
@@ -99,7 +113,7 @@ describe(getCurrencyAmount, () => {
         value: '123as2s',
         valueType: ValueType.Exact,
         currency: DAI,
-      }),
+      })
     ).toBeNull()
   })
 
@@ -109,7 +123,7 @@ describe(getCurrencyAmount, () => {
         value: '0x38d7ea4c68000',
         valueType: ValueType.Raw,
         currency: DAI,
-      }),
+      })
     ).toEqual(FRACTION_OF_DAI)
   })
 })
diff --git a/packages/wallet/src/utils/linking.test.ts b/packages/wallet/src/utils/linking.test.ts
index a21b37e5b06..d9bcff959bb 100644
--- a/packages/wallet/src/utils/linking.test.ts
+++ b/packages/wallet/src/utils/linking.test.ts
@@ -3,29 +3,29 @@ import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
 
 describe(getExplorerLink, () => {
   it('handles different link cases', () => {
-    expect(getExplorerLink(UniverseChainId.ArbitrumOne, 'hash', ExplorerDataType.TRANSACTION)).toEqual(
-      'https://arbiscan.io/tx/hash',
-    )
+    expect(
+      getExplorerLink(UniverseChainId.ArbitrumOne, 'hash', ExplorerDataType.TRANSACTION)
+    ).toEqual('https://arbiscan.io/tx/hash')
     expect(getExplorerLink(UniverseChainId.Mainnet, 'hash', ExplorerDataType.ADDRESS)).toEqual(
-      'https://etherscan.io/address/hash',
+      'https://etherscan.io/address/hash'
     )
     expect(getExplorerLink(UniverseChainId.Polygon, 'hash', ExplorerDataType.TOKEN)).toEqual(
-      'https://polygonscan.com/token/hash',
+      'https://polygonscan.com/token/hash'
     )
     expect(getExplorerLink(UniverseChainId.PolygonMumbai, 'hash', ExplorerDataType.BLOCK)).toEqual(
-      'https://mumbai.polygonscan.com/block/hash',
+      'https://mumbai.polygonscan.com/block/hash'
     )
   })
 
   it('handles chain with explorer URL', () => {
     expect(getExplorerLink(UniverseChainId.Goerli, 'hash', ExplorerDataType.TRANSACTION)).toEqual(
-      'https://goerli.etherscan.io/tx/hash',
+      'https://goerli.etherscan.io/tx/hash'
     )
   })
 
   it('handles Optimism block special case', () => {
     expect(getExplorerLink(UniverseChainId.Optimism, 'hash', ExplorerDataType.BLOCK)).toEqual(
-      'https://optimistic.etherscan.io/tx/hash',
+      'https://optimistic.etherscan.io/tx/hash'
     )
   })
 })
diff --git a/packages/wallet/src/utils/linking.ts b/packages/wallet/src/utils/linking.ts
index 9c64b953419..7cb00adca66 100644
--- a/packages/wallet/src/utils/linking.ts
+++ b/packages/wallet/src/utils/linking.ts
@@ -1,14 +1,70 @@
 import * as WebBrowser from 'expo-web-browser'
 import { Linking } from 'react-native'
+import { colorsLight } from 'ui/src/theme'
 import { UNIVERSE_CHAIN_INFO } from 'uniswap/src/constants/chains'
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { toUniswapWebAppLink } from 'uniswap/src/features/chains/utils'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
 import { currencyIdToChain, currencyIdToGraphQLAddress } from 'uniswap/src/utils/currencyId'
-import { openUri } from 'uniswap/src/utils/linking'
+import { logger } from 'utilities/src/logger/logger'
 import { FiatPurchaseTransactionInfo, ServiceProviderInfo } from 'wallet/src/features/transactions/types'
 
 export const UNISWAP_APP_NATIVE_TOKEN = 'NATIVE'
+const ALLOWED_EXTERNAL_URI_SCHEMES = ['http://', 'https://']
+
+/**
+ * Opens allowed URIs. if isSafeUri is set to true then this will open http:// and https:// as well as some deeplinks.
+ * Only set this flag to true if you have formed the URL yourself in our own app code. For any URLs from an external source
+ * isSafeUri must be false and it will only open http:// and https:// URI schemes.
+ *
+ * @param openExternalBrowser whether to leave the app and open in system browser. default is false, opens in-app browser window
+ * @param isSafeUri whether to bypass ALLOWED_EXTERNAL_URI_SCHEMES check
+ * @param controlsColor When opening in an in-app browser, determines the controls color
+ **/
+export async function openUri(
+  uri: string,
+  openExternalBrowser = false,
+  isSafeUri = false,
+  // NOTE: okay to use colors object directly as we want the same color for light/dark modes
+  controlsColor = colorsLight.accent1,
+): Promise<void> {
+  const trimmedURI = uri.trim()
+  if (!isSafeUri && !ALLOWED_EXTERNAL_URI_SCHEMES.some((scheme) => trimmedURI.startsWith(scheme))) {
+    // TODO: [MOB-253] show a visual warning that the link cannot be opened.
+    logger.error(new Error('User attempted to open potentially unsafe url'), {
+      tags: {
+        file: 'linking',
+        function: 'openUri',
+      },
+      extra: { uri },
+    })
+    return
+  }
+
+  const isHttp = /^https?:\/\//.test(trimmedURI)
+
+  // `canOpenURL` returns `false` for App Links / Universal Links, so we just assume any device can handle the `https://` protocol.
+  const supported = isHttp ? true : await Linking.canOpenURL(uri)
+
+  if (!supported) {
+    logger.warn('linking', 'openUri', `Cannot open URI: ${uri}`)
+    return
+  }
+
+  try {
+    if (openExternalBrowser) {
+      await Linking.openURL(uri)
+    } else {
+      await WebBrowser.openBrowserAsync(uri, {
+        controlsColor,
+        presentationStyle: WebBrowser.WebBrowserPresentationStyle.FULL_SCREEN,
+        windowFeatures: 'popup=false',
+      })
+    }
+  } catch (error) {
+    logger.error(error, { tags: { file: 'linking', function: 'openUri' } })
+  }
+}
 
 export function dismissInAppBrowser(): void {
   WebBrowser.dismissBrowser()
diff --git a/packages/wallet/src/utils/mnemonics.test.ts b/packages/wallet/src/utils/mnemonics.test.ts
index 3b3496bbb7d..58712b10f36 100644
--- a/packages/wallet/src/utils/mnemonics.test.ts
+++ b/packages/wallet/src/utils/mnemonics.test.ts
@@ -3,24 +3,24 @@ import { MnemonicValidationError, translateMnemonicErrorMessage } from 'wallet/s
 
 describe(translateMnemonicErrorMessage, () => {
   it('correct invalid phrase message', () => {
-    expect(translateMnemonicErrorMessage(MnemonicValidationError.InvalidPhrase, undefined, i18n.t)).toBe(
-      'Invalid phrase',
-    )
+    expect(
+      translateMnemonicErrorMessage(MnemonicValidationError.InvalidPhrase, undefined, i18n.t)
+    ).toBe('Invalid phrase')
   })
 
   it('correct invalid word message', () => {
     const invalidWord = 'gibberish'
-    expect(translateMnemonicErrorMessage(MnemonicValidationError.InvalidWord, invalidWord, i18n.t)).toBe(
-      `Invalid word: ${invalidWord}`,
-    )
+    expect(
+      translateMnemonicErrorMessage(MnemonicValidationError.InvalidWord, invalidWord, i18n.t)
+    ).toBe(`Invalid word: ${invalidWord}`)
   })
 
   it('correct incorrect number of words message', () => {
-    expect(translateMnemonicErrorMessage(MnemonicValidationError.TooManyWords, undefined, i18n.t)).toBe(
-      'Recovery phrase must be 12-24 words',
-    )
-    expect(translateMnemonicErrorMessage(MnemonicValidationError.NotEnoughWords, undefined, i18n.t)).toBe(
-      'Recovery phrase must be 12-24 words',
-    )
+    expect(
+      translateMnemonicErrorMessage(MnemonicValidationError.TooManyWords, undefined, i18n.t)
+    ).toBe('Recovery phrase must be 12-24 words')
+    expect(
+      translateMnemonicErrorMessage(MnemonicValidationError.NotEnoughWords, undefined, i18n.t)
+    ).toBe('Recovery phrase must be 12-24 words')
   })
 })
diff --git a/packages/wallet/src/utils/password.test.ts b/packages/wallet/src/utils/password.test.ts
index ed4078cbe5f..8dd3eeea047 100644
--- a/packages/wallet/src/utils/password.test.ts
+++ b/packages/wallet/src/utils/password.test.ts
@@ -11,13 +11,13 @@ describe(isPasswordStrongEnough, () => {
       isPasswordStrongEnough({
         minStrength: PasswordStrength.NONE,
         currentStrength: PasswordStrength.NONE,
-      }),
+      })
     ).toBeTruthy()
     expect(
       isPasswordStrongEnough({
         minStrength: PasswordStrength.MEDIUM,
         currentStrength: PasswordStrength.MEDIUM,
-      }),
+      })
     ).toBeTruthy()
   })
 
@@ -26,13 +26,13 @@ describe(isPasswordStrongEnough, () => {
       isPasswordStrongEnough({
         minStrength: PasswordStrength.MEDIUM,
         currentStrength: PasswordStrength.NONE,
-      }),
+      })
     ).toBeFalsy()
     expect(
       isPasswordStrongEnough({
         minStrength: PasswordStrength.MEDIUM,
         currentStrength: PasswordStrength.WEAK,
-      }),
+      })
     ).toBeFalsy()
   })
 
@@ -41,13 +41,13 @@ describe(isPasswordStrongEnough, () => {
       isPasswordStrongEnough({
         minStrength: PasswordStrength.NONE,
         currentStrength: PasswordStrength.NONE,
-      }),
+      })
     ).toBeTruthy()
     expect(
       isPasswordStrongEnough({
         minStrength: PasswordStrength.NONE,
         currentStrength: PasswordStrength.NONE,
-      }),
+      })
     ).toBeTruthy()
   })
 })
diff --git a/packages/wallet/src/utils/useDynamicFontSizing.test.ts b/packages/wallet/src/utils/useDynamicFontSizing.test.ts
index 0403ac4b58c..3bb7d21cd1d 100644
--- a/packages/wallet/src/utils/useDynamicFontSizing.test.ts
+++ b/packages/wallet/src/utils/useDynamicFontSizing.test.ts
@@ -9,7 +9,7 @@ const MAX_CHAR_PIXEL_WIDTH = 23
 describe(useDynamicFontSizing, () => {
   it('returns maxFontSize if text input element width is not set', () => {
     const { result } = renderHook(() =>
-      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE),
+      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE)
     )
 
     expect(result.current.fontSize).toBe(MAX_INPUT_FONT_SIZE)
@@ -17,7 +17,7 @@ describe(useDynamicFontSizing, () => {
 
   it('returns maxFontSize as fontSize if text fits in the container', async () => {
     const { result } = renderHook(() =>
-      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE),
+      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE)
     )
 
     await act(() => {
@@ -31,7 +31,7 @@ describe(useDynamicFontSizing, () => {
 
   it('scales down font when text does not fit in the container', async () => {
     const { result } = renderHook(() =>
-      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE),
+      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE)
     )
 
     await act(() => {
@@ -45,7 +45,7 @@ describe(useDynamicFontSizing, () => {
 
   it("doesn't return font size less than minFontSize", async () => {
     const { result } = renderHook(() =>
-      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE),
+      useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE)
     )
 
     await act(() => {
diff --git a/yarn.lock b/yarn.lock
index 9f32bfdaf93..6303852cf1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8070,21 +8070,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rive-app/canvas@npm:2.19.0":
-  version: 2.19.0
-  resolution: "@rive-app/canvas@npm:2.19.0"
-  checksum: 27c9df0a0c32639aee6f48209c13ccd05f16d71b379e0ee36aa0434826a1f4b3bc6d880b8d7e996eb4350b78e194ebc0cae24c3978c8cfda4a0361f4282cba22
+"@rive-app/canvas@npm:2.8.3":
+  version: 2.8.3
+  resolution: "@rive-app/canvas@npm:2.8.3"
+  checksum: 1318aecc3256279b806828c53ddd4d18e3967a61a19563af2d9d86e251b5dc105d8a4839ed191da7cd4eb42f5f2f4456d85c91df35bfbf1d49c75da58a064c87
   languageName: node
   linkType: hard
 
-"@rive-app/react-canvas@npm:4.13.0":
-  version: 4.13.0
-  resolution: "@rive-app/react-canvas@npm:4.13.0"
+"@rive-app/react-canvas@npm:4.6.2":
+  version: 4.6.2
+  resolution: "@rive-app/react-canvas@npm:4.6.2"
   dependencies:
-    "@rive-app/canvas": 2.19.0
+    "@rive-app/canvas": 2.8.3
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 50f049daf52392d5f86bbac5c93aa49d26bf8e7656b1682947f95623e74d4fa06c55fcc552dd3a95f2e9538dfc3d9e643f488ef42c472027420fe3f0faa992fa
+  checksum: 61180635fe7ca6bd60ee99a176fefcdca7a5c3475fd9dd7d263a809c062b1ea1168fec6902326272107afe70eae62917bf65d2e5d5073c40dbaad3baed295598
   languageName: node
   linkType: hard
 
@@ -13312,10 +13312,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uniswap/analytics-events@npm:2.34.0":
-  version: 2.34.0
-  resolution: "@uniswap/analytics-events@npm:2.34.0"
-  checksum: 86d2c6035596ed8c4491a5bc2047cec5d1f1a59cfa9e3337499cbe9e955eeff6a09ad1c864ea64253f694263b1af397a6a96926b26a55699f0f36d3548bad145
+"@uniswap/analytics-events@npm:2.32.0":
+  version: 2.32.0
+  resolution: "@uniswap/analytics-events@npm:2.32.0"
+  checksum: 7341bb14025bcd72e7367dcc29a1833ad18f316b9310875432d4bbe62da8a2d2f2db473d6e0a10c12a02ff8d1815db0ef66fbb169ad98d80317f2c3fe91bcde2
   languageName: node
   linkType: hard
 
@@ -13407,9 +13407,8 @@ __metadata:
     "@types/redux-persist-webextension-storage": 1.0.3
     "@types/ua-parser-js": 0.7.31
     "@types/uuid": 9.0.1
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/eslint-config": "workspace:^"
-    "@uniswap/sdk-core": 5.3.0
     "@uniswap/universal-router-sdk": 2.2.0
     "@uniswap/v3-sdk": 3.13.0
     "@welldone-software/why-did-you-render": 8.0.1
@@ -13495,8 +13494,8 @@ __metadata:
     "@reach/dialog": 0.10.5
     "@reach/portal": 0.10.5
     "@reduxjs/toolkit": 1.9.3
-    "@rive-app/canvas": 2.19.0
-    "@rive-app/react-canvas": 4.13.0
+    "@rive-app/canvas": 2.8.3
+    "@rive-app/react-canvas": 4.6.2
     "@sentry/browser": 7.80.0
     "@sentry/core": 7.80.0
     "@sentry/react": 7.80.0
@@ -13540,7 +13539,7 @@ __metadata:
     "@types/wcag-contrast": 3.0.0
     "@types/xml2js": 0.4.14
     "@uniswap/analytics": 1.7.0
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/default-token-list": 11.19.0
     "@uniswap/eslint-config": "workspace:^"
     "@uniswap/governance": 1.0.2
@@ -13766,7 +13765,7 @@ __metadata:
     "@testing-library/react-native": 11.5.0
     "@types/redux-mock-store": 1.0.6
     "@uniswap/analytics": 1.7.0
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/eslint-config": "workspace:^"
     "@uniswap/ethers-rs-mobile": 0.0.5
     "@uniswap/sdk-core": 5.3.0
@@ -13786,7 +13785,7 @@ __metadata:
     core-js: 2.6.12
     cross-fetch: 3.1.5
     dayjs: 1.11.7
-    detox: 20.23.0
+    detox: 20.18.1
     eslint: 8.44.0
     ethers: 5.7.2
     expo: 50.0.15
@@ -21318,9 +21317,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detox@npm:20.23.0":
-  version: 20.23.0
-  resolution: "detox@npm:20.23.0"
+"detox@npm:20.18.1":
+  version: 20.18.1
+  resolution: "detox@npm:20.18.1"
   dependencies:
     ajv: ^8.6.3
     bunyan: ^1.8.12
@@ -21334,7 +21333,7 @@ __metadata:
     funpermaproxy: ^1.1.0
     glob: ^8.0.3
     ini: ^1.3.4
-    jest-environment-emit: ^1.0.8
+    jest-environment-emit: ^1.0.5
     json-cycle: ^1.3.0
     lodash: ^4.17.11
     multi-sort-stream: ^1.0.3
@@ -21364,13 +21363,13 @@ __metadata:
       optional: true
   bin:
     detox: local-cli/cli.js
-  checksum: e466a66ecf24194bb9ce4436539299134e9acc1accd00f04e29b2a53f9caef8d4e237a6d4f6a86b2a7f413b91261448c8daa97a917668db491719c02e951e3bb
+  checksum: 29524453f189c5ec71d53fe4b85d11ca7cc925d79ab0f957a8259708b7e85ff741cd8e79ae2374cb84a793d01d2f32d3cb73cacae55ad8e31dff13bf3859a734
   languageName: node
   linkType: hard
 
-"detox@patch:detox@npm%3A20.23.0#./.yarn/patches/detox-npm-20.23.0-6d61110e63.patch::locator=universe%40workspace%3A.":
-  version: 20.23.0
-  resolution: "detox@patch:detox@npm%3A20.23.0#./.yarn/patches/detox-npm-20.23.0-6d61110e63.patch::version=20.23.0&hash=a63042&locator=universe%40workspace%3A."
+"detox@patch:detox@npm%3A20.18.1#./.yarn/patches/detox-npm-20.18.1-b532b310b4.patch::locator=universe%40workspace%3A.":
+  version: 20.18.1
+  resolution: "detox@patch:detox@npm%3A20.18.1#./.yarn/patches/detox-npm-20.18.1-b532b310b4.patch::version=20.18.1&hash=9e679b&locator=universe%40workspace%3A."
   dependencies:
     ajv: ^8.6.3
     bunyan: ^1.8.12
@@ -21384,7 +21383,7 @@ __metadata:
     funpermaproxy: ^1.1.0
     glob: ^8.0.3
     ini: ^1.3.4
-    jest-environment-emit: ^1.0.8
+    jest-environment-emit: ^1.0.5
     json-cycle: ^1.3.0
     lodash: ^4.17.11
     multi-sort-stream: ^1.0.3
@@ -21414,7 +21413,7 @@ __metadata:
       optional: true
   bin:
     detox: local-cli/cli.js
-  checksum: 086bb4845abfff283cc30ef2b2f66a8827a91b8cb1a6c4d4aa3bc9c9faac2c6e53d8f305e5b9da967d808202d780a5f8296f769bd3f331c5664c66b69403d3f8
+  checksum: 5a0fb05cf00201af01ca9450367fc0838b983502ef60d28d3e9aa6cb2a0a2d5fb2f2aaad8d1a67275ee3b38c1d6155a763c1c5b05888268b448a8bb710395829
   languageName: node
   linkType: hard
 
@@ -28432,9 +28431,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-emit@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "jest-environment-emit@npm:1.0.8"
+"jest-environment-emit@npm:^1.0.5":
+  version: 1.0.6
+  resolution: "jest-environment-emit@npm:1.0.6"
   dependencies:
     bunyamin: ^1.5.2
     bunyan: ^2.0.5
@@ -28461,7 +28460,7 @@ __metadata:
       optional: true
     jest-environment-node:
       optional: true
-  checksum: 0c7bafbd3a6e5952f6abb45958f0d2997371d29b29f3876afda48d1d734ccd703577aaac0d5afec2e19dc33a9db0e9458721fe73dbe797f0ced21481d908acfd
+  checksum: a5af53deb4c712d2f91cdf1f11f35e823909a30534167fc093a89bf35539c6ed39b51f8b21299f1803e131318f094619e99fa7397389b03195bc0ef213e1dfc9
   languageName: node
   linkType: hard
 
@@ -42112,7 +42111,6 @@ __metadata:
     i18next: 23.10.0
     jest: 29.7.0
     jest-presets: "workspace:^"
-    qrcode: 1.5.1
     react: 18.2.0
     react-native: 0.73.6
     react-native-fast-image: 8.6.3
@@ -42411,7 +42409,6 @@ __metadata:
     "@ethersproject/address": 5.7.0
     "@ethersproject/bignumber": 5.7.0
     "@ethersproject/providers": 5.7.2
-    "@faker-js/faker": 7.6.0
     "@gorhom/bottom-sheet": 4.5.1
     "@graphql-codegen/cli": ^3.3.1
     "@graphql-codegen/client-preset": ^3.0.1
@@ -42427,7 +42424,7 @@ __metadata:
     "@typechain/ethers-v5": 7.2.0
     "@types/chrome": 0.0.254
     "@types/react-window": 1.8.2
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/eslint-config": "workspace:^"
     "@uniswap/router-sdk": 1.9.2
     "@uniswap/sdk-core": 5.3.0
@@ -42436,8 +42433,6 @@ __metadata:
     eslint: 8.44.0
     ethers: 5.7.2
     expo-blur: 12.9.2
-    expo-clipboard: 5.0.1
-    expo-web-browser: 12.8.2
     fuse.js: 6.5.3
     get-graphql-schema: ^2.1.2
     i18next: 23.10.0
@@ -42451,7 +42446,6 @@ __metadata:
     react-native-appsflyer: 6.13.1
     react-native-device-info: 10.0.2
     react-native-dotenv: 3.2.0
-    react-native-gesture-handler: 2.15.0
     react-native-reanimated: 3.8.1
     react-test-renderer: 18.2.0
     react-virtualized-auto-sizer: 1.0.20
@@ -42462,9 +42456,7 @@ __metadata:
     typescript: 5.3.3
     ui: "workspace:^"
     utilities: "workspace:^"
-    uuid: 9.0.0
     wagmi: 2.8.4
-    wcag-contrast: 3.0.0
   languageName: unknown
   linkType: soft
 
@@ -42944,7 +42936,7 @@ __metadata:
     "@types/react": ^18.0.15
     "@types/uuid": 9.0.1
     "@uniswap/analytics": 1.7.0
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/eslint-config": "workspace:^"
     "@uniswap/sdk-core": 5.3.0
     aws-appsync-auth-link: 3.0.7
@@ -43485,7 +43477,7 @@ __metadata:
     "@testing-library/react-native": 11.5.0
     "@types/react": ^18.0.15
     "@types/zxcvbn": 4.4.2
-    "@uniswap/analytics-events": 2.34.0
+    "@uniswap/analytics-events": 2.32.0
     "@uniswap/eslint-config": "workspace:^"
     "@uniswap/permit2-sdk": 1.3.0
     "@uniswap/router-sdk": 1.9.2
@@ -43501,6 +43493,7 @@ __metadata:
     depcheck: 1.4.7
     eslint: 8.44.0
     ethers: 5.7.2
+    expo-clipboard: 5.0.1
     expo-web-browser: 12.8.2
     fuse.js: 6.5.3
     graphql: 16.6.0
@@ -43514,6 +43507,7 @@ __metadata:
     mockdate: 3.0.5
     no-yolo-signatures: 0.0.2
     openapi-typescript-codegen: 0.27.0
+    qrcode: 1.5.1
     react: 18.2.0
     react-i18next: 14.1.0
     react-native: 0.73.6
@@ -43541,6 +43535,7 @@ __metadata:
     uniswap: "workspace:^"
     utilities: "workspace:^"
     uuid: 9.0.0
+    wcag-contrast: 3.0.0
     zod: 3.22.4
     zxcvbn: 4.4.2
   languageName: unknown